[vidalia-svn] r3924: Remove silly close buttons from Network map and Message Log. (in vidalia/branches/extension-api/src/vidalia: MessageLogPlugin NetworkMapPlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-06-29 17:25:35 -0400 (Mon, 29 Jun 2009)
New Revision: 3924

Modified:
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
   vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.ui
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
Log:
Remove silly close buttons from Network map and Message Log.


Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp	2009-06-29 21:19:15 UTC (rev 3923)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.cpp	2009-06-29 21:25:35 UTC (rev 3924)
@@ -128,8 +128,6 @@
 #if defined(Q_WS_MAC)
   ui.actionHelp->setShortcut(QString("Ctrl+?"));
 #endif
-  ui.actionClose->setShortcut(QString("Esc"));
-  Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
 }
 
 /** Set tooltips for Message Filter checkboxes in code because they are long

Modified: vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.ui	2009-06-29 21:19:15 UTC (rev 3923)
+++ vidalia/branches/extension-api/src/vidalia/MessageLogPlugin/MessageLog.ui	2009-06-29 21:25:35 UTC (rev 3924)
@@ -445,7 +445,6 @@
    <addaction name="separator" />
    <addaction name="actionSettings" />
    <addaction name="actionHelp" />
-   <addaction name="actionClose" />
   </widget>
   <action name="actionMessage_Filters" >
    <property name="text" >
@@ -573,20 +572,6 @@
     <string>F1</string>
    </property>
   </action>
-  <action name="actionClose" >
-   <property name="icon" >
-    <iconset resource="..\res\vidalia.qrc" >:/images/32x32/window-close.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Close</string>
-   </property>
-   <property name="statusTip" >
-    <string>Close the Message Log</string>
-   </property>
-   <property name="shortcut" >
-    <string>Esc</string>
-   </property>
-  </action>
   <action name="actionFind" >
    <property name="icon" >
     <iconset resource="..\res\vidalia.qrc" >:/images/32x32/edit-find.png</iconset>

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp	2009-06-29 21:19:15 UTC (rev 3923)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.cpp	2009-06-29 21:25:35 UTC (rev 3924)
@@ -49,10 +49,6 @@
   ui.actionHelp->setShortcut(QString("Ctrl+?"));
 #endif
 
-  /* Pressing 'Esc' or 'Ctrl+W' will close the window */
-  ui.actionClose->setShortcut(QString("Esc"));
-  Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
-
   /* Get the TorControl object */
   _torControl = Vidalia::torControl();
   _torControl->setEvent(TorEvents::NewDescriptor, this, true);

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-29 21:19:15 UTC (rev 3923)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/NetViewer.ui	2009-06-29 21:25:35 UTC (rev 3924)
@@ -227,7 +227,6 @@
    <addaction name="actionZoomFullScreen" />
    <addaction name="separator" />
    <addaction name="actionHelp" />
-   <addaction name="actionClose" />
   </widget>
   <action name="actionRefresh" >
    <property name="enabled" >
@@ -266,23 +265,6 @@
     <string>F1</string>
    </property>
   </action>
-  <action name="actionClose" >
-   <property name="icon" >
-    <iconset resource="../res/vidalia.qrc" >:/images/32x32/window-close.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Close</string>
-   </property>
-   <property name="toolTip" >
-    <string>Close the network map</string>
-   </property>
-   <property name="statusTip" >
-    <string>Close the network map</string>
-   </property>
-   <property name="shortcut" >
-    <string>Esc</string>
-   </property>
-  </action>
   <action name="actionZoomIn" >
    <property name="icon" >
     <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-in.png</iconset>