diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-01 18:25:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-01 18:25:02 +0000 |
commit | 291eb697d16574d229c819334204250ab5616077 (patch) | |
tree | 2b10ca78c086e01aeee2feb056e5586f23bcfb9a /kicker/applets | |
parent | 31ce63759fa4a3111634bb6e1d5dd05c314a427f (diff) | |
download | tdebase-291eb697d16574d229c819334204250ab5616077.tar.gz tdebase-291eb697d16574d229c819334204250ab5616077.zip |
Fix shutdown dialog icon background
Fix Kicker show desktop button tooltip
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1250808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets')
-rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 996d8abe3..0c19e5326 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -343,8 +343,12 @@ void QuickButton::updateKickerTip(KickerTip::Data &data) { data.subtext = data.message; } - data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, - KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); + if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { + data.icon = KGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); + } + else { + data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); + } } void QuickButton::setPopupDirection(KPanelApplet::Direction d) |