Fix some icon issues

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

4 files changed, 79 insertions, 65 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index ca2c31a0f..3cbaf73ee 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -341,6 +341,35 @@ void KviSingleActionEditor::specificWindowsCheckToggled(bool)
 	m_pWindowDccChatCheck->setEnabled(b);
 }
 
+void KviSingleActionEditor::displaySmallIcon(const QString &szIconId)
+{
+	QPixmap * pix = g_pIconManager->getImage(szIconId);
+
+	if(pix)
+	{
+		m_pSmallIconEdit->setText(szIconId);
+		m_pSmallIconButton->setIcon(QIcon(*pix));
+	} else {
+		m_pSmallIconEdit->setText(QString());
+		m_pSmallIconButton->setIcon(QIcon());
+	}
+	
+}
+
+void KviSingleActionEditor::displayBigIcon(const QString &szIconId)
+{
+	QPixmap * pix = g_pIconManager->getImage(szIconId);
+
+	if(pix)
+	{
+		m_pBigIconEdit->setText(szIconId);
+		m_pBigIconButton->setIcon(QIcon(*pix));
+	} else {
+		m_pBigIconEdit->setText(QString());
+		m_pBigIconButton->setIcon(QIcon());
+	}
+}
+
 void KviSingleActionEditor::chooseSmallIcon()
 {
 	if(!m_pActionData)return;
@@ -348,16 +377,10 @@ void KviSingleActionEditor::chooseSmallIcon()
 	int ret = d->exec();
 	QString s = d->selectedImage();
 	delete d;
-	if(ret != QDialog::Accepted)return;
-	s.replace("$icon(","");
-	s.chop(1);
-	int id=g_pIconManager->getSmallIconIdFromName(s);
-	QString szId;
-	szId.setNum(id);
-	QPixmap * p = g_pIconManager->getImage(szId);
-	if(!p)return;
-	m_pSmallIconEdit->setText(s);
-	m_pSmallIconButton->setIcon(QIcon(*p));
+	if(ret != QDialog::Accepted)
+		return;
+
+	displaySmallIcon(s);
 }
 
 void KviSingleActionEditor::chooseBigIcon()
@@ -367,11 +390,10 @@ void KviSingleActionEditor::chooseBigIcon()
 	int ret = d->exec();
 	QString s = d->selectedImage();
 	delete d;
-	if(ret != QDialog::Accepted)return;
-	QPixmap * p = g_pIconManager->getBigIcon(s);
-	if(!p)return;
-	m_pBigIconEdit->setText(s);
-	m_pBigIconButton->setIcon(QIcon(*p));
+	if(ret != QDialog::Accepted)
+		return;
+
+	displayBigIcon(s);
 }
 
 void KviSingleActionEditor::setActionData(KviActionData * d)
@@ -416,24 +438,8 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
 		m_pDescriptionEdit->setEnabled(true);
 		m_pSmallIconEdit->setEnabled(true);
 		m_pBigIconEdit->setEnabled(true);
-		QPixmap * p = g_pIconManager->getImage(d->m_szSmallIcon);
-		if(p)
-		{
-			m_pSmallIconEdit->setText(d->m_szSmallIcon);
-			m_pSmallIconButton->setIcon(QIcon(*p));
-		} else {
-			m_pSmallIconEdit->setText("");
-			m_pSmallIconButton->setIcon(QIcon());
-		}
-		p = g_pIconManager->getImage(d->m_szBigIcon);
-		if(p)
-		{
-			m_pBigIconEdit->setText(d->m_szBigIcon);
-			m_pBigIconButton->setIcon(QIcon(*p));
-		} else {
-			m_pBigIconEdit->setText("");
-			m_pBigIconButton->setIcon(QIcon());
-		}
+		displaySmallIcon(d->m_szSmallIcon);
+		displayBigIcon(d->m_szBigIcon);
 		m_pSmallIconButton->setEnabled(true);
 		m_pBigIconButton->setEnabled(true);
 		m_pNeedsContextCheck->setEnabled(true);
