From 5ef8cf5c2ca77de12c53971109aa38e95700e7be Mon Sep 17 00:00:00 2001
From: Noldor
Date: Mon, 21 Apr 2008 15:21:38 +0000
Subject: more qt4 port (renamed QT3 stuff))

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1547 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/editor/scripteditor.cpp | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'src/modules/editor/scripteditor.cpp')

diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 7eb0fcf68..f5db310b5 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -202,7 +202,7 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p
 
 
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 }
 
 KviScriptEditorWidgetColorOptions::~KviScriptEditorWidgetColorOptions()
@@ -623,18 +623,17 @@ void KviScriptSyntaxHighlighter::highlightBlock(const QString &text)
 	const QChar * c = pBuf;
 	QTextCharFormat commentFormat;
 	commentFormat.setForeground(g_clrComment);
-	commentFormat.setToolTip("Prova del tooltip");
 	commentFormat.setFont(g_fntNormal);
 
 	QTextCharFormat bracketFormat;
-	 bracketFormat.setForeground(g_clrBracket);
-	 bracketFormat.setFont(g_fntNormal);
+	bracketFormat.setForeground(g_clrBracket);
+	bracketFormat.setFont(g_fntNormal);
 
-	 QTextCharFormat punctuationFormat;
-	 punctuationFormat.setForeground(g_clrPunctuation);
-	 punctuationFormat.setFont(g_fntNormal);
+	QTextCharFormat punctuationFormat;
+	punctuationFormat.setForeground(g_clrPunctuation);
+	punctuationFormat.setFont(g_fntNormal);
 
-	 QTextCharFormat keywordFormat;
+	QTextCharFormat keywordFormat;
 	keywordFormat.setForeground(g_clrKeyword);
 	keywordFormat.setFont(g_fntNormal);
 
@@ -651,7 +650,6 @@ void KviScriptSyntaxHighlighter::highlightBlock(const QString &text)
 	functionFormat.setFont(g_fntNormal);
 	
 	
-	//if(!c)return setCurrentBlockState(endStateOfLastPara);
 	int endStateOfLastPara=currentBlockState();
 	if(endStateOfLastPara < 0)endStateOfLastPara = 0;
 	
@@ -922,10 +920,16 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 
 	
 	m_pEditor = new KviScriptEditorWidget(this);
-	g->addMultiCellWidget(m_pEditor,0,0,0,3);
+	g->addWidget(w, 0, 0, 1,4);
+        //{ addWidget(w, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); }
+
+	//g->addMultiCellWidget(m_pEditor,0,0,0,3);
 	g->setRowStretch(0,1);
 
-	QToolButton * b = new QToolButton(Qt::DownArrow,this,"dsa2");
+	QToolButton * b = new QToolButton(this);
+	b->setArrowType(Qt::DownArrow);
+	b->setObjectName("dsa2");
+
 	b->setMinimumWidth(24);
 	g->addWidget(b,1,0);
 
@@ -934,11 +938,11 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
 	pop->insertSeparator();
 	pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
-	b->setPopup(pop);
-	b->setPopupDelay(1);
+	b->setMenu(pop);
+//	b->setPopupDelay(1);
 
-	g->setColStretch(1,1);
-	g->setColStretch(2,10);
+	g->setColumnStretch(1,1);
+	g->setColumnStretch2,10);
 	g->addWidget(m_pFindLineedit,1,2);
 	QLabel *lab= new QLabel("find",this);
 	lab->setText(tr("Find"));
-- 
cgit v1.3.1-10-gc9f91