1 files changed, 144 insertions, 121 deletions

diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 40c970683..0e9a7b93b 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -58,22 +58,20 @@
 CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = 0;
 extern QRect g_rectToolBarEditorDialogGeometry;
 
-
-
 TrashcanLabel::TrashcanLabel(QWidget * p)
-: QLabel(p)
+    : QLabel(p)
 {
 	setPixmap(*(g_pIconManager->getBigIcon("kvi_bigicon_trashcan.png")));
-	KviTalToolTip::add(this,__tr2qs_ctx("Drop here the icons from the toolbars to remove them","editor"));
+	KviTalToolTip::add(this, __tr2qs_ctx("Drop here the icons from the toolbars to remove them", "editor"));
 	setFrameStyle(QFrame::Sunken | QFrame::WinPanel);
 	setAcceptDrops(true);
 	setAlignment(Qt::AlignCenter);
-	setMinimumSize(40,40);
+	setMinimumSize(40, 40);
 	m_uFlashCount = 0;
 	m_pFlashTimer = 0;
-	m_clrOriginal =  palette().color(backgroundRole());
+	m_clrOriginal = palette().color(backgroundRole());
 	setAutoFillBackground(true); //needed for flashing
-	connect(KviActionManager::instance(),SIGNAL(removeActionsHintRequest()),this,SLOT(flash()));
+	connect(KviActionManager::instance(), SIGNAL(removeActionsHintRequest()), this, SLOT(flash()));
 }
 
 TrashcanLabel::~TrashcanLabel()
@@ -88,23 +86,26 @@ TrashcanLabel::~TrashcanLabel()
 void TrashcanLabel::flash()
 {
 	m_uFlashCount = 0;
-	if(m_pFlashTimer)return;
+	if(m_pFlashTimer)
+		return;
 	m_pFlashTimer = new QTimer();
-	connect(m_pFlashTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
+	connect(m_pFlashTimer, SIGNAL(timeout()), this, SLOT(heartbeat()));
 	m_pFlashTimer->start(200);
 }
 
 void TrashcanLabel::heartbeat()
 {
 	m_uFlashCount++;
-	if(m_uFlashCount % 2){
+	if(m_uFlashCount % 2)
+	{
 		QPalette p = palette();
-		p.setColor(backgroundRole(),QColor(0,0,0));
+		p.setColor(backgroundRole(), QColor(0, 0, 0));
 		setPalette(p);
 	}
-	else{
+	else
+	{
 		QPalette p = palette();
-		p.setColor(backgroundRole(),m_clrOriginal);
+		p.setColor(backgroundRole(), m_clrOriginal);
 		setPalette(p);
 	}
 	update();
@@ -118,94 +119,95 @@ void TrashcanLabel::heartbeat()
 
 void TrashcanLabel::dropEvent(QDropEvent * e)
 {
-	if(e->mimeData()->hasText()) e->acceptProposedAction();
+	if(e->mimeData()->hasText())
+		e->acceptProposedAction();
 }
 
 void TrashcanLabel::dragEnterEvent(QDragEnterEvent * e)
 {
-	if(e->mimeData()->hasText()) e->acceptProposedAction();
+	if(e->mimeData()->hasText())
+		e->acceptProposedAction();
 }
 
-
-CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId,const QString &szLabel,const QString &szIconId)
-: QDialog(p)
+CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p, const QString & szText, const QString & szId, const QString & szLabel, const QString & szIconId)
+    : QDialog(p)
 {
 	m_szId = szId;
 	m_szOriginalId = szId;
 	m_szLabel = szLabel;
 
-	setWindowTitle(__tr2qs_ctx("Toolbar Properties - KVIrc","editor"));
+	setWindowTitle(__tr2qs_ctx("Toolbar Properties - KVIrc", "editor"));
 	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ToolBarEditor))));
 	setModal(true);
 
 	QGridLayout * g = new QGridLayout(this);
 
-	QLabel * l = new QLabel(szText,this);
-	g->addWidget(l,0,0,1,6);
+	QLabel * l = new QLabel(szText, this);
+	g->addWidget(l, 0, 0, 1, 6);
 
-	l = new QLabel(__tr2qs_ctx("Label","editor") + ":",this);
-	g->addWidget(l,1,0);
+	l = new QLabel(__tr2qs_ctx("Label", "editor") + ":", this);
+	g->addWidget(l, 1, 0);
 
 	m_pLabelEdit = new QLineEdit(this);
