[vidalia-svn] r3896: NetworkMap displaying icons and loading properly. Help reque (vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-06-26 00:52:16 -0400 (Fri, 26 Jun 2009)
New Revision: 3896

Modified:
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
Log:
NetworkMap displaying icons and loading properly. Help request does not work until proper PluginManager slot for it.


Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp	2009-06-26 04:36:42 UTC (rev 3895)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp	2009-06-26 04:52:16 UTC (rev 3896)
@@ -589,5 +589,5 @@
 QIcon
 NetViewer::tabIcon() const
 {
-  return QIcon();
+  return QIcon(":/images/16x16/applications-internet.png");
 }

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-26 04:36:42 UTC (rev 3895)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-26 04:52:16 UTC (rev 3896)
@@ -24,7 +24,7 @@
    <string>Tor Network Map</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="./res/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/applications-internet.png</iconset>
+   <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/view-refresh.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/system-help.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/window-close.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-in.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-out.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/zoom-fit-best.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/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/NetworkMapPlugin.qrc" >:/networkmap_images/32x32/view-fullscreen.png</iconset>
+    <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-fullscreen.png</iconset>
    </property>
    <property name="text" >
     <string>Full Screen</string>
@@ -370,7 +370,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="./res/NetworkMapPlugin.qrc" />
+  <include location="../res/vidalia.qrc" />
  </resources>
  <connections>
   <connection>