Changeset 51395 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 26, 2014 1:42:06 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Move Global Preferences call functionality to appropriate place (from UISession to UIMachineLogic).

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

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

@@ -2252 +2252 @@
 #endif
         m_pHostLedsState = NULL;
-        }
+    }
+}
+
+void UIMachineLogic::sltShowGlobalPreferences()
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Just show Global Preferences: */
+    showGlobalPreferences();
+}
+
+void UIMachineLogic::showGlobalPreferences(const QString &strCategory /* = QString() */, const QString &strControl /* = QString() */)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* 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(activeMachineWindow(),
+                                                                          strCategory, strControl);
+    pDialog->execute();
+    if (pDialog)
+        delete pDialog;
+
+    /* Remember that we do NOT handling that already: */
+    gActionPool->action(UIActionIndex_Simple_Preferences)->setData(false);
 }
 

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

@@ -248 +248 @@
     void sltSwitchKeyboardLedsToPreviousLeds();
 
+    /** Show Global Preferences. */
+    void sltShowGlobalPreferences();
+
 private:
+
+    /** Show Global Preferences on the page defined by @a strCategory and tab defined by @a strControl. */
+    void showGlobalPreferences(const QString &strCategory = QString(), const QString &strControl = QString());
 
     /* Helpers: */

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

@@ -699 +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);