Changeset 35752 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 28, 2011 10:57:53 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69709

Message:

FE/Qt4: make Host+Home configurable

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineShortcuts.cpp (modified) (1 diff)
• UIMachineShortcuts.h (modified) (1 diff)
• fullscreen/UIKeyboardHandlerFullscreen.cpp (modified) (2 diffs)
• normal/UIKeyboardHandlerNormal.cpp (modified) (2 diffs)
• scale/UIKeyboardHandlerScale.cpp (modified) (2 diffs)
• seamless/UIKeyboardHandlerSeamless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp

@@ -61 +61 @@
     m_Shortcuts[UpdateShortcut]                = UIKeySequence("Update");
     m_Shortcuts[AboutShortcut]                 = UIKeySequence("About");
+    m_Shortcuts[PopupMenuShortcut]             = UIKeySequence("PopupMenu",             "Home");
     /* Overwrite the key sequences with the one in extra data. */
     loadExtraData(VBoxDefs::GUI_Input_MachineShortcuts, EndShortcutType);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.h

@@ -59 +59 @@
         UpdateShortcut,
         AboutShortcut,
-        EndShortcutType,
+        PopupMenuShortcut,
+        EndShortcutType
     };
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp

@@ -26 +26 @@
 #include "UIKeyboardHandlerFullscreen.h"
 #include "UIMachineWindow.h"
+#include "UIMachineShortcuts.h"
 
 /* Fullscreen keyboard-handler constructor: */
@@ -55 +56 @@
                 QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
                 /* Process Host+Home for menu popup: */
-                if (isHostKeyPressed() && pKeyEvent->key() == Qt::Key_Home)
+                if (isHostKeyPressed() && pKeyEvent->key() == gMS->keySequence(UIMachineShortcuts::PopupMenuShortcut))
                 {
                     /* Post request to show popup-menu: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp

@@ -26 +26 @@
 #include "UIKeyboardHandlerNormal.h"
 #include "UIMachineWindow.h"
+#include "UIMachineShortcuts.h"
 
 /* Fullscreen keyboard-handler constructor: */
@@ -58 +59 @@
                 QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
                 /* Process Host+Home as menu-bar activator: */
-                if (isHostKeyPressed() && pKeyEvent->key() == Qt::Key_Home)
+                if (isHostKeyPressed() && pKeyEvent->key() == gMS->keySequence(UIMachineShortcuts::PopupMenuShortcut))
                 {
                     /* Trying to get menu-bar: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp

@@ -26 +26 @@
 #include "UIKeyboardHandlerScale.h"
 #include "UIMachineWindow.h"
+#include "UIMachineShortcuts.h"
 
 /* Fullscreen keyboard-handler constructor: */
@@ -58 +59 @@
                 QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
                 /* Process Host+Home for menu popup: */
-                if (isHostKeyPressed() && pKeyEvent->key() == Qt::Key_Home)
+                if (isHostKeyPressed() && pKeyEvent->key() == gMS->keySequence(UIMachineShortcuts::PopupMenuShortcut))
                 {
                     /* Post request to show popup-menu: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp

@@ -26 +26 @@
 #include "UIKeyboardHandlerSeamless.h"
 #include "UIMachineWindow.h"
+#include "UIMachineShortcuts.h"
 
 /* Fullscreen keyboard-handler constructor: */
@@ -55 +56 @@
                 QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
                 /* Process Host+Home for menu popup: */
-                if (isHostKeyPressed() && pKeyEvent->key() == Qt::Key_Home)
+                if (isHostKeyPressed() && pKeyEvent->key() == gMS->keySequence(UIMachineShortcuts::PopupMenuShortcut))
                 {
                     /* Post request to show popup-menu: */