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

List:       kde-commits
Subject:    playground/utils/charm/trunk/Charm
From:       Mike Arthur <mike () mikearthur ! co ! uk>
Date:       2009-11-17 10:01:42
Message-ID: 1258452102.160439.5309.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1050406 by mikearthur:

Use monochrome Charm systray icon on OSX.


 M  +1 -1      Application.cpp  
 M  +1 -0      CharmResources.qrc  
 M  +12 -0     Data.cpp  
 M  +1 -0      Data.h  
 AM            Icons/charmtrayicon.png  


--- trunk/playground/utils/charm/trunk/Charm/Application.cpp #1050405:1050406
@@ -110,7 +110,7 @@
     // MIRKO_TEMP_REM where to put quit action?
     // m_systrayContextMenu.addAction( m_mainWindow.actionQuit() );
     m_trayIcon.setContextMenu( &m_systrayContextMenu );
-    m_trayIcon.setIcon( Data::charmIcon() );
+    m_trayIcon.setIcon( Data::charmTrayIcon() );
     m_trayIcon.show();
 
 #if defined Q_WS_MAC
--- trunk/playground/utils/charm/trunk/Charm/CharmResources.qrc #1050405:1050406
@@ -10,6 +10,7 @@
 		<file alias="next.png">Icons/forward.png</file>
 		<file alias="previous.png">Icons/back.png</file>
 		<file alias="charmicon.png">Icons/Charm-512x512.png</file>
+		<file alias="charmtrayicon.png">Icons/charmtrayicon.png</file>
 	    <file alias="quitcharm.png">Icons/exit.png</file>
 	    <file alias="clearfilter.png">Icons/locationbar_erase.png</file>
 	    <file alias="configure.png">Icons/configure.png</file>
--- trunk/playground/utils/charm/trunk/Charm/Data.cpp #1050405:1050406
@@ -12,6 +12,18 @@
 	return icon;
 }
 
+const QIcon& Data::charmTrayIcon()
+{
+#ifndef Q_WS_MAC
+	return charmIcon();
+#else
+	Q_ASSERT_X(!QPixmap(":/Charm/charmtrayicon.png").isNull(), "Data::charmTrayIcon",
+			"Required resource not available");
+	static QIcon icon(QPixmap(":/Charm/charmtrayicon.png"));
+	return icon;
+#endif
+}
+
 const QIcon& Data::goIcon()
 {
 	Q_ASSERT_X(!QPixmap(":/Charm/go.png").isNull(), "Data::goIcon",
--- trunk/playground/utils/charm/trunk/Charm/Data.h #1050405:1050406
@@ -7,6 +7,7 @@
 class Data {
 public:
     static const QIcon& charmIcon();
+    static const QIcon& charmTrayIcon();
 
     static const QIcon& goIcon();
     static const QIcon& stopIcon();
** trunk/playground/utils/charm/trunk/Charm/Icons/charmtrayicon.png #property svn:mime-type
   + application/octet-stream
[prev in list] [next in list] [prev in thread] [next in thread]