Changeset 2983 for vidalia/trunk

Timestamp:

08/17/08 01:59:43 (3 months ago)

Author:

edmanm

Message:

Make both the 'Ctrl+W' and 'Esc' shortcuts for closing a window work for
all windows on all platforms.

Location:

vidalia/trunk/src/vidalia

Files:

• about/aboutdialog.cpp (modified) (1 diff)
• bwgraph/bwgraph.cpp (modified) (1 diff)
• config/configdialog.cpp (modified) (1 diff)
• help/browser/helpbrowser.cpp (modified) (1 diff)
• log/messagelog.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (1 diff)
• network/netviewer.cpp (modified) (1 diff)

vidalia/trunk/src/vidalia/about/aboutdialog.cpp

@@ -25 +25 @@
 {
   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 */

vidalia/trunk/src/vidalia/bwgraph/bwgraph.cpp

@@ -46 +46 @@
   /* 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 */

vidalia/trunk/src/vidalia/config/configdialog.cpp

@@ -61 +61 @@
   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()));
   }
   

vidalia/trunk/src/vidalia/help/browser/helpbrowser.cpp

@@ -51 +51 @@
   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 */

vidalia/trunk/src/vidalia/log/messagelog.cpp

@@ -114 +114 @@
   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()));
 }
 

vidalia/trunk/src/vidalia/mainwindow.cpp

@@ -95 +95 @@
 
   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 */

vidalia/trunk/src/vidalia/network/netviewer.cpp

@@ -45 +45 @@
   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 */