more qt4 port (renamed QT3 stuff))

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1547 17fca916-40b9-46aa-a4ea-0a15b648b75c

25 files changed, 68 insertions, 55 deletions

diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index b7e82a035..1461644fc 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -219,7 +219,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	g->addWidget(b,10,2);

 

 	g->setRowStretch(9,1);

-	g->setColStretch(1,1);

+	g->setColumnStretch(1,1);

 

 	fillListView();

 

diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index b74df2bea..291de578f 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -1332,7 +1332,7 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm)
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 }
 
 KviAliasEditorWindow::~KviAliasEditorWindow()
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index e2d89190a..5c5816a4b 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -100,7 +100,7 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const
 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
 	
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 }
 
 KviAsyncAvatarSelectionDialog::~KviAsyncAvatarSelectionDialog()
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 4813ac624..13f196b5c 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -121,7 +121,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 */
 
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 
 	fillListView();
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 7b5dbb43f..115f5b026 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1850,7 +1850,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * p
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,2,1);
 
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 	g->setRowStretch(1,1);
 }
 
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index ef9352a4e..d97abcf6d 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -225,7 +225,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 		g->addMultiCellWidget(tl,0,0,0,1);
 	}
 
-	g->setColStretch(1,1);
+	g->setColumnStretch(1,1);
 
 	m_bMultiLine = bMultiLine;
 
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"));

diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 838cc0a1c..66b774982 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -145,10 +145,18 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
-
-	if(doc.isEmpty())doc = szHelpDir + "/index.html";
-
+	if(doc.isEmpty()){
+		
+		doc = szHelpDir + "\\index.html";
+		debug ("No file, use default at path %s",doc.toUtf8().data());
+	}
+	else
+	
+	{
+		debug("Doc set from user to %s",doc.toUtf8().data());
+	}	
 	QFileInfo * f= new QFileInfo(doc);
+	debug ("Path %d",doc.toUtf8().data());
 	if(f)
 	{
 		if(!f->exists())
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 719a3213d..854b74d3f 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -175,7 +175,8 @@ bool KviKvsObject_layout::functionAddMultiCellWidget(KviKvsObjectFunctionCall *c
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uStartRow,uStartCol,uEndRow,uEndCol);
+	// { addWidget(w, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); }
+	((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uStartRow, uStartCol,(uEndRow < 0) ? -1 : uEndRow - uStartRow + 1, (uEndCol < 0) ? -1 : uEndCol - uStartCol + 1);
 	return true;
 }
 bool KviKvsObject_layout::functionSetRowStretch(KviKvsObjectFunctionCall *c)
@@ -189,7 +190,7 @@ bool KviKvsObject_layout::functionSetRowStretch(KviKvsObjectFunctionCall *c)
 	((QGridLayout *)object())->setRowStretch(uRow,uStretch);
 	return true;
 }
-bool KviKvsObject_layout::functionSetColStretch(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_layout::functionsetColumnStretch(KviKvsObjectFunctionCall *c)
 {
 	kvs_uint_t uCol,uStretch;
 	KVSO_PARAMETERS_BEGIN(c)
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index ee0a45168..e6a446c85 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -72,7 +72,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 
 
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 
 	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->className());
 	if(e)
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 48fb0e7e7..3bcb35c09 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -259,7 +259,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	g1->addWidget(b,1,4);
 
 	g1->setRowStretch(0,1);
-	g1->setColStretch(1,1);
+	g1->setColumnStretch(1,1);
 
 
 	fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index ba642dbf3..dc5c86fe4 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -94,7 +94,7 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	pb->setDefault(true);
 	connect(pb,SIGNAL(clicked()),this,SLOT(accept()));
 	
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 	
 	//setMinimumSize(250,120);
 }
@@ -132,7 +132,7 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz
 	QTimer::singleShot(0,this,SLOT(startDownload()));
 
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 
 	setMinimumSize(250,120);
 }
@@ -237,7 +237,7 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 	//g->addWidget(b,2,2);
 	
 	g->setRowStretch(0,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 	//setMinimumSize(250,120);
 }
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 9558b20f3..1773b7b0e 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -133,8 +133,8 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	connect(m_pDelete,SIGNAL(clicked()),this,SLOT(delMediaType()));
 	layout()->addWidget(m_pDelete,10,2);
 
-	layout()->setColStretch(1,1);
-	layout()->setColStretch(2,1);
+	layout()->setColumnStretch(1,1);
+	layout()->setColumnStretch(2,1);
 	layout()->setRowStretch(0,1);
 
 	m_pLastItem = 0;
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 6df48ffee..0912815f6 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -440,7 +440,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	}
 
 	layout()->setRowStretch(0,1);
-	layout()->setColStretch(0,1);
+	layout()->setColumnStretch(0,1);
 
 	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemChanged(KviTalListViewItem *)));
 	connect(m_pForeListBox,SIGNAL(selectionChanged(KviTalListBoxItem *)),this,SLOT(colorChanged(KviTalListBoxItem *)));
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 84d080800..f723fb0c5 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -131,7 +131,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okPressed()));
 	gl->addWidget(m_pOkButton,iNextLine,3);
 