-	g->addWidget(m_pLabelEdit,1,1,1,5);
+	g->addWidget(m_pLabelEdit, 1, 1, 1, 5);
 	m_pLabelEdit->setText(szLabel);
-	connect(m_pLabelEdit,SIGNAL(textChanged(const QString &)),this,SLOT(labelTextChanged(const QString &)));
+	connect(m_pLabelEdit, SIGNAL(textChanged(const QString &)), this, SLOT(labelTextChanged(const QString &)));
 
-	l = new QLabel(__tr2qs_ctx("Icon","editor") + ":",this);
-	g->addWidget(l,2,0);
+	l = new QLabel(__tr2qs_ctx("Icon", "editor") + ":", this);
+	g->addWidget(l, 2, 0);
 
 	m_pIconEdit = new QLineEdit(this);
 	m_pIconEdit->setReadOnly(true);
-	g->addWidget(m_pIconEdit,2,1,1,4);
+	g->addWidget(m_pIconEdit, 2, 1, 1, 4);
 
 	m_pIconButton = new QPushButton(this);
-	g->addWidget(m_pIconButton,2,5,1,1);
-	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
+	g->addWidget(m_pIconButton, 2, 5, 1, 1);
+	connect(m_pIconButton, SIGNAL(clicked()), this, SLOT(iconButtonClicked()));
 
 	iconSelected(szIconId);
 
 	m_pAdvanced = new QWidget(this);
 	QGridLayout * ag = new QGridLayout(m_pAdvanced);
 
-	l = new QLabel(__tr2qs_ctx("ID","editor") + ":",m_pAdvanced);
+	l = new QLabel(__tr2qs_ctx("ID", "editor") + ":", m_pAdvanced);
 	l->setMinimumWidth(100);
-	ag->addWidget(l,0,0);
+	ag->addWidget(l, 0, 0);
 
 	m_pIdEdit = new QLineEdit(m_pAdvanced);
-	ag->addWidget(m_pIdEdit,0,1);
-	ag->setRowStretch(0,1);
+	ag->addWidget(m_pIdEdit, 0, 1);
+	ag->setRowStretch(0, 1);
 
 	m_pIdEdit->setText(szId);
 
-	g->addWidget(m_pAdvanced,3,0,1,6);
+	g->addWidget(m_pAdvanced, 3, 0, 1, 6);
 	m_pAdvanced->hide();
 
 	m_pLabelEdit->setFocus();
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("OK","editor"),this);
-	connect(pb,SIGNAL(clicked()),this,SLOT(okClicked()));
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("OK", "editor"), this);
+	connect(pb, SIGNAL(clicked()), this, SLOT(okClicked()));
 	pb->setMinimumWidth(80);
-	g->addWidget(pb,4,4,1,2);
+	g->addWidget(pb, 4, 4, 1, 2);
 
-	pb = new QPushButton(__tr2qs_ctx("Cancel","editor"),this);
-	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
+	pb = new QPushButton(__tr2qs_ctx("Cancel", "editor"), this);
+	connect(pb, SIGNAL(clicked()), this, SLOT(reject()));
 	pb->setMinimumWidth(80);
-	g->addWidget(pb,4,3);
+	g->addWidget(pb, 4, 3);
 
-	m_pAdvancedButton = new QPushButton(__tr2qs_ctx("Advanced...","editor"),this);
-	connect(m_pAdvancedButton,SIGNAL(clicked()),this,SLOT(advancedClicked()));
+	m_pAdvancedButton = new QPushButton(__tr2qs_ctx("Advanced...", "editor"), this);
+	connect(m_pAdvancedButton, SIGNAL(clicked()), this, SLOT(advancedClicked()));
 	m_pAdvancedButton->setMinimumWidth(110);
-	g->addWidget(m_pAdvancedButton,4,0,1,2);
+	g->addWidget(m_pAdvancedButton, 4, 0, 1, 2);
 
-	g->setRowStretch(0,1);
-	g->setColumnStretch(2,1);
+	g->setRowStretch(0, 1);
+	g->setColumnStretch(2, 1);
 }
 
 CustomToolBarPropertiesDialog::~CustomToolBarPropertiesDialog()
 {
 }
 
