Changeset 51392 in vbox

Timestamp:

May 26, 2014 12:32:56 PM (11 years ago)

Author:

vboxsync

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

93913

Message:

FE/Qt: Implement 'Global Preferences' action for Runtime UI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -249 +249 @@
 enum RuntimeMenuApplicationActionType
 {
-    RuntimeMenuApplicationActionType_Invalid = 0,
-    RuntimeMenuApplicationActionType_About   = RT_BIT(0),
-    RuntimeMenuApplicationActionType_All     = 0xFFFF
+    RuntimeMenuApplicationActionType_Invalid     = 0,
+    RuntimeMenuApplicationActionType_About       = RT_BIT(0),
+    RuntimeMenuApplicationActionType_Preferences = RT_BIT(1),
+    RuntimeMenuApplicationActionType_All         = 0xFFFF
 };
 #endif /* Q_WS_MAC */
@@ -335 +336 @@
 #ifndef Q_WS_MAC
     RuntimeMenuHelpActionType_About                = RT_BIT(4),
+    RuntimeMenuHelpActionType_Preferences          = RT_BIT(5),
 #endif /* !Q_WS_MAC */
     RuntimeMenuHelpActionType_All                  = 0xFFFF

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

@@ -629 +629 @@
     else
         gActionPool->action(UIActionIndex_Simple_About)->setEnabled(false);
+
+    /* Preferences action: */
+#ifdef Q_WS_MAC
+    if (m_pSession->allowedActionsMenuApplication() & RuntimeMenuApplicationActionType_Preferences)
+#else /* !Q_WS_MAC */
+    if (m_pSession->allowedActionsMenuHelp() & RuntimeMenuHelpActionType_Preferences)
+#endif /* Q_WS_MAC */
+    {
+        pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Preferences));
+        VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Preferences), SIGNAL(triggered()),
+                            m_pSession, SLOT(sltOpenGlobalPreferences()));
+    }
+    else
+        gActionPool->action(UIActionIndex_Simple_Preferences)->setEnabled(false);
 }
 

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

@@ -40 +40 @@
 #include "UIConsoleEventHandler.h"
 #include "UIFrameBuffer.h"
+#include "UISettingsDialogSpecific.h"
 #ifdef VBOX_WITH_VIDEOHWACCEL
 # include "VBoxFBOverlay.h"
@@ -698 +699 @@
 }
 
+void UISession::sltOpenGlobalPreferences()
+{
+    /* Check that we do NOT handling that already: */
+    if (gActionPool->action(UIActionIndex_Simple_Preferences)->data().toBool())
+        return;
+    /* Remember that we handling that already: */
+    gActionPool->action(UIActionIndex_Simple_Preferences)->setData(true);
+
+    /* Create and execute global settings window: */
+    QPointer<UISettingsDialogGlobal> pDialog = new UISettingsDialogGlobal(machineLogic()->activeMachineWindow());
+    pDialog->execute();
+    if (pDialog)
+        delete pDialog;
+
+    /* Remember that we do NOT handling that already: */
+    gActionPool->action(UIActionIndex_Simple_Preferences)->setData(false);
+}
+
 void UISession::sltMousePointerShapeChange(bool fVisible, bool fAlpha, QPoint hotCorner, QSize size, QVector<uint8_t> shape)
 {

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

@@ -284 +284 @@
     void sltCloseRuntimeUI();
 
+    /** Open global preferences. */
+    void sltOpenGlobalPreferences();
+
     /* Console events slots */
     void sltMousePointerShapeChange(bool fVisible, bool fAlpha, QPoint hotCorner, QSize size, QVector<uint8_t> shape);