alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check for elementId besides the file name

Browse Source
This commit is contained in:
Marco Martin 2012-11-28 16:05:46 +01:00
parent 7b6d50b3c6
commit 03495debc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/core/iconitem.cpp
View File

@ -87,13 +87,13 @@ void IconItem::setSource(const QVariant &source)
m_svgIcon->setImagePath("toolbar-icons/" + source.toString().split("-").first()); m_svgIcon->setImagePath("toolbar-icons/" + source.toString().split("-").first());
//try as a svg normal icon (like systray) //try as a svg normal icon (like systray)
if (!m_svgIcon->isValid()) { if (!m_svgIcon->isValid() || !m_svgIcon->hasElement(m_source.toString())) {
m_svgIcon->setImagePath("icons/" + source.toString().split("-").first()); m_svgIcon->setImagePath("icons/" + source.toString().split("-").first());
} }
m_svgIcon->setContainsMultipleImages(true); m_svgIcon->setContainsMultipleImages(true);
//success? //success?
if (m_svgIcon->isValid()) { if (m_svgIcon->isValid() && m_svgIcon->hasElement(m_source.toString())) {
m_icon = QIcon(); m_icon = QIcon();
//ok, svg not available //ok, svg not available