From 692c436960d5faa4252b24483175bf979f74973a Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 2 Jan 2014 18:35:29 +0100
Subject: [PATCH] get rid of toolbar-icons

simplify svg icon management: all svg icons are in icons/ and have the same style
---
 desktoptheme/air/CMakeLists.txt                     |   2 --
 .../air/{toolbar-icons => icons}/configure.svgz     | Bin
 desktoptheme/air/{toolbar-icons => icons}/edit.svgz | Bin
 desktoptheme/air/{toolbar-icons => icons}/go.svgz   | Bin
 desktoptheme/air/{toolbar-icons => icons}/list.svgz | Bin
 .../air/{toolbar-icons => icons}/media.svgz         | Bin
 .../air/{toolbar-icons => icons}/window.svgz        | Bin
 src/declarativeimports/core/iconitem.cpp            |   8 ++------
 8 files changed, 2 insertions(+), 8 deletions(-)
 rename desktoptheme/air/{toolbar-icons => icons}/configure.svgz (100%)
 rename desktoptheme/air/{toolbar-icons => icons}/edit.svgz (100%)
 rename desktoptheme/air/{toolbar-icons => icons}/go.svgz (100%)
 rename desktoptheme/air/{toolbar-icons => icons}/list.svgz (100%)
 rename desktoptheme/air/{toolbar-icons => icons}/media.svgz (100%)
 rename desktoptheme/air/{toolbar-icons => icons}/window.svgz (100%)

diff --git a/desktoptheme/air/CMakeLists.txt b/desktoptheme/air/CMakeLists.txt
index 77ff6696f..8f2f22f3c 100644
--- a/desktoptheme/air/CMakeLists.txt
+++ b/desktoptheme/air/CMakeLists.txt
@@ -22,5 +22,3 @@ install( FILES ${translucent_dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktopthe
 FILE(GLOB icons icons/*.svgz)
 install( FILES ${icons} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/icons/ )
 
-FILE(GLOB icons toolbar-icons/*.svgz)
-install( FILES ${icons} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/toolbar-icons/ )
diff --git a/desktoptheme/air/toolbar-icons/configure.svgz b/desktoptheme/air/icons/configure.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/configure.svgz
rename to desktoptheme/air/icons/configure.svgz
diff --git a/desktoptheme/air/toolbar-icons/edit.svgz b/desktoptheme/air/icons/edit.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/edit.svgz
rename to desktoptheme/air/icons/edit.svgz
diff --git a/desktoptheme/air/toolbar-icons/go.svgz b/desktoptheme/air/icons/go.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/go.svgz
rename to desktoptheme/air/icons/go.svgz
diff --git a/desktoptheme/air/toolbar-icons/list.svgz b/desktoptheme/air/icons/list.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/list.svgz
rename to desktoptheme/air/icons/list.svgz
diff --git a/desktoptheme/air/toolbar-icons/media.svgz b/desktoptheme/air/icons/media.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/media.svgz
rename to desktoptheme/air/icons/media.svgz
diff --git a/desktoptheme/air/toolbar-icons/window.svgz b/desktoptheme/air/icons/window.svgz
similarity index 100%
rename from desktoptheme/air/toolbar-icons/window.svgz
rename to desktoptheme/air/icons/window.svgz
diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index 421360133..50dfdfc83 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -210,13 +210,9 @@ void IconItem::setSource(const QVariant &source)
         if (!m_svgIcon) {
             m_svgIcon = new Plasma::Svg(this);
         }
-        //try as a svg toolbar icon
-        m_svgIcon->setImagePath("toolbar-icons/" + source.toString().split("-").first());
+        //try as a svg icon
+        m_svgIcon->setImagePath("icons/" + source.toString().split("-").first());
 
-        //try as a svg normal icon (like systray)
-        if (!m_svgIcon->isValid() || !m_svgIcon->hasElement(m_source.toString())) {
-            m_svgIcon->setImagePath("icons/" + source.toString().split("-").first());
-        }
         m_svgIcon->setContainsMultipleImages(true);
 
         //success?