[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-12-06 0:35:31
Message-ID: 20101206003531.8D428AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204023 by djarvie:

Bug 155788: make disabled system tray icon more distinguishable for colour blind users.


 M  +4 -5      traywindow.cpp  
 M  +1 -0      traywindow.h  


--- trunk/KDE/kdepim/kalarm/traywindow.cpp #1204022:1204023
@@ -86,6 +86,9 @@
 	setToolTipIconByName("kalarm");
 	setToolTipTitle(KGlobal::mainComponent().aboutData()->programName());
 	setIconByName("kalarm");
+	// Load the disabled icon for use by setIconByPixmap()
+	// - setIconByName() doesn't work for this one!
+	mIconDisabled.addPixmap(KIconLoader::global()->loadIcon("kalarm-disabled", KIconLoader::Panel));
 	setStatus(KStatusNotifierItem::Active);
 
 	// Set up the context menu
@@ -314,14 +317,10 @@
 void TrayWindow::updateIcon()
 {
 	if (theApp()->alarmsEnabled())
-	{
 		setIconByName(mHaveDisabledAlarms ? "kalarm-partdisabled" : "kalarm");
-	}
 	else
-	{
-		setIconByName("kalarm-disabled");
+		setIconByPixmap(mIconDisabled);
 	}
-}
 
 /******************************************************************************
 *  Return the tooltip text showing alarms due in the next 24 hours.
--- trunk/KDE/kdepim/kalarm/traywindow.h #1204022:1204023
@@ -69,6 +69,7 @@
 		void         updateIcon();
 
 		MainWindow*     mAssocMainWindow;     // main window associated with this, or null
+		QIcon           mIconDisabled;
 		KToggleAction*  mActionEnabled;
 		NewAlarmAction* mActionNew;
 		TemplateMenuAction* mActionNewFromTemplate;
[prev in list] [next in list] [prev in thread] [next in thread]