-void CustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
+void CustomToolBarPropertiesDialog::iconSelected(const QString & szIconId)
 {
 	QPixmap * pix = g_pIconManager->getImage(szIconId);
 
@@ -214,7 +216,9 @@ void CustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 		m_pIconButton->setIcon(QIcon(*pix));
 		m_szIconId = szIconId;
 		m_pIconEdit->setText(szIconId);
-	} else {
+	}
+	else
+	{
 		m_pIconButton->setText("Browse...");
 		m_szIconId = "";
 		m_pIconEdit->setText("");
@@ -223,7 +227,7 @@ void CustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 
 void CustomToolBarPropertiesDialog::iconButtonClicked()
 {
-	KviImageDialog * dlg = new KviImageDialog(this,__tr2qs_ctx("Choose a Toolbar Icon - KVIrc","editor"));
+	KviImageDialog * dlg = new KviImageDialog(this, __tr2qs_ctx("Choose a Toolbar Icon - KVIrc", "editor"));
 	if(dlg->exec() != QDialog::Accepted)
 	{
 		delete dlg;
@@ -234,7 +238,7 @@ void CustomToolBarPropertiesDialog::iconButtonClicked()
 	iconSelected(s);
 }
 
-void CustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
+void CustomToolBarPropertiesDialog::labelTextChanged(const QString & s)
 {
 	if(m_szOriginalId.isEmpty())
 	{
@@ -247,7 +251,7 @@ void CustomToolBarPropertiesDialog::okClicked()
 {
 	if(m_szLabel.isEmpty())
 	{
-		QMessageBox::information(this,__tr2qs_ctx("Invalid Toolbar Label - KVIrc","editor"),__tr2qs_ctx("The toolbar label can't be empty!","editor"),__tr2qs_ctx("OK","editor"));
+		QMessageBox::information(this, __tr2qs_ctx("Invalid Toolbar Label - KVIrc", "editor"), __tr2qs_ctx("The toolbar label can't be empty!", "editor"), __tr2qs_ctx("OK", "editor"));
 		return;
 	}
 
@@ -260,11 +264,14 @@ void CustomToolBarPropertiesDialog::okClicked()
 	{
 		if(m_szId != m_szOriginalId)
 		{
-			if(QMessageBox::information(this,__tr2qs_ctx("Duplicate Toolbar ID - KVIrc","editor"),
-				__tr2qs_ctx("The specified toolbar ID already exists.<br>" \
-					"Would you like KVIrc to assign it automatically (so it doesn't "
-					"collide with any other toolbar) or you prefer to do it manually?","editor"),
-				__tr2qs_ctx("Manually","editor"),__tr2qs_ctx("Automatically","editor")) == 0)return;
+			if(QMessageBox::information(this, __tr2qs_ctx("Duplicate Toolbar ID - KVIrc", "editor"),
+			       __tr2qs_ctx("The specified toolbar ID already exists.<br>"
+			                   "Would you like KVIrc to assign it automatically (so it doesn't "
+			                   "collide with any other toolbar) or you prefer to do it manually?",
+			                                "editor"),
+			       __tr2qs_ctx("Manually", "editor"), __tr2qs_ctx("Automatically", "editor"))
+			    == 0)
+				return;
 			m_szId = KviCustomToolBarManager::instance()->idForNewToolBar(m_szLabel);
 		}
 	}
@@ -279,61 +286,61 @@ void CustomToolBarPropertiesDialog::advancedClicked()
 	if(m_pAdvanced->isVisible())
 	{
 		m_pAdvanced->hide();
-		m_pAdvancedButton->setText(__tr2qs_ctx("Advanced...","editor"));
-	} else {
+		m_pAdvancedButton->setText(__tr2qs_ctx("Advanced...", "editor"));
+	}
+	else
+	{
 		m_pAdvanced->show();
-		m_pAdvancedButton->setText(__tr2qs_ctx("Hide Advanced","editor"));
+		m_pAdvancedButton->setText(__tr2qs_ctx("Hide Advanced", "editor"));
 	}
-
 }
 
-
 CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
-: QWidget(p)
+    : QWidget(p)
 {
 	setObjectName("Toolbar_editor");
-	setWindowTitle(__tr2qs_ctx("Customize Toolbars - KVIrc","editor"));
+	setWindowTitle(__tr2qs_ctx("Customize Toolbars - KVIrc", "editor"));
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ToolBarEditor)));
 
 	m_pInstance = this;
 
 	QGridLayout * g = new QGridLayout(this);
 	m_pDrawer = new KviActionDrawer(this);
-	g->addWidget(m_pDrawer,0,0,7,1);
+	g->addWidget(m_pDrawer, 0, 0, 7, 1);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("New Toolbar","editor"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(newToolBar()));
-	g->addWidget(b,0,1);
+	QPushButton * b = new QPushButton(__tr2qs_ctx("New Toolbar", "editor"), this);
+	connect(b, SIGNAL(clicked()), this, SLOT(newToolBar()));
+	g->addWidget(b, 0, 1);
 
-	m_pDeleteToolBarButton = new QPushButton(__tr2qs_ctx("Delete Toolbar","editor"),this);
-	connect(m_pDeleteToolBarButton,SIGNAL(clicked()),this,SLOT(deleteToolBar()));
-	g->addWidget(m_pDeleteToolBarButton,1,1);
+	m_pDeleteToolBarButton = new QPushButton(__tr2qs_ctx("Delete Toolbar", "editor"), this);
+	connect(m_pDeleteToolBarButton, SIGNAL(clicked()), this, SLOT(deleteToolBar()));
+	g->addWidget(m_pDeleteToolBarButton, 1, 1);
 
-	m_pRenameToolBarButton = new QPushButton(__tr2qs_ctx("Edit Toolbar","editor"),this);
-	connect(m_pRenameToolBarButton,SIGNAL(clicked()),this,SLOT(renameToolBar()));
-	g->addWidget(m_pRenameToolBarButton,2,1);
+	m_pRenameToolBarButton = new QPushButton(__tr2qs_ctx("Edit Toolbar", "editor"), this);
+	connect(m_pRenameToolBarButton, SIGNAL(clicked()), this, SLOT(renameToolBar()));
+	g->addWidget(m_pRenameToolBarButton, 2, 1);
 
 	QFrame * f = new QFrame(this);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
-	g->addWidget(f,3,1);
+	g->addWidget(f, 3, 1);
 
-	m_pExportToolBarButton = new QPushButton(__tr2qs_ctx("Export Toolbar","editor"),this);
-	connect(m_pExportToolBarButton,SIGNAL(clicked()),this,SLOT(exportToolBar()));
-	g->addWidget(m_pExportToolBarButton,4,1);
+	m_pExportToolBarButton = new QPushButton(__tr2qs_ctx("Export Toolbar", "editor"), this);
+	connect(m_pExportToolBarButton, SIGNAL(clicked()), this, SLOT(exportToolBar()));
+	g->addWidget(m_pExportToolBarButton, 4, 1);
 
 	TrashcanLabel * t = new TrashcanLabel(this);
-	g->addWidget(t,6,1);
+	g->addWidget(t, 6, 1);
 
-	b = new QPushButton(__tr2qs_ctx("Close","editor"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(closeClicked()));
-	g->addWidget(b,7,1);
+	b = new QPushButton(__tr2qs_ctx("Close", "editor"), this);
+	connect(b, SIGNAL(clicked()), this, SLOT(closeClicked()));
+	g->addWidget(b, 7, 1);
 
-	g->setRowStretch(5,1);
-	g->setColumnStretch(0,1);
+	g->setRowStretch(5, 1);
+	g->setColumnStretch(0, 1);
 
 	m_pDrawer->fill();
 
-	connect(KviActionManager::instance(),SIGNAL(currentToolBarChanged()),this,SLOT(currentToolBarChanged()));
+	connect(KviActionManager::instance(), SIGNAL(currentToolBarChanged()), this, SLOT(currentToolBarChanged()));
 	KviActionManager::instance()->customizeToolBarsDialogCreated();
 
 	currentToolBarChanged();
@@ -344,16 +351,16 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 	}
 	//setGeometry(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry));
 	resize(g_rectToolBarEditorDialogGeometry.width(),
-		g_rectToolBarEditorDialogGeometry.height());
+	    g_rectToolBarEditorDialogGeometry.height());
 	move(g_rectToolBarEditorDialogGeometry.x(),
-		g_rectToolBarEditorDialogGeometry.y());
+	    g_rectToolBarEditorDialogGeometry.y());
 
 	new QShortcut(Qt::Key_Escape, this, SLOT(closeClicked()));
 }
 
 CustomizeToolBarsDialog::~CustomizeToolBarsDialog()
 {
-	g_rectToolBarEditorDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
+	g_rectToolBarEditorDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
 
 	KviActionManager::instance()->customizeToolBarsDialogDestroyed();
 	m_pInstance = 0;
@@ -368,7 +375,7 @@ void CustomizeToolBarsDialog::currentToolBarChanged()
 void CustomizeToolBarsDialog::showEvent(QShowEvent * e)
 {
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow);
-	move(rect.x() + ((rect.width() - width())/2),rect.y() + ((rect.height() - height())/2));
+	move(rect.x() + ((rect.width() - width()) / 2), rect.y() + ((rect.height() - height()) / 2));
 
 	QWidget::showEvent(e);
 }
