From a369791665fc7d3186df6dfcf9ddd8fa7d1f6ff8 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 12 Jul 2015 23:59:26 +0200
Subject: [PATCH] + issue #0002053: Support of themes

---
 src/Gui/DlgCommandsImp.cpp |  6 +++---
 src/Gui/DlgKeyboardImp.cpp |  8 ++++----
 src/Gui/DlgToolbarsImp.cpp | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Gui/DlgCommandsImp.cpp b/src/Gui/DlgCommandsImp.cpp
index 4697e9f3f0..d4b3bae2e6 100644
--- a/src/Gui/DlgCommandsImp.cpp
+++ b/src/Gui/DlgCommandsImp.cpp
@@ -151,7 +151,7 @@ void DlgCustomCommandsImp::onGroupActivated(QTreeWidgetItem* item)
         item->setData(1, Qt::UserRole, QByteArray((*it)->getName()));
         item->setSizeHint(0, QSize(32, 32));
         if ((*it)->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap((*it)->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme((*it)->getPixmap()));
     }
 
     textLabel->setText(QString());
@@ -177,7 +177,7 @@ void DlgCustomCommandsImp::onAddMacroAction(const QByteArray& macro)
         item->setSizeHint(0, QSize(32, 32));
         item->setBackgroundColor(0, Qt::lightGray);
         if (pCmd->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
     }
 }
 
@@ -225,7 +225,7 @@ void DlgCustomCommandsImp::onModifyMacroAction(const QByteArray& macro)
                 item->setSizeHint(0, QSize(32, 32));
                 item->setBackgroundColor(0, Qt::lightGray);
                 if (pCmd->getPixmap())
-                    item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+                    item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                 if (commandTreeWidget->isItemSelected(item))
                     onDescription(item);
                 break;
diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/DlgKeyboardImp.cpp
index c181f1263c..262215f09f 100644
--- a/src/Gui/DlgKeyboardImp.cpp
+++ b/src/Gui/DlgKeyboardImp.cpp
@@ -181,7 +181,7 @@ void DlgCustomKeyboardImp::on_categoryBox_activated(int index)
         item->setData(1, Qt::UserRole, QByteArray((*it)->getName()));
         item->setSizeHint(0, QSize(32, 32));
         if ((*it)->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap((*it)->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme((*it)->getPixmap()));
     }
 }
 
@@ -319,7 +319,7 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
                 item->setSizeHint(0, QSize(32, 32));
                 item->setBackgroundColor(0, Qt::lightGray);
                 if ((*it)->getPixmap())
-                    item->setIcon(0, BitmapFactory().pixmap((*it)->getPixmap()));
+                    item->setIcon(0, BitmapFactory().iconFromTheme((*it)->getPixmap()));
             }
         }
 
@@ -362,7 +362,7 @@ void DlgCustomKeyboardImp::onAddMacroAction(const QByteArray& macro)
         item->setSizeHint(0, QSize(32, 32));
         item->setBackgroundColor(0, Qt::lightGray);
         if (pCmd->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
     }
 }
 
@@ -402,7 +402,7 @@ void DlgCustomKeyboardImp::onModifyMacroAction(const QByteArray& macro)
                 item->setSizeHint(0, QSize(32, 32));
                 item->setBackgroundColor(0, Qt::lightGray);
                 if (pCmd->getPixmap())
-                    item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+                    item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                 if (commandTreeWidget->isItemSelected(item))
                     textLabelDescription->setText(item->toolTip(1));
                 break;
diff --git a/src/Gui/DlgToolbarsImp.cpp b/src/Gui/DlgToolbarsImp.cpp
index c5857c9e59..3e9febf300 100644
--- a/src/Gui/DlgToolbarsImp.cpp
+++ b/src/Gui/DlgToolbarsImp.cpp
@@ -208,7 +208,7 @@ void DlgCustomToolbars::on_categoryBox_activated(int index)
         item->setData(1, Qt::UserRole, QByteArray((*it)->getName()));
         item->setSizeHint(0, QSize(32, 32));
         if ((*it)->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap((*it)->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme((*it)->getPixmap()));
     }
 }
 
@@ -266,7 +266,7 @@ void DlgCustomToolbars::importCustomToolbars(const QByteArray& name)
                     item->setText(0, qApp->translate(pCmd->className(), pCmd->getMenuText()));
                     item->setData(0, Qt::UserRole, QByteArray(it2->first.c_str()));
                     if (pCmd->getPixmap())
-                        item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+                        item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                     item->setSizeHint(0, QSize(32, 32));
                 }
             }
@@ -540,7 +540,7 @@ void DlgCustomToolbars::onAddMacroAction(const QByteArray& macro)
         item->setSizeHint(0, QSize(32, 32));
         item->setBackgroundColor(0, Qt::lightGray);
         if (pCmd->getPixmap())
-            item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+            item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
     }
 }
 
@@ -581,7 +581,7 @@ void DlgCustomToolbars::onModifyMacroAction(const QByteArray& macro)
                 item->setSizeHint(0, QSize(32, 32));
                 item->setBackgroundColor(0, Qt::lightGray);
                 if (pCmd->getPixmap())
-                    item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+                    item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                 break;
             }
         }
@@ -594,7 +594,7 @@ void DlgCustomToolbars::onModifyMacroAction(const QByteArray& macro)
                 if (command == macro) {
                     item->setText(0, QString::fromUtf8(pCmd->getMenuText()));
                     if (pCmd->getPixmap())
-                        item->setIcon(0, BitmapFactory().pixmap(pCmd->getPixmap()));
+                        item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                 }
             }
         }