Changeset 27233 in vbox

Timestamp:

Mar 9, 2010 9:40:39 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: bug fix for normal (windowed) mode: handle 'host+home' as menu-bar focus shortcut.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)

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

@@ -816 +816 @@
                 }
 
-                if (pKeyEvent->key() == Qt::Key_Home)
-                {
-#if 0 // TODO: Divide tha code to specific parts of fullscreen & seamless and move it there:
-                    /* Activate the main menu */
-                    if (machineWindowWrapper()->isTrueSeamless() || machineWindowWrapper()->isTrueFullscreen())
-                        machineWindowWrapper()->popupMainMenu (uisession()->isMouseCaptured());
-#endif
-                }
-                else
-                {
-                    /* Process hot keys not processed in keyEvent() (as in case of non-alphanumeric keys): */
-                    machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence(pKeyEvent->key()));
-                }
+                /* Process hot keys not processed in keyEvent() (as in case of non-alphanumeric keys): */
+                machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence(pKeyEvent->key()));
             }
             else if (!m_bIsHostkeyPressed && pEvent->type() == QEvent::KeyRelease)

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

@@ -225 +225 @@
             if (isHostKeyPressed() && pEvent->type() == QEvent::KeyPress)
             {
+                /* Process Host+Home as menu-bar activator: */
                 if (pKeyEvent->key() == Qt::Key_Home)
                 {
-                    /* In Qt4 it is not enough to just set the focus to menu-bar.
-                     * So to get the menu-bar we have to send Qt::Key_Alt press/release events directly: */
-                    QKeyEvent e1(QEvent::KeyPress, Qt::Key_Alt, Qt::NoModifier);
-                    QKeyEvent e2(QEvent::KeyRelease, Qt::Key_Alt, Qt::NoModifier);
+                    /* Trying to get menu-bar: */
                     QMenuBar *pMenuBar = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
                                          qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow())->menuBar() : 0;
-                    QApplication::sendEvent(pMenuBar, &e1);
-                    QApplication::sendEvent(pMenuBar, &e2);
+
+                    /* If menu-bar is present and have actions: */
+                    if (pMenuBar && !pMenuBar->actions().isEmpty())
+                    {
+                        /* If 'active' action is NOT chosen: */
+                        if (!pMenuBar->activeAction())
+                            /* Set first menu-bar action as 'active': */
+                            pMenuBar->setActiveAction(pMenuBar->actions()[0]);
+
+                        /* If 'active' action is chosen: */
+                        if (pMenuBar->activeAction())
+                        {
+                            /* Activate 'active' menu-bar action: */
+                            pMenuBar->activeAction()->activate(QAction::Trigger);
+
+                            /* Accept this event: */
+                            pEvent->accept();
+                            return true;
+                        }
+                    }
                 }
                 else