@@ -376,39 +383,46 @@ void CustomizeToolBarsDialog::showEvent(QShowEvent * e)
 void CustomizeToolBarsDialog::deleteToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
-	if(!t)return;
+	if(!t)
+		return;
 	if(QMessageBox::question(this,
-			__tr2qs_ctx("Confirm Toolbar Deletion - KVIrc","editor"),
-			__tr2qs_ctx("Do you really want to delete toolbar \"%1\"?","editor").arg(t->windowTitle()),
-			QMessageBox::Yes | QMessageBox::No,
-			QMessageBox::No) != QMessageBox::Yes)return;
+	       __tr2qs_ctx("Confirm Toolbar Deletion - KVIrc", "editor"),
+	       __tr2qs_ctx("Do you really want to delete toolbar \"%1\"?", "editor").arg(t->windowTitle()),
+	       QMessageBox::Yes | QMessageBox::No,
+	       QMessageBox::No)
+	    != QMessageBox::Yes)
+		return;
 	KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id());
 }
 
 void CustomizeToolBarsDialog::exportToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
-	if(!t)return;
+	if(!t)
+		return;
 
 	QString szName = QDir::homePath();
-	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
+	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))
+		szName += KVI_PATH_SEPARATOR;
 	szName += t->descriptor()->id();
 	szName += ".kvs";
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Enter a Filename - KVIrc","editor"),szName,KVI_FILTER_SCRIPT,true,true,true,this))return;
+	if(!KviFileDialog::askForSaveFileName(szFile, __tr2qs_ctx("Enter a Filename - KVIrc", "editor"), szName, KVI_FILTER_SCRIPT, true, true, true, this))
+		return;
 
 	QString szCode;
 
 	int ret = QMessageBox::question(this,
-			__tr2qs_ctx("Confirm Toolbar Export - KVIrc","editor"),
-			__tr2qs_ctx("Do you want the associated actions to be exported with the toolbar?","editor"),
-			__tr2qs_ctx("Yes","editor"),
-			__tr2qs_ctx("No","editor"),
-			__tr2qs_ctx("Cancel","editor"));
+	    __tr2qs_ctx("Confirm Toolbar Export - KVIrc", "editor"),
+	    __tr2qs_ctx("Do you want the associated actions to be exported with the toolbar?", "editor"),
+	    __tr2qs_ctx("Yes", "editor"),
+	    __tr2qs_ctx("No", "editor"),
+	    __tr2qs_ctx("Cancel", "editor"));
 
