Changeset 52694 in vbox for trunk

Timestamp:

Sep 11, 2014 11:49:22 AM (11 years ago)

Author:

vboxsync

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

96021

Message:

FE/Qt: 7462: Non Mac OS X hosts: Runtime UI: Invoke popup-menu if menu-bar is hidden.

Location:

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

Files:

• UIKeyboardHandlerNormal.cpp (modified) (3 diffs)
• UIMachineLogicNormal.cpp (modified) (5 diffs)
• UIMachineLogicNormal.h (modified) (2 diffs)

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
 #ifndef Q_WS_MAC
-/* Qt includes: */
 # include <QMainWindow>
 # include <QMenuBar>
 # include <QKeyEvent>
+# include <QTimer>
 #endif /* !Q_WS_MAC */
 
@@ -26 +27 @@
 #include "UIKeyboardHandlerNormal.h"
 #ifndef Q_WS_MAC
+# include "UIMachineLogic.h"
 # include "UIMachineWindow.h"
 # include "UIShortcutPool.h"
 #endif /* !Q_WS_MAC */
 
+/* Namespaces: */
 #ifndef Q_WS_MAC
-/* Namespaces: */
 using namespace UIExtraDataDefs;
 #endif /* !Q_WS_MAC */
@@ -70 +72 @@
                     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())
+                        /* Is menu-bar visible? */
+                        if (pMenuBar->isVisible())
                         {
-                            /* Activate 'active' menu-bar action: */
-                            pMenuBar->activeAction()->activate(QAction::Trigger);
+                            /* 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);
 #ifdef Q_WS_WIN
-                            /* Windows host needs separate 'focus set'
-                             * to let menubar operate while popped up: */
-                            pMenuBar->setFocus();
+                                /* Windows host needs separate 'focus set'
+                                 * to let menubar operate while popped up: */
+                                pMenuBar->setFocus();
 #endif /* Q_WS_WIN */
-                            /* Filter-out this event: */
-                            return true;
+                            }
                         }
+                        else
+                        {
+                            /* Post request to show popup-menu: */
+                            QTimer::singleShot(0, m_pMachineLogic, SLOT(sltInvokePopupMenu()));
+                        }
+                        /* Filter-out this event: */
+                        return true;
                     }
                 }

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

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QMenu>
+#ifndef Q_WS_MAC
+# include <QTimer>
+#endif /* !Q_WS_MAC */
 
 /* GUI includes: */
@@ -30 +32 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
-#ifdef Q_WS_MAC
+#ifndef Q_WS_MAC
+# include "QIMenu.h"
+#else /* Q_WS_MAC */
 #include "VBoxUtils.h"
 #endif /* Q_WS_MAC */
@@ -40 +44 @@
 UIMachineLogicNormal::UIMachineLogicNormal(QObject *pParent, UISession *pSession)
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Normal)
+#ifndef Q_WS_MAC
+    , m_pPopupMenu(0)
+#endif /* !Q_WS_MAC */
 {
 }
@@ -75 +82 @@
     }
 }
+
+#ifndef RT_OS_DARWIN
+void UIMachineLogicNormal::sltInvokePopupMenu()
+{
+    /* Popup main-menu if present: */
+    if (m_pPopupMenu && !m_pPopupMenu->isEmpty())
+    {
+        m_pPopupMenu->popup(activeMachineWindow()->geometry().center());
+        QTimer::singleShot(0, m_pPopupMenu, SLOT(sltHighlightFirstAction()));
+    }
+}
+#endif /* RT_OS_DARWIN */
 
 void UIMachineLogicNormal::sltOpenMenuBarSettings()
@@ -259 +278 @@
 }
 
+#ifndef Q_WS_MAC
+void UIMachineLogicNormal::prepareMenu()
+{
+    /* Prepare popup-menu: */
+    m_pPopupMenu = new QIMenu;
+    AssertPtrReturnVoid(m_pPopupMenu);
+    {
+        /* Prepare popup-menu: */
+        foreach (QMenu *pMenu, actionPool()->menus())
+            m_pPopupMenu->addMenu(pMenu);
+    }
+}
+#endif /* !Q_WS_MAC */
+
+#ifndef Q_WS_MAC
+void UIMachineLogicNormal::cleanupMenu()
+{
+    /* Cleanup popup-menu: */
+    delete m_pPopupMenu;
+    m_pPopupMenu = 0;
+}
+#endif /* !Q_WS_MAC */
+
 void UIMachineLogicNormal::cleanupMachineWindows()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

@@ -42 +42 @@
     void sltCheckForRequestedVisualStateType();
 
+#ifndef RT_OS_DARWIN
+    /** Invokes popup-menu. */
+    void sltInvokePopupMenu();
+#endif /* RT_OS_DARWIN */
+
     /** Opens menu-bar editor.*/
     void sltOpenMenuBarSettings();
@@ -66 +71 @@
     void prepareActionConnections();
     void prepareMachineWindows();
+#ifndef Q_WS_MAC
+    void prepareMenu();
+#endif /* !Q_WS_MAC */
 
     /* Cleanup helpers: */
+#ifndef Q_WS_MAC
+    void cleanupMenu();
+#endif /* !Q_WS_MAC */
     void cleanupMachineWindows();
     void cleanupActionConnections();
+
+#ifndef Q_WS_MAC
+    /** Holds the popup-menu instance. */
+    QMenu *m_pPopupMenu;
+#endif /* !Q_WS_MAC */
 
     /* Friend classes: */