@@ -645,16 +651,18 @@ KviActionEditor::KviActionEditor(QWidget * par)
 	{
 		if(a->isKviUserActionNeverOverrideThis())
 		{
-			KviActionData * ad = new KviActionData(a->name(),
-						((KviKvsUserAction *)a)->scriptCode(),
-						((KviKvsUserAction *)a)->visibleNameCode(),
-						((KviKvsUserAction *)a)->descriptionCode(),
-						a->category() ? a->category()->name() : KviActionManager::categoryGeneric()->name(),
-						a->bigIconString(),
-						((KviKvsUserAction *)a)->smallIconString(),
-						a->flags(),
-						a->keySequence(),
-						0);
+			KviActionData * ad = new KviActionData(
+					a->name(),
+					((KviKvsUserAction *)a)->scriptCode(),
+					((KviKvsUserAction *)a)->visibleNameCode(),
+					((KviKvsUserAction *)a)->descriptionCode(),
+					a->category() ? a->category()->name() : KviActionManager::categoryGeneric()->name(),
+					a->bigIconId(),
+					a->smallIconId(),
+					a->flags(),
+					a->keySequence(),
+					0
+				);
 			KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
 			ad->m_pItem = lvi;
 			if(ad->m_szName == g_szLastEditedAction)
@@ -699,16 +707,18 @@ void KviActionEditor::exportActions()
 		{
 			KviActionData * a = ((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
 
-			KviKvsUserAction::exportToKvs(szCode,
-				a->m_szName,
-				a->m_szScriptCode,
-				a->m_szVisibleName,
-				a->m_szDescription,
-				a->m_szCategory,
-				a->m_szBigIcon,
-				a->m_szSmallIcon,
-				a->m_uFlags,
-				a->m_szKeySequence);
+			KviKvsUserAction::exportToKvs(
+					szCode,
+					a->m_szName,
+					a->m_szScriptCode,
+					a->m_szVisibleName,
+					a->m_szDescription,
+					a->m_szCategory,
+					a->m_szBigIcon,
+					a->m_szSmallIcon,
+					a->m_uFlags,
+					a->m_szKeySequence
+				);
 		}
 	}
 
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index dc8ea08b6..8268b5be5 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -145,6 +145,8 @@ public:
 protected slots:
 	void chooseSmallIcon();
 	void chooseBigIcon();
+	void displaySmallIcon(const QString &szIconId);
+	void displayBigIcon(const QString &szIconId);
 	void needsContextCheckToggled(bool);
 	void needsConnectionCheckToggled(bool);
 	void specificWindowsCheckToggled(bool);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 7accfd5a5..afbe0de71 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -205,10 +205,11 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog()
 
 void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 {
-	QPixmap * p = g_pIconManager->getImage(szIconId.toUtf8().data());
-	if(p)
+	QPixmap * pix = g_pIconManager->getImage(szIconId);
+
+	if(pix)
 	{
-		m_pIconButton->setIcon(*p);
+		m_pIconButton->setIcon(QIcon(*pix));
 		m_szIconId = szIconId;
 		m_pIconEdit->setText(szIconId);
 	} else {
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 4b685ab78..d567b4fdd 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -138,14 +138,15 @@ void KviUrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 }
 
 KviUrlAction::KviUrlAction(QObject * pParent)
-: KviKvsAction(pParent,
-	"url.list",
-	"url.list",
-	__tr2qs("Show URL List"),
-	__tr2qs("Shows the URL list window"),
-	KviActionManager::categoryGeneric(),
-	"kvi_bigicon_www.png",
-	KVI_SMALLICON_URL
+: KviKvsAction(
+		pParent,
+		"url.list",
+		"url.list",
+		__tr2qs("Show URL List"),
+		__tr2qs("Shows the URL list window"),
+		KviActionManager::categoryGeneric(),
+		"kvi_bigicon_www.png",
+		QString("%1").arg(KVI_SMALLICON_URL)
 	)
 {
 }
@@ -157,7 +158,7 @@ KviUrlAction::~KviUrlAction()
 // ---------------------------- CLASS URLDIALOG ------------------------begin //
 
 UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
-:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
+	:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
 {
 	setAutoFillBackground(false);