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

[vidalia-svn] r3495: Vidalia: Now with 100% more produce. (in vidalia/trunk/src/vidalia: . about res res/128x128 res/16x16 res/22x22 res/32x32 res/48x48 res/icons)



Author: edmanm
Date: 2009-01-31 19:34:33 -0500 (Sat, 31 Jan 2009)
New Revision: 3495

Added:
   vidalia/trunk/src/vidalia/res/128x128/tor-logo.png
   vidalia/trunk/src/vidalia/res/16x16/tor-off.png
   vidalia/trunk/src/vidalia/res/16x16/tor-on.png
   vidalia/trunk/src/vidalia/res/16x16/tor-starting.png
   vidalia/trunk/src/vidalia/res/16x16/tor-stopping.png
   vidalia/trunk/src/vidalia/res/22x22/tor-off.png
   vidalia/trunk/src/vidalia/res/22x22/tor-on.png
   vidalia/trunk/src/vidalia/res/22x22/tor-starting.png
   vidalia/trunk/src/vidalia/res/22x22/tor-stopping.png
   vidalia/trunk/src/vidalia/res/32x32/tor-logo.png
   vidalia/trunk/src/vidalia/res/32x32/tor-off.png
   vidalia/trunk/src/vidalia/res/32x32/tor-on.png
   vidalia/trunk/src/vidalia/res/32x32/tor-starting.png
   vidalia/trunk/src/vidalia/res/32x32/tor-stopping.png
   vidalia/trunk/src/vidalia/res/48x48/tor-off.png
   vidalia/trunk/src/vidalia/res/48x48/tor-on.png
   vidalia/trunk/src/vidalia/res/48x48/tor-starting.png
   vidalia/trunk/src/vidalia/res/48x48/tor-stopping.png
   vidalia/trunk/src/vidalia/res/icons/tor-off.icns
   vidalia/trunk/src/vidalia/res/icons/tor-on.icns
   vidalia/trunk/src/vidalia/res/icons/tor-starting.icns
   vidalia/trunk/src/vidalia/res/icons/tor-stopping.icns
Removed:
   vidalia/trunk/src/vidalia/res/128x128/vidalia-logo.png
   vidalia/trunk/src/vidalia/res/16x16/status-green.png
   vidalia/trunk/src/vidalia/res/16x16/status-orange.png
   vidalia/trunk/src/vidalia/res/16x16/status-red.png
   vidalia/trunk/src/vidalia/res/22x22/status-green.png
   vidalia/trunk/src/vidalia/res/22x22/status-orange.png
   vidalia/trunk/src/vidalia/res/22x22/status-red.png
   vidalia/trunk/src/vidalia/res/22x22/vidalia.png
   vidalia/trunk/src/vidalia/res/32x32/status-green.png
   vidalia/trunk/src/vidalia/res/32x32/status-orange.png
   vidalia/trunk/src/vidalia/res/32x32/status-red.png
   vidalia/trunk/src/vidalia/res/48x48/status-green.png
   vidalia/trunk/src/vidalia/res/48x48/status-orange.png
   vidalia/trunk/src/vidalia/res/48x48/status-red.png
   vidalia/trunk/src/vidalia/res/48x48/vidalia.png
   vidalia/trunk/src/vidalia/res/icons/status-green.icns
   vidalia/trunk/src/vidalia/res/icons/status-orange.icns
   vidalia/trunk/src/vidalia/res/icons/status-red.icns
Modified:
   vidalia/trunk/src/vidalia/about/aboutdialog.ui
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/mainwindow.ui
   vidalia/trunk/src/vidalia/res/icons/vidalia.icns
   vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:

Vidalia: Now with 100% more produce.


Modified: vidalia/trunk/src/vidalia/about/aboutdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.ui	2009-01-31 23:56:04 UTC (rev 3494)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.ui	2009-02-01 00:34:33 UTC (rev 3495)
@@ -43,7 +43,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="../res/vidalia.qrc" >:/images/128x128/vidalia-logo.png</pixmap>
+      <pixmap resource="../res/vidalia.qrc" >:/images/128x128/tor-logo.png</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignCenter</set>

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2009-01-31 23:56:04 UTC (rev 3494)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2009-02-01 00:34:33 UTC (rev 3495)
@@ -53,31 +53,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/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"
+#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"
 
 /* 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/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"
+#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"
 #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    "status-red"
-#define IMG_TOR_RUNNING    "status-green"
-#define IMG_TOR_STARTING   "status-orange"
-#define IMG_TOR_STOPPING   "status-orange"
+#define IMG_TOR_STOPPED    "tor-off"
+#define IMG_TOR_RUNNING    "tor-on"
+#define IMG_TOR_STARTING   "tor-starting"
+#define IMG_TOR_STOPPING   "tor-stopping"
 #else
 /* On X11, we just use always the 22x22 .png files */
-#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"
+#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"
 #endif
 
 /** Only allow 'New Identity' to be clicked once every 10 seconds. */

Modified: vidalia/trunk/src/vidalia/mainwindow.ui
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.ui	2009-01-31 23:56:04 UTC (rev 3494)
+++ vidalia/trunk/src/vidalia/mainwindow.ui	2009-02-01 00:34:33 UTC (rev 3495)
@@ -19,7 +19,7 @@
    <string>Vidalia Control Panel</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="res/vidalia.qrc" >:/images/48x48/vidalia.png</iconset>
