[vidalia-svn] r2978: Restore the "zoom" and "close" icons in the router and circu (in vidalia/trunk: . src/vidalia/network src/vidalia/res src/vidalia/res/22x22)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-08-16 21:52:19 -0400 (Sat, 16 Aug 2008)
New Revision: 2978

Added:
   vidalia/trunk/src/vidalia/res/22x22/edit-delete.png
   vidalia/trunk/src/vidalia/res/22x22/page-zoom.png
Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp
   vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
   vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:
Restore the "zoom" and "close" icons in the router and circuit list
context menus. They were lost in the move to the Oxygen icon theme
in 0.1.4.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-08-17 01:28:25 UTC (rev 2977)
+++ vidalia/trunk/CHANGELOG	2008-08-17 01:52:19 UTC (rev 2978)
@@ -2,6 +2,9 @@
   o Reduce the default number of messages to retain in the message log to 50
     messages. Most people never look at the window and the extra 200 messages
     just needlessly eat memory.
+  o Restore the "zoom" and "close" icons in the router and circuit list
+    context menus. They were lost in the move to the Oxygen icon theme in
+    0.1.4.
 
 
 0.1.7   02-Aug-2008

Modified: vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp	2008-08-17 01:28:25 UTC (rev 2977)
+++ vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp	2008-08-17 01:52:19 UTC (rev 2978)
@@ -20,8 +20,8 @@
 
 #include "circuitlistwidget.h"
 
-#define IMG_CLOSE   ":/images/16x16/network-offline.png"
-#define IMG_ZOOM    ":/images/16x16/zoom.png"
+#define IMG_CLOSE   ":/images/22x22/edit-delete.png"
+#define IMG_ZOOM    ":/images/22x22/page-zoom.png"
 
 #define CLOSED_CIRCUIT_REMOVE_DELAY     3000
 #define FAILED_CIRCUIT_REMOVE_DELAY     5000

Modified: vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-08-17 01:28:25 UTC (rev 2977)
+++ vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-08-17 01:52:19 UTC (rev 2978)
@@ -19,7 +19,7 @@
 
 #include "routerlistwidget.h"
 
-#define IMG_ZOOM   ":/images/16x16/zoom.png"
+#define IMG_ZOOM   ":/images/22x22/page-zoom.png"
 
 
 RouterListWidget::RouterListWidget(QWidget *parent)

Added: vidalia/trunk/src/vidalia/res/22x22/edit-delete.png
===================================================================
(Binary files differ)


Property changes on: vidalia/trunk/src/vidalia/res/22x22/edit-delete.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: vidalia/trunk/src/vidalia/res/22x22/page-zoom.png
===================================================================
(Binary files differ)


Property changes on: vidalia/trunk/src/vidalia/res/22x22/page-zoom.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2008-08-17 01:28:25 UTC (rev 2977)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2008-08-17 01:52:19 UTC (rev 2978)
@@ -31,6 +31,7 @@
     <qresource prefix="/images">
         <file>22x22/application-exit.png</file>
         <file>22x22/edit-copy.png</file>
+        <file>22x22/edit-delete.png</file>
         <file>22x22/folder.png</file>
         <file>22x22/format-justify-fill.png</file>
         <file>22x22/go-down-search.png</file>
@@ -38,6 +39,7 @@
         <file>22x22/help-about.png</file>
         <file>22x22/list-add.png</file>
         <file>22x22/list-remove.png</file>
+        <file>22x22/page-zoom.png</file>
         <file>22x22/preferences-system.png</file>
         <file>22x22/system-help.png</file>
         <file>22x22/tor-off.png</file>