Changeset 34158 in vbox

Timestamp:

Nov 18, 2010 9:56:36 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: make menu handling work in newer Qt versions

Location:

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

Files:

• UIActionsPool.cpp (modified) (1 diff)
• UIMachineMenuBar.cpp (modified) (2 diffs)

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

@@ -1192 +1192 @@
      * when creating a new QMenuBar. For simplicity we doing this on all
      * platforms right now. */
+    if (m_actionsPool[UIActionIndex_Simple_Help])
+        delete m_actionsPool[UIActionIndex_Simple_Help];
+    m_actionsPool[UIActionIndex_Simple_Help] = new ShowHelpAction(this);
+    if (m_actionsPool[UIActionIndex_Simple_Web])
+        delete m_actionsPool[UIActionIndex_Simple_Web];
+    m_actionsPool[UIActionIndex_Simple_Web] = new ShowWebAction(this);
+    if (m_actionsPool[UIActionIndex_Simple_ResetWarnings])
+        delete m_actionsPool[UIActionIndex_Simple_ResetWarnings];
+    m_actionsPool[UIActionIndex_Simple_ResetWarnings] = new PerformResetWarningsAction(this);
+#ifdef VBOX_WITH_REGISTRATION
+    if (m_actionsPool[UIActionIndex_Simple_Register])
+        delete m_actionsPool[UIActionIndex_Simple_Register]
+    m_actionsPool[UIActionIndex_Simple_Register] = new PerformRegisterAction(this);
+#endif /* VBOX_WITH_REGISTRATION */
+#if defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)
+    /* For whatever reason, Qt doesn't fully remove items with a
+     * ApplicationSpecificRole from the application menu. Although the QAction
+     * itself is deleted, a dummy entry is leaved back in the menu. Hiding
+     * before deletion helps. */
+    m_actionsPool[UIActionIndex_Simple_Update]->setVisible(false);
+#endif /* Q_WS_MAC */
+    /* Delete the help items as well. This makes sure they are removed also
+     * from the Application menu. */
+#if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
+    if (m_actionsPool[UIActionIndex_Simple_About])
+        delete m_actionsPool[UIActionIndex_Simple_About];
+    m_actionsPool[UIActionIndex_Simple_About] = new ShowAboutAction(this);
+    if (m_actionsPool[UIActionIndex_Simple_Update])
+        delete m_actionsPool[UIActionIndex_Simple_Update];
+    m_actionsPool[UIActionIndex_Simple_Update] = new PerformUpdateAction(this);
+#endif
+    if (m_actionsPool[UIActionIndex_Simple_Close])
+        delete m_actionsPool[UIActionIndex_Simple_Close];
+    m_actionsPool[UIActionIndex_Simple_Close] = new PerformCloseAction(this);
+
+    /* Menus */
     if (m_actionsPool[UIActionIndex_Menu_Machine])
         delete m_actionsPool[UIActionIndex_Menu_Machine];

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

@@ -167 +167 @@
 #ifndef Q_WS_MAC
     pMenu->addSeparator();
-#else /* Q_WS_MAC */
-    if (m_fIsFirstTime)
 #endif /* !Q_WS_MAC */
-        pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Close));
+    pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Close));
 }
 
@@ -222 +220 @@
 #endif
 
-#ifdef Q_WS_MAC
+#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
     if (m_fIsFirstTime)
-#endif /* Q_WS_MAC */
+# endif
         pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Update));
-
 #ifndef Q_WS_MAC
     pMenu->addSeparator();
-#else /* Q_WS_MAC */
+#endif /* !Q_WS_MAC */
+#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
     if (m_fIsFirstTime)
-#endif /* !Q_WS_MAC */
+# endif
         pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_About));
 
+
+#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
     /* Because this connections are done to VBoxGlobal, they are needed once only.
      * Otherwise we will get the slots called more than once. */
     if (m_fIsFirstTime)
     {
-        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Help), SIGNAL(triggered()),
-                            &vboxProblem(), SLOT(showHelpHelpDialog()));
-        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Web), SIGNAL(triggered()),
-                            &vboxProblem(), SLOT(showHelpWebDialog()));
-        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
-                            &vboxProblem(), SLOT(resetSuppressedMessages()));
-#ifdef VBOX_WITH_REGISTRATION
-        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Register), SIGNAL(triggered()),
-                            &vboxGlobal(), SLOT(showRegistrationDialog()));
-#endif /* VBOX_WITH_REGISTRATION */
+#endif
+        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
+                            &vboxProblem(), SLOT(showHelpAboutDialog()));
         VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
                             &vboxGlobal(), SLOT(showUpdateDialog()));
-        VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
-                            &vboxProblem(), SLOT(showHelpAboutDialog()));
-
+#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
+    }
+#endif
+
+    VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Help), SIGNAL(triggered()),
+                        &vboxProblem(), SLOT(showHelpHelpDialog()));
+    VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Web), SIGNAL(triggered()),
+                        &vboxProblem(), SLOT(showHelpWebDialog()));
+    VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
+                        &vboxProblem(), SLOT(resetSuppressedMessages()));
 #ifdef VBOX_WITH_REGISTRATION
-        VBoxGlobal::connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)),
-                            pActionsPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
+    VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Register), SIGNAL(triggered()),
+                        &vboxGlobal(), SLOT(showRegistrationDialog()));
+    VBoxGlobal::connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)),
+                        pActionsPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
 #endif /* VBOX_WITH_REGISTRATION */
-        VBoxGlobal::connect(gEDataEvents, SIGNAL(sigCanShowUpdateDlg(bool)),
-                            pActionsPool->action(UIActionIndex_Simple_Update), SLOT(setEnabled(bool)));
-
-        m_fIsFirstTime = false;
-    }
+
+    m_fIsFirstTime = false;
 }