+   <iconset resource="res/vidalia.qrc" >:/images/32x32/tor-logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QVBoxLayout" >

Added: vidalia/trunk/src/vidalia/res/128x128/tor-logo.png
===================================================================
(Binary files differ)


Property changes on: vidalia/trunk/src/vidalia/res/128x128/tor-logo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Copied: vidalia/trunk/src/vidalia/res/16x16/tor-off.png (from rev 3302, vidalia/trunk/src/vidalia/res/16x16/tor-off.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/16x16/tor-on.png (from rev 3302, vidalia/trunk/src/vidalia/res/16x16/tor-on.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/16x16/tor-starting.png (from rev 3302, vidalia/trunk/src/vidalia/res/16x16/tor-starting.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/16x16/tor-stopping.png (from rev 3302, vidalia/trunk/src/vidalia/res/16x16/tor-stopping.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/22x22/tor-off.png (from rev 3302, vidalia/trunk/src/vidalia/res/22x22/tor-off.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/22x22/tor-on.png (from rev 3302, vidalia/trunk/src/vidalia/res/22x22/tor-on.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/22x22/tor-starting.png (from rev 3302, vidalia/trunk/src/vidalia/res/22x22/tor-starting.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/22x22/tor-stopping.png (from rev 3302, vidalia/trunk/src/vidalia/res/22x22/tor-stopping.png)
===================================================================
(Binary files differ)

Added: vidalia/trunk/src/vidalia/res/32x32/tor-logo.png
===================================================================
(Binary files differ)


Property changes on: vidalia/trunk/src/vidalia/res/32x32/tor-logo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Copied: vidalia/trunk/src/vidalia/res/32x32/tor-off.png (from rev 3302, vidalia/trunk/src/vidalia/res/32x32/tor-off.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/32x32/tor-on.png (from rev 3302, vidalia/trunk/src/vidalia/res/32x32/tor-on.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/32x32/tor-starting.png (from rev 3302, vidalia/trunk/src/vidalia/res/32x32/tor-starting.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/32x32/tor-stopping.png (from rev 3302, vidalia/trunk/src/vidalia/res/32x32/tor-stopping.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/48x48/tor-off.png (from rev 3302, vidalia/trunk/src/vidalia/res/48x48/tor-off.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/48x48/tor-on.png (from rev 3302, vidalia/trunk/src/vidalia/res/48x48/tor-on.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/48x48/tor-starting.png (from rev 3302, vidalia/trunk/src/vidalia/res/48x48/tor-starting.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/48x48/tor-stopping.png (from rev 3302, vidalia/trunk/src/vidalia/res/48x48/tor-stopping.png)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/icons/tor-off.icns (from rev 3302, vidalia/trunk/src/vidalia/res/icons/tor-off.icns)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/icons/tor-on.icns (from rev 3302, vidalia/trunk/src/vidalia/res/icons/tor-on.icns)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/icons/tor-starting.icns (from rev 3302, vidalia/trunk/src/vidalia/res/icons/tor-starting.icns)
===================================================================
(Binary files differ)

Copied: vidalia/trunk/src/vidalia/res/icons/tor-stopping.icns (from rev 3302, vidalia/trunk/src/vidalia/res/icons/tor-stopping.icns)
===================================================================
(Binary files differ)

Modified: vidalia/trunk/src/vidalia/res/icons/vidalia.icns
===================================================================
(Binary files differ)

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2009-01-31 23:56:04 UTC (rev 3494)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2009-02-01 00:34:33 UTC (rev 3495)
@@ -18,11 +18,12 @@
         <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-off.png</file>
+        <file>16x16/tor-on.png</file>
+        <file>16x16/tor-starting.png</file>
+        <file>16x16/tor-stopping.png</file>
         <file>16x16/utilities-log-viewer.png</file>
         <file>16x16/utilities-system-monitor.png</file>
         <file>16x16/view-media-artist.png</file>
@@ -41,10 +42,11 @@
         <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>
+        <file>22x22/tor-starting.png</file>
+        <file>22x22/tor-stopping.png</file>
         <file>22x22/utilities-system-monitor.png</file>
     </qresource>
     <qresource prefix="/images">
@@ -68,11 +70,13 @@
         <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/system-software-update.png</file>
+        <file>32x32/tor-logo.png</file>
+        <file>32x32/tor-off.png</file>
+        <file>32x32/tor-on.png</file>
+        <file>32x32/tor-starting.png</file>
+        <file>32x32/tor-stopping.png</file>
         <file>32x32/utilities-log-viewer.png</file>
         <file>32x32/utilities-system-monitor.png</file>
         <file>32x32/view-refresh.png</file>
@@ -89,15 +93,15 @@
         <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>
+        <file>48x48/tor-stopping.png</file>
         <file>48x48/system-software-update.png</file>
-        <file>48x48/vidalia.png</file>
         <file>48x48/view-media-artist.png</file>
     </qresource>
     <qresource prefix="/images">
-        <file>128x128/vidalia-logo.png</file>
+        <file>128x128/tor-logo.png</file>
     </qresource>
     <qresource prefix="/images">
         <file>icons/node-unresponsive.png</file>