-	gl->setColStretch(1,1);
+	gl->setColumnStretch(1,1);
 	gl->setRowStretch(bUseServerMaskField ? 5 : 4,1);
 	
 	setMinimumWidth(250);
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 76453d213..e38e0e375 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -132,7 +132,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	fillProxyList();
 
 	layout()->setRowStretch(0,1);
-	layout()->setColStretch(0,1);
+	layout()->setColumnStretch(0,1);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 }
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 64036bb9b..4b03a8322 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -181,7 +181,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	gl->addWidget(l,3,0);
 
 	gl->setRowStretch(3,1);
-	gl->setColStretch(1,1);
+	gl->setColumnStretch(1,1);
 
 	tw->addTab(tab,__tr2qs_ctx("General","options"));
 
@@ -311,7 +311,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
 
 	g->setRowStretch(2,1);
-	g->setColStretch(1,1);
+	g->setColumnStretch(1,1);
 
 	tw->setMinimumWidth(375);
 }
@@ -503,7 +503,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	gl->addWidget(l,2,0);
 
 	gl->setRowStretch(2,1);
-	//gl->setColStretch(1,1);
+	//gl->setColumnStretch(1,1);
 
 	tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WHO)),__tr2qs_ctx("Identity","options"));
 
@@ -745,7 +745,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
 
 	g->setRowStretch(2,1);
-	g->setColStretch(1,1);
+	g->setColumnStretch(1,1);
 
 	tw->setMinimumWidth(390);
 	
@@ -1091,9 +1091,9 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	fillServerList();
 
 	layout()->setRowStretch(0,1);
-	//layout()->setColStretch(1,5);
-	//layout()->setColStretch(2,2);
-	layout()->setColStretch(0,1);
+	//layout()->setColumnStretch(1,5);
+	//layout()->setColumnStretch(2,2);
+	layout()->setColumnStretch(0,1);
 	setMinimumWidth(320);
 }
 
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index bf23c6216..f9993963c 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -176,7 +176,7 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 
 
 
-	//layout()->setColStretch(0,1);
+	//layout()->setColumnStretch(0,1);
 	layout()->setRowStretch(1,1);
 }
 
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 9633b3c26..731bf5d92 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -117,7 +117,7 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

 

 	g->setRowStretch(1,1);

-	g->setColStretch(0,1);

+	g->setColumnStretch(0,1);

 

 	fillData();

 }

@@ -275,7 +275,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));

 	//pb->setMinimumWidth(120);

 

-	g->setColStretch(0,1);

+	g->setColumnStretch(0,1);

 	g->setRowStretch(0,1);

 

 	m_pNickEdit->setText(m->nick());

@@ -379,7 +379,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));

 

 	g->setRowStretch(4,1);

-	g->setColStretch(1,1);

+	g->setColumnStretch(1,1);

 

 	addTab(p1,__tr2qs("Identity"));

 

@@ -437,7 +437,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	connect(pb,SIGNAL(clicked()),this,SLOT(editAllPropertiesClicked()));

 	g->addWidget(pb,6,2);

 

-	g->setColStretch(1,1);

+	g->setColumnStretch(1,1);

 	g->setRowStretch(3,1);

 

 	addTab(p2,__tr2qs("Properties"));

diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index b3d2392a7..7d1cf2085 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -107,7 +107,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
 	//m_pVBox->setMaximumHeight(450);
 	g->addWidget(m_pVBox,0,1);
 	
-	g->setColStretch(1,1);
+	g->setColumnStretch(1,1);
 
 	QLabel * l = new QLabel(m_pVBox);
 	l->setAlignment(Qt::AlignAuto | Qt::AlignTop);
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index d9487169f..b8642fd71 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -101,7 +101,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
 	g->addWidget(pb,5,3);
 
 	g->setRowStretch(4,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 	
 	if(f)
 	{
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index a21904018..b9a33322c 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -213,7 +213,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	g->addWidget(b,2,1);
 
 	g->setRowStretch(1,0);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 
 	fillThemeBox();
 	m_pContextPopup = new KviTalPopupMenu(this);
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index b10317032..66235bc4e 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -244,7 +244,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 
 
 	pLayout->setRowStretch(3,1);
-	pLayout->setColStretch(1,1);
+	pLayout->setColumnStretch(1,1);
 
 	addPage(pPage,__tr2qs_ctx("Package Informations","theme"));
 	setBackEnabled(pPage,true);
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 42892927f..17e4de525 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -132,7 +132,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 
 
 	pLayout->setRowStretch(3,1);
-	pLayout->setColStretch(1,1);
+	pLayout->setColumnStretch(1,1);
 
 	addPage(pPage,__tr2qs_ctx("Theme Informations","theme"));
 	setBackEnabled(pPage,true);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index aac7f3bbd..e74c80508 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -185,7 +185,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
 	g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1);
 	
 	g->setRowStretch(0,1);
-	g->setColStretch(2,1);
+	g->setColumnStretch(2,1);
 }
 
 KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog()
@@ -314,7 +314,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
 	g->addWidget(b,7,1);
 
 	g->setRowStretch(5,1);
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 	
 	m_pDrawer->fill();