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

try to load a monocrome icon as popupicon, fallback to KIcon

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1115209
This commit is contained in:
Marco Martin 2010-04-15 16:14:37 +00:00
parent d6d1c812c0
commit ec3d3774bc
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
popupapplet.cpp
View File

@ -46,6 +46,7 @@
#include "plasma/extenders/extender.h"
#include "plasma/extenders/extenderitem.h"
#include "plasma/package.h"
#include "plasma/theme.h"
#include "plasma/scripting/appletscript.h"
#include "plasma/tooltipmanager.h"
#include "plasma/widgets/iconwidget.h"
@ -112,14 +113,34 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
void PopupApplet::setPopupIcon(const QString &iconName)
{
if (package()) {
//Attempt1: is it in the plasmoid package?
const QString file = package()->filePath("images", iconName);
if (!file.isEmpty()) {
setPopupIcon(KIcon(file));
return;
}
//Attempt2: is it a svg in the icons directory?
}
QString name = QString("icons/") + iconName.split("-").first();
if (!Plasma::Theme::defaultTheme()->imagePath(name).isEmpty()) {
if (!d->icon) {
d->icon = new Plasma::IconWidget(this);
d->icon->setSvg(name, iconName);
connect(d->icon, SIGNAL(clicked()), this, SLOT(internalTogglePopup()));
setPopupIcon(KIcon(iconName));
QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
layout->setOrientation(Qt::Horizontal);
setLayout(layout);
} else {
d->icon->setSvg(name, iconName);
}
// Final Attempt: use KIcon
} else {
setPopupIcon(KIcon(iconName));
}
}
QIcon PopupApplet::popupIcon() const