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

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)

ksmserver/shutdowndlg.cpp

@@ -1105,8 +1105,8 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
 	TQWidget* ticon = new TQWidget( frame );
 	KIconLoader * ldr = KGlobal::iconLoader();
 	TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true);
-	if (TQPaintDevice::x11AppDepth() == 32) {
-		// Manually draw the alpha portions onto the widget background color...
+
+	// Manually draw the alpha portions of the icon onto the widget background color...
 	TQRgb backgroundRgb = ticon->paletteBackgroundColor().rgb();
 	TQImage correctedImage = trinityPixmap.convertToImage();
 	correctedImage = correctedImage.convertDepth(32);
@@ -1126,7 +1126,7 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
 		}
 	}
 	trinityPixmap.convertFromImage(correctedImage);
-	}
+
 	ticon->setBackgroundPixmap(trinityPixmap);
 	ticon->setMinimumSize(trinityPixmap.size());
 	ticon->setMaximumSize(trinityPixmap.size());