[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3303: Spray the UI with a healthy dose of Onion-B-Gone. (in vidalia/trunk/src/vidalia: . res)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3303: Spray the UI with a healthy dose of Onion-B-Gone. (in vidalia/trunk/src/vidalia: . res)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Sat, 15 Nov 2008 18:21:26 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Sat, 15 Nov 2008 18:21:29 -0500
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: edmanm
Date: 2008-11-15 18:21:26 -0500 (Sat, 15 Nov 2008)
New Revision: 3303

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:
Spray the UI with a healthy dose of Onion-B-Gone.


Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-11-15 23:17:00 UTC (rev 3302)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-11-15 23:21:26 UTC (rev 3303)
@@ -47,31 +47,31 @@
 #define IMG_STOP_TOR_16      ":/images/16x16/media-playback-stop.png"
 #define IMG_START_TOR_48     ":/images/48x48/media-playback-start.png"
 #define IMG_STOP_TOR_48      ":/images/48x48/media-playback-stop.png"
-#define IMG_TOR_STOPPED_48   ":/images/48x48/tor-off.png"
-#define IMG_TOR_RUNNING_48   ":/images/48x48/tor-on.png"
-#define IMG_TOR_STARTING_48  ":/images/48x48/tor-starting.png"
-#define IMG_TOR_STOPPING_48  ":/images/48x48/tor-stopping.png"
+#define IMG_TOR_STOPPED_48   ":/images/48x48/status-red.png"
+#define IMG_TOR_RUNNING_48   ":/images/48x48/status-green.png"
+#define IMG_TOR_STARTING_48  ":/images/48x48/status-orange.png"
+#define IMG_TOR_STOPPING_48  ":/images/48x48/status-orange.png"
 
 /* Decide which of our four sets of tray icons to use. */
 #if defined(Q_WS_WIN)
 /* QSystemTrayIcon on Windows wants 16x16 .png files */
-#define IMG_TOR_STOPPED  ":/images/16x16/tor-off.png"
-#define IMG_TOR_RUNNING  ":/images/16x16/tor-on.png"
-#define IMG_TOR_STARTING ":/images/16x16/tor-starting.png"
-#define IMG_TOR_STOPPING ":/images/16x16/tor-stopping.png"
+#define IMG_TOR_STOPPED  ":/images/16x16/status-red.png"
+#define IMG_TOR_RUNNING  ":/images/16x16/status-green.png"
+#define IMG_TOR_STARTING ":/images/16x16/status-orange.png"
+#define IMG_TOR_STOPPING ":/images/16x16/status-orange.png"
 #elif defined(Q_WS_MAC)
 /* On Mac, we always go straight to Carbon to load our dock images 
  * from .icns files */
-#define IMG_TOR_STOPPED    "tor-off"
-#define IMG_TOR_RUNNING    "tor-on"
-#define IMG_TOR_STARTING   "tor-starting"
-#define IMG_TOR_STOPPING   "tor-stopping"
+#define IMG_TOR_STOPPED    "status-red"
+#define IMG_TOR_RUNNING    "status-green"
+#define IMG_TOR_STARTING   "status-orange"
+#define IMG_TOR_STOPPING   "status-orange"
 #else
 /* On X11, we just use always the 22x22 .png files */
-#define IMG_TOR_STOPPED    ":/images/22x22/tor-off.png"
-#define IMG_TOR_RUNNING    ":/images/22x22/tor-on.png"
-#define IMG_TOR_STARTING   ":/images/22x22/tor-starting.png"
-#define IMG_TOR_STOPPING   ":/images/22x22/tor-stopping.png"
+#define IMG_TOR_STOPPED    ":/images/22x22/status-red.png"
+#define IMG_TOR_RUNNING    ":/images/22x22/status-green.png"
+#define IMG_TOR_STARTING   ":/images/22x22/status-orange.png"
+#define IMG_TOR_STOPPING   ":/images/22x22/status-orange.png"
 #endif
 
 /** Only allow 'New Identity' to be clicked once every 10 seconds. */

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2008-11-15 23:17:00 UTC (rev 3302)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2008-11-15 23:21:26 UTC (rev 3303)
@@ -18,6 +18,9 @@
         <file>16x16/media-playback-stop.png</file>
         <file>16x16/preferences-desktop-notification.png</file>
         <file>16x16/preferences-system.png</file>
+        <file>16x16/status-green.png</file>
+        <file>16x16/status-orange.png</file>
+        <file>16x16/status-red.png</file>
         <file>16x16/system-help.png</file>
         <file>16x16/system-run.png</file>
         <file>16x16/tor-logo.png</file>
@@ -43,6 +46,9 @@
         <file>22x22/list-remove.png</file>
         <file>22x22/page-zoom.png</file>
         <file>22x22/preferences-system.png</file>
+        <file>22x22/status-green.png</file>
+        <file>22x22/status-orange.png</file>
+        <file>22x22/status-red.png</file>
         <file>22x22/system-help.png</file>
         <file>22x22/tor-off.png</file>
         <file>22x22/tor-on.png</file>
@@ -71,6 +77,9 @@
         <file>32x32/preferences-system-network.png</file>
         <file>32x32/preferences-system-network-sharing.png</file>
         <file>32x32/services.png</file>
+        <file>32x32/status-green.png</file>
+        <file>32x32/status-orange.png</file>
+        <file>32x32/status-red.png</file>
         <file>32x32/system-help.png</file>
         <file>32x32/tor-logo.png</file>
         <file>32x32/tor-off.png</file>
@@ -93,6 +102,9 @@
         <file>48x48/modem.png</file>
         <file>48x48/network-workgroup.png</file>
         <file>48x48/preferences-system-network-sharing.png</file>
+        <file>48x48/status-green.png</file>
+        <file>48x48/status-orange.png</file>
+        <file>48x48/status-red.png</file>
         <file>48x48/tor-off.png</file>
         <file>48x48/tor-on.png</file>
         <file>48x48/tor-starting.png</file>

Prev by Author: [vidalia-svn] r3302: These don't need to be tabstops anymore. (in vidalia: branches/vidalia-0.1/src/vidalia/config trunk/src/vidalia/config)
Next by Author: [vidalia-svn] r3304: Blow away the now-unused onion-based status icons. (in vidalia/trunk/src/vidalia/res: . 16x16 22x22 32x32 48x48 icons)
Previous by thread: [vidalia-svn] r3302: These don't need to be tabstops anymore. (in vidalia: branches/vidalia-0.1/src/vidalia/config trunk/src/vidalia/config)
Next by thread: [vidalia-svn] r3304: Blow away the now-unused onion-based status icons. (in vidalia/trunk/src/vidalia/res: . 16x16 22x22 32x32 48x48 icons)
Index(es):
- Author
- Thread