[vidalia-svn] r2983: Make both the 'Ctrl+W' and 'Esc' shortcuts for closing a win (in vidalia/trunk/src/vidalia: . about bwgraph config help/browser log network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-08-17 01:59:43 -0400 (Sun, 17 Aug 2008)
New Revision: 2983

Modified:
   vidalia/trunk/src/vidalia/about/aboutdialog.cpp
   vidalia/trunk/src/vidalia/bwgraph/bwgraph.cpp
   vidalia/trunk/src/vidalia/config/configdialog.cpp
   vidalia/trunk/src/vidalia/help/browser/helpbrowser.cpp
   vidalia/trunk/src/vidalia/log/messagelog.cpp
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/network/netviewer.cpp
Log:
Make both the 'Ctrl+W' and 'Esc' shortcuts for closing a window work for
all windows on all platforms.


Modified: vidalia/trunk/src/vidalia/about/aboutdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -24,11 +24,10 @@
 : VidaliaWindow("AboutDialog", parent, flags)
 {
   ui.setupUi(this);
-#if defined(Q_WS_WIN)
+
+  /* Pressing 'Esc' or 'Ctrl+W' will close the window */
   setShortcut("Esc", SLOT(close()));
-#else
   setShortcut("Ctrl+W", SLOT(close()));
-#endif
 
   /* Save the TorControl object to use later */
   _torControl = Vidalia::torControl();

Modified: vidalia/trunk/src/vidalia/bwgraph/bwgraph.cpp
===================================================================
--- vidalia/trunk/src/vidalia/bwgraph/bwgraph.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/bwgraph/bwgraph.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -45,11 +45,10 @@
 {
   /* Invoke Qt Designer generated QObject setup routine */
   ui.setupUi(this);
-#if defined(Q_WS_WIN)
+
+  /* Pressing 'Esc' or 'Ctrl+W' will close the window */
   setShortcut("Esc", SLOT(close()));
-#else
   setShortcut("Ctrl+W", SLOT(close()));
-#endif
 
   /* Bind events to actions */
   createActions();

Modified: vidalia/trunk/src/vidalia/config/configdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/configdialog.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/config/configdialog.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -60,8 +60,8 @@
   button = ui.buttonBox->button(QDialogButtonBox::Cancel);
   if (button) {
     button->setText(tr("Cancel"));
-    Vidalia::createShortcut(QKeySequence(Qt::Key_Escape),
-                            this, button, SLOT(click()));
+    Vidalia::createShortcut("Esc", this, button, SLOT(click()));
+    Vidalia::createShortcut("Ctrl+W", this, button, SLOT(click()));
   }
   
   /* Connect the button box signals to the appropriate slots */

Modified: vidalia/trunk/src/vidalia/help/browser/helpbrowser.cpp
===================================================================
--- vidalia/trunk/src/vidalia/help/browser/helpbrowser.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/help/browser/helpbrowser.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -50,10 +50,11 @@
 #if defined(Q_WS_MAC)
   ui.actionHome->setShortcut(QString("Shift+Ctrl+H"));
 #endif
-#if !defined(Q_WS_WIN)
-  ui.actionClose->setShortcut(QString("Ctrl+W"));
-#endif
 
+  /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+  ui.actionClose->setShortcut(QString("Esc"));
+  Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
+
   /* Hide Search frame */
   ui.frmFind->setHidden(true);
  

Modified: vidalia/trunk/src/vidalia/log/messagelog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/log/messagelog.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/log/messagelog.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -113,9 +113,8 @@
 #if defined(Q_WS_MAC)
   ui.actionHelp->setShortcut(QString("Ctrl+?"));
 #endif
-#if !defined(Q_WS_WIN)
-  ui.actionClose->setShortcut(QString("Ctrl+W"));
-#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/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -95,6 +95,10 @@
 
   ui.setupUi(this);
 
+  /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+  Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click()));
+  Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click()));
+
   /* Create all the dialogs of which we only want one instance */
   _messageLog     = new MessageLog();
   _bandwidthGraph = new BandwidthGraph();

Modified: vidalia/trunk/src/vidalia/network/netviewer.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/netviewer.cpp	2008-08-17 05:58:13 UTC (rev 2982)
+++ vidalia/trunk/src/vidalia/network/netviewer.cpp	2008-08-17 05:59:43 UTC (rev 2983)
@@ -44,10 +44,11 @@
 #if defined(Q_WS_MAC)
   ui.actionHelp->setShortcut(QString("Ctrl+?"));
 #endif
-#if !defined(Q_WS_WIN)
-  ui.actionClose->setShortcut(QString("Ctrl+W"));
-#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);