Changeset 19684 in vbox

Timestamp:

May 14, 2009 10:17:06 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3865: Host key shortcut for installing Guest Additions - Implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxConsoleWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -3417 +3417 @@
     {
         if (QMenu *menu = pAction->menu())
-            return processHotKey (aKey, menu->actions());
-
-        QString hotkey = VBoxGlobal::extractKeyFromActionText (pAction->text());
-        if (pAction->isEnabled() && !hotkey.isEmpty())
-        {
-            if (aKey.matches (QKeySequence (hotkey)) == QKeySequence::ExactMatch)
-            {
-                /*
-                 *  we asynchronously post a special event instead of calling
-                 *  pAction->trigger() directly, to let key presses and
-                 *  releases be processed correctly by Qt first. Note: we
-                 *  assume that nobody will delete the menu item corresponding
-                 *  to the key sequence, so that the pointer to menu data
-                 *  posted along with the event will remain valid in the event
-                 *  handler, at least until the main window is closed.
-                 */
-                QApplication::postEvent (this,
-                                         new ActivateMenuEvent (pAction));
+        {
+            /* Process recursively for each sub-menu */
+            if (processHotKey (aKey, menu->actions()))
                 return true;
+        }
+        else
+        {
+            QString hotkey = VBoxGlobal::extractKeyFromActionText (pAction->text());
+            if (pAction->isEnabled() && !hotkey.isEmpty())
+            {
+                if (aKey.matches (QKeySequence (hotkey)) == QKeySequence::ExactMatch)
+                {
+                    /* We asynchronously post a special event instead of calling
+                     * pAction->trigger() directly, to let key presses and
+                     * releases be processed correctly by Qt first.
+                     * Note: we assume that nobody will delete the menu item
+                     * corresponding to the key sequence, so that the pointer to
+                     * menu data posted along with the event will remain valid in
+                     * the event handler, at least until the main window is closed. */
+                    QApplication::postEvent (this, new ActivateMenuEvent (pAction));
+                    return true;
+                }
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1713 +1713 @@
         tr ("Open the dialog to operate on shared folders"));
 
-    mDevicesInstallGuestToolsAction->setText (tr ("&Install Guest Additions..."));
+    mDevicesInstallGuestToolsAction->setText (VBoxGlobal::insertKeyToActionText (tr ("&Install Guest Additions..."),
+                                                                                 "D"));
     mDevicesInstallGuestToolsAction->setStatusTip (
         tr ("Mount the Guest Additions installation image"));