-	if(ret == 2)return;
+	if(ret == 2)
+		return;
 
 	bool bExportActions = ret == 0;
 
@@ -417,7 +431,7 @@ void CustomizeToolBarsDialog::exportToolBar()
 		KviPointerList<QString> * a = t->descriptor()->actions();
 		if(a)
 		{
-			for(QString * s = a->first();s;s = a->next())
+			for(QString * s = a->first(); s; s = a->next())
 			{
 				KviAction * act = KviActionManager::instance()->getAction(*s);
 				if(act)
@@ -443,7 +457,7 @@ void CustomizeToolBarsDialog::exportToolBar()
 	KviPointerList<QString> * aa = t->descriptor()->actions();
 	if(aa)
 	{
-		for(QString * ss = aa->first();ss;ss = aa->next())
+		for(QString * ss = aa->first(); ss; ss = aa->next())
 		{
 			szCode += "toolbar.additem ";
 			szCode += t->descriptor()->id();
@@ -457,22 +471,23 @@ void CustomizeToolBarsDialog::exportToolBar()
 	szCode += t->descriptor()->id();
 	szCode += "\n";
 
-	if(!KviFileUtils::writeFile(szFile,szCode))
+	if(!KviFileUtils::writeFile(szFile, szCode))
 	{
-		QMessageBox::warning(this,__tr2qs_ctx("Write to Toolbar File Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the toolbar file.","editor"),__tr2qs_ctx("OK","editor"));
+		QMessageBox::warning(this, __tr2qs_ctx("Write to Toolbar File Failed - KVIrc", "editor"), __tr2qs_ctx("Unable to write to the toolbar file.", "editor"), __tr2qs_ctx("OK", "editor"));
 	}
 }
 
 void CustomizeToolBarsDialog::renameToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
-	if(!t)return;
+	if(!t)
+		return;
 
 	CustomToolBarPropertiesDialog * dlg = new CustomToolBarPropertiesDialog(this,
-		__tr2qs_ctx("Please specify the properties for the toolbar \"%1\"","editor").arg(t->windowTitle()),
-		t->descriptor()->id(),
-		t->descriptor()->labelCode(),
-		t->descriptor()->iconId());
+	    __tr2qs_ctx("Please specify the properties for the toolbar \"%1\"", "editor").arg(t->windowTitle()),
+	    t->descriptor()->id(),
+	    t->descriptor()->labelCode(),
+	    t->descriptor()->iconId());
 
 	dlg->show();
 	if(dlg->exec() != QDialog::Accepted)
@@ -486,18 +501,19 @@ void CustomizeToolBarsDialog::renameToolBar()
 	QString icon = dlg->iconId();
 	delete dlg;
 
-	if((id == t->descriptor()->id()) && (label == t->descriptor()->labelCode()) && (icon == t->descriptor()->iconId()))return;
+	if((id == t->descriptor()->id()) && (label == t->descriptor()->labelCode()) && (icon == t->descriptor()->iconId()))
+		return;
 
-	KviCustomToolBarManager::instance()->renameDescriptor(t->descriptor()->id(),id,label);
+	KviCustomToolBarManager::instance()->renameDescriptor(t->descriptor()->id(), id, label);
 	t->descriptor()->setIconId(icon);
 }
 
 void CustomizeToolBarsDialog::newToolBar()
 {
 	CustomToolBarPropertiesDialog * dlg = new CustomToolBarPropertiesDialog(this,
-		__tr2qs_ctx("Please specify the properties for the new toolbar","editor"),
-		KviCustomToolBarManager::instance()->idForNewToolBar(__tr2qs_ctx("My Toolbar","editor")),
-		__tr2qs_ctx("My Toolbar","editor"));
+	    __tr2qs_ctx("Please specify the properties for the new toolbar", "editor"),
+	    KviCustomToolBarManager::instance()->idForNewToolBar(__tr2qs_ctx("My Toolbar", "editor")),
+	    __tr2qs_ctx("My Toolbar", "editor"));
 
 	dlg->show();
 	if(dlg->exec() != QDialog::Accepted)
@@ -511,7 +527,7 @@ void CustomizeToolBarsDialog::newToolBar()
 	QString icon = dlg->iconId();
 	delete dlg;
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->create(id,label);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->create(id, label);
 	d->setIconId(icon);
 	KviCustomToolBar * t = d->createToolBar();
 	KviActionManager::instance()->setCurrentToolBar(t);
@@ -524,7 +540,8 @@ void CustomizeToolBarsDialog::closeClicked()
 
 void CustomizeToolBarsDialog::cleanup()
 {
-	if(!m_pInstance)return;
+	if(!m_pInstance)
+		return;
 	delete m_pInstance;
 	m_pInstance = 0;
 }
@@ -539,17 +556,23 @@ void CustomizeToolBarsDialog::display(bool bTopLevel)
 			{
 				m_pInstance->setParent(0);
 			}
-		} else {
+		}
+		else
+		{
 			if(m_pInstance->parent() != g_pMainWindow->splitter())
 			{
 				m_pInstance->setParent(g_pMainWindow->splitter());
 			}
 		}
-	} else {
+	}
+	else
+	{
 		if(bTopLevel)
 		{
 			m_pInstance = new CustomizeToolBarsDialog(0);
-		} else {
+		}
+		else
+		{
 			m_pInstance = new CustomizeToolBarsDialog(g_pMainWindow->splitter());
 		}
 	}