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

[vidalia-svn] r3894: Fix issue in NetViewer.ui. Added seperate resource for netwo (in vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin: . res res/32x32)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3894: Fix issue in NetViewer.ui. Added seperate resource for netwo (in vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin: . res res/32x32)
From: tyree731@xxxxxxxxxxxxxxxxxxx
Date: Thu, 25 Jun 2009 01:35:01 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Thu, 25 Jun 2009 01:35:03 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: tyree731
Date: 2009-06-25 01:35:01 -0400 (Thu, 25 Jun 2009)
New Revision: 3894

Added:
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/applications-internet.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/system-help.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-fullscreen.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-refresh.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/window-close.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-fit-best.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-in.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-out.png
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/NetworkMapPlugin.qrc
Modified:
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
Log:
Fix issue in NetViewer.ui. Added seperate resource for networkmapplugin.


Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt	2009-06-25 05:04:51 UTC (rev 3893)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt	2009-06-25 05:35:01 UTC (rev 3894)
@@ -34,20 +34,13 @@
 )
 qt4_wrap_cpp(networkmapplugin_SRCS
   NetworkMapPlugin.h
-#  CircuitItem.h
   CircuitListWidget.h
   GeoIpCache.h
-#  GeoIpCacheItem.h
-#  GeoIp.h
-#  GeoIpRequest.h
   GeoIpResolver.h
-#  GeoIpResponse.h
   NetViewer.h
   RouterDescriptorView.h
   RouterInfoDialog.h
-#  RouterListItem.h
   RouterListWidget.h
-#  StreamItem.h
 )
 
 if (USE_MARBLE)
@@ -77,5 +70,9 @@
   RouterInfoDialog.ui
 )
 
+qt4_add_resources(networkmapplugin_SRCS
+  res/NetworkMapPlugin.qrc
+)
+
 add_library(networkmapplugin STATIC  ${networkmapplugin_SRCS})
 target_link_libraries(networkmapplugin ${QT_LIBRARIES})

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-25 05:04:51 UTC (rev 3893)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-25 05:35:01 UTC (rev 3894)
@@ -24,7 +24,7 @@
    <string>Tor Network Map</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../res/vidalia.qrc" >:/images/32x32/applications-internet.png</iconset>
+   <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/applications-internet.png</iconset>
   </property>
   <property name="toolButtonStyle" >
    <enum>Qt::ToolButtonTextUnderIcon</enum>
@@ -234,7 +234,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh</string>
@@ -251,7 +251,7 @@
   </action>
   <action name="actionHelp" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/system-help.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/system-help.png</iconset>
    </property>
    <property name="text" >
     <string>Help</string>
@@ -268,7 +268,7 @@
   </action>
   <action name="actionClose" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/window-close.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/window-close.png</iconset>
    </property>
    <property name="text" >
     <string>Close</string>
@@ -285,7 +285,7 @@
   </action>
   <action name="actionZoomIn" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-in.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-in.png</iconset>
    </property>
    <property name="text" >
     <string>Zoom In</string>
@@ -302,7 +302,7 @@
   </action>
   <action name="actionZoomOut" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-out.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-out.png</iconset>
    </property>
    <property name="text" >
     <string>Zoom Out</string>
@@ -319,7 +319,7 @@
   </action>
   <action name="actionZoomToFit" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-fit-best.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-fit-best.png</iconset>
    </property>
    <property name="text" >
     <string>Zoom To Fit</string>
@@ -336,7 +336,7 @@
   </action>
   <action name="actionZoomFullScreen" >
    <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-fullscreen.png</iconset>
+    <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/view-fullscreen.png</iconset>
    </property>
    <property name="text" >
     <string>Full Screen</string>
@@ -370,7 +370,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../res/vidalia.qrc" />
+  <include location="./res/NetworkMapPlugin.qrc" />
  </resources>
  <connections>
   <connection>

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/applications-internet.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/applications-internet.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/system-help.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/system-help.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-fullscreen.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-fullscreen.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-refresh.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/view-refresh.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/window-close.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/window-close.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-fit-best.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-fit-best.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-in.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-in.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-out.png
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/32x32/zoom-out.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/NetworkMapPlugin.qrc
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/NetworkMapPlugin.qrc	                        (rev 0)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/res/NetworkMapPlugin.qrc	2009-06-25 05:35:01 UTC (rev 3894)
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/networkmap_images">
+        <file>32x32/applications-internet.png</file>
+        <file>32x32/view-fullscreen.png</file>
+        <file>32x32/view-refresh.png</file>
+        <file>32x32/zoom-fit-best.png</file>
+        <file>32x32/zoom-in.png</file>
+        <file>32x32/zoom-out.png</file>
+    </qresource>
+</RCC>

Prev by Author: [vidalia-svn] r3891: Forgot a file. Oops. (vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin)
Next by Author: [vidalia-svn] r3895: NetworkMapPlugin loads, had to discard const qualifier to do (in vidalia/branches/extension-api/src/vidalia: . NetworkMapPlugin)
Previous by thread: [vidalia-svn] r3893: Remove the Breakpad branch now that the merge into trunk is (vidalia/branches)
Next by thread: [vidalia-svn] r3895: NetworkMapPlugin loads, had to discard const qualifier to do (in vidalia/branches/extension-api/src/vidalia: . NetworkMapPlugin)
Index(es):
- Author
- Thread