Changeset 28457 in vbox

Timestamp:

Apr 19, 2010 12:36:06 PM (15 years ago)

Author:

vboxsync

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

60230

Message:

FE/Qt: New running VM core menubar fixes: 1. Normal mode menubar now works properly under win host; 2. Fullscreen/Seamless modes menubar now highlights first menu item (as in old core).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/runtime/UIMachineMenuBar.cpp (modified) (3 diffs)
• src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• src/runtime/normal/UIMachineViewNormal.cpp (modified) (3 diffs)
• src/runtime/seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -420 +420 @@
 VirtualBox_QT_MOCSRCS += \
         src/runtime/UIActionsPool.cpp \
+        src/runtime/UIMachineMenuBar.cpp \
         src/runtime/UIIndicatorsPool.cpp \
         src/runtime/UIMachine.cpp \

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

@@ -32 +32 @@
 #include <QMenuBar>
 
+/* Helper QMenu reimplementation which allows
+ * to highlight first menu item for popped up menu: */
+class UIMenu : public QMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIMenu() : QMenu(0) {}
+
+private slots:
+
+    void sltSelectFirstAction()
+    {
+#ifdef Q_WS_WIN
+        activateWindow();
+#endif
+        QMenu::focusNextChild();
+    }
+};
+
 UIMachineMenuBar::UIMachineMenuBar()
     /* On the Mac we add some items only the first time, cause otherwise they
@@ -42 +63 @@
 {
     /* Create empty menu: */
-    QMenu *pMenu = new QMenu;
+    QMenu *pMenu = new UIMenu;
 
     /* Fill menu with prepared items: */
@@ -241 +262 @@
 }
 
+#include "UIMachineMenuBar.moc"
+

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

@@ -24 +24 @@
 /* Global includes */
 #include <QDesktopWidget>
+#include <QTimer>
 #ifdef Q_WS_MAC
 # include <QMenuBar>
@@ -130 +131 @@
     /* Popup main menu if present: */
     if (m_pMainMenu && !m_pMainMenu->isEmpty())
+    {
         m_pMainMenu->popup(machineWindow()->geometry().center());
+        QTimer::singleShot(0, m_pMainMenu, SLOT(sltSelectFirstAction()));
+    }
 }
 

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

@@ -175 +175 @@
                             pMenuBar->activeAction()->activate(QAction::Trigger);
 
+#ifdef Q_WS_WIN
+                            /* Windows host needs separate 'focus set'
+                             * to let menubar operate while popped up: */
+                            pMenuBar->setFocus();
+#endif /* ifdef Q_WS_WIN */
+
                             /* Accept this event: */
                             pEvent->accept();
@@ -197 +203 @@
     QMainWindow *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
                                qobject_cast<QMainWindow*>(machineWindowWrapper()->machineWindow()) : 0;
+#ifdef Q_WS_WIN
+    QMenuBar *pMenuBar = pMainDialog ? pMainDialog->menuBar() : 0;
+#endif /* ifdef Q_WS_WIN */
 
     if (pWatched != 0 && pWatched == pMainDialog)
@@ -228 +237 @@
     }
 
+#ifdef Q_WS_WIN
+    else if (pWatched != 0 && pWatched == pMenuBar)
+    {
+        /* Due to windows host uses separate 'focus set' to let menubar to
+         * operate while popped up (see UIMachineViewNormal::event() for details),
+         * it also requires backward processing: */
+        switch (pEvent->type())
+        {
+            /* If menubar gets the focus while not popped up => give it back: */
+            case QEvent::FocusIn:
+            {
+                if (!QApplication::activePopupWidget())
+                    setFocus();
+            }
+            default:
+                break;
+        }
+    }
+#endif /* ifdef Q_WS_WIN */
+
     return UIMachineView::eventFilter(pWatched, pEvent);
 }

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

@@ -24 +24 @@
 /* Global includes */
 #include <QDesktopWidget>
+#include <QTimer>
 #ifdef Q_WS_MAC
 # include <QMenuBar>
@@ -127 +128 @@
     /* Popup main menu if present: */
     if (m_pMainMenu && !m_pMainMenu->isEmpty())
+    {
         m_pMainMenu->popup(machineWindow()->geometry().center());
+        QTimer::singleShot(0, m_pMainMenu, SLOT(sltSelectFirstAction()));
+    }
 }