get rid of toolbar-icons

simplify svg icon management: all svg icons are in icons/ and have the same style
This commit is contained in:
Marco Martin 2014-01-02 18:35:29 +01:00
parent 84df832f5c
commit 692c436960
8 changed files with 2 additions and 8 deletions

View File

@ -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/ )

View File

@ -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 normal icon (like systray)
if (!m_svgIcon->isValid() || !m_svgIcon->hasElement(m_source.toString())) {
//try as a svg icon
m_svgIcon->setImagePath("icons/" + source.toString().split("-").first());
}
m_svgIcon->setContainsMultipleImages(true);
//success?