Changeset 106554 in vbox for trunk

Timestamp:

Oct 21, 2024 11:11:50 AM (6 months ago)

Author:

vboxsync

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

165388

Message:

FE/Qt: bugref:10513: Runtime UI / Machine-logic: Cleanup and reorder code related to Preferences/Settings dialogs.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (9 diffs)
• UIMachineLogic.h (modified) (2 diffs)

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

@@ -1519 +1519 @@
 }
 
-void UIMachineLogic::sltOpenPreferencesDialog(const QString &strCategory /* = QString() */,
-                                              const QString &strControl /* = QString() */)
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
-    /* Create instance if not yet created: */
-    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Global))
-    {
-        m_settings[UIAdvancedSettingsDialog::Type_Global] = new UIAdvancedSettingsDialogGlobal(activeMachineWindow(),
-                                                                                               strCategory,
-                                                                                               strControl);
-        connect(m_settings[UIAdvancedSettingsDialog::Type_Global], &UIAdvancedSettingsDialog::sigClose,
-                this, &UIMachineLogic::sltClosePreferencesDialog);
-        const bool fSuccess = m_settings.value(UIAdvancedSettingsDialog::Type_Global)->load();
-        if (!fSuccess)
-        {
-            delete m_settings.take(UIAdvancedSettingsDialog::Type_Global);
-            return;
-        }
-    }
-
-    /* Expose instance: */
-    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Global));
-}
-
 void UIMachineLogic::sltClosePreferencesDialog()
 {
@@ -1564 +1537 @@
     LogRel(("GUI: Request to close active machine-window.\n"));
     activeMachineWindow()->close();
-}
-
-void UIMachineLogic::sltOpenSettingsDialog(const QString &strCategory /* = QString() */,
-                                           const QString &strControl /* = QString()*/)
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
-    /* Create instance if not yet created: */
-    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Machine))
-    {
-        m_settings[UIAdvancedSettingsDialog::Type_Machine] = new UIAdvancedSettingsDialogMachine(activeMachineWindow(),
-                                                                                                 uiCommon().managedVMUuid(),
-                                                                                                 actionPool(),
-                                                                                                 strCategory,
-                                                                                                 strControl);
-        connect(m_settings[UIAdvancedSettingsDialog::Type_Machine], &UIAdvancedSettingsDialog::sigClose,
-                this, &UIMachineLogic::sltCloseSettingsDialog);
-        const bool fSuccess = m_settings.value(UIAdvancedSettingsDialog::Type_Machine)->load();
-        if (!fSuccess)
-        {
-            delete m_settings.take(UIAdvancedSettingsDialog::Type_Machine);
-            return;
-        }
-    }
-
-    /* Expose instance: */
-    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Machine));
 }
 
@@ -1945 +1889 @@
 {
     /* Open VM settings : Display page : Recording tab: */
-    sltOpenSettingsDialog("#display", "m_pCheckboxVideoCapture");
+    openSettingsDialog("#display", "m_pCheckboxVideoCapture");
 }
 
@@ -1995 +1939 @@
 {
     /* Global preferences: Input page: */
-    sltOpenPreferencesDialog("#input", "m_pMachineTable");
+    openPreferencesDialog("#input", "m_pMachineTable");
 }
 
@@ -2133 +2077 @@
 {
     /* Machine settings: Storage page: */
-    sltOpenSettingsDialog("#storage");
+    openSettingsDialog("#storage");
 }
 
@@ -2202 +2146 @@
 {
     /* Open VM settings : Network page: */
-    sltOpenSettingsDialog("#network");
+    openSettingsDialog("#network");
 }
 
@@ -2208 +2152 @@
 {
     /* Machine settings: Storage page: */
-    sltOpenSettingsDialog("#usb");
+    openSettingsDialog("#usb");
 }
 
@@ -2218 +2162 @@
 
     /* Open VM settings : Shared folders page: */
-    sltOpenSettingsDialog("#sharedFolders");
+    openSettingsDialog("#sharedFolders");
 }
 
@@ -2963 +2907 @@
 }
 
+void UIMachineLogic::openPreferencesDialog(const QString &strCategory /* = QString() */,
+                                           const QString &strControl /* = QString() */)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Create instance if not yet created: */
+    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Global))
+    {
+        m_settings[UIAdvancedSettingsDialog::Type_Global] = new UIAdvancedSettingsDialogGlobal(activeMachineWindow(),
+                                                                                               strCategory,
+                                                                                               strControl);
+        connect(m_settings.value(UIAdvancedSettingsDialog::Type_Global), &UIAdvancedSettingsDialog::sigClose,
+                this, &UIMachineLogic::sltClosePreferencesDialog);
+        const bool fSuccess = m_settings.value(UIAdvancedSettingsDialog::Type_Global)->load();
+        if (!fSuccess)
+        {
+            delete m_settings.take(UIAdvancedSettingsDialog::Type_Global);
+            return;
+        }
+    }
+
+    /* Expose instance: */
+    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Global));
+}
+
+void UIMachineLogic::openSettingsDialog(const QString &strCategory /* = QString() */,
+                                        const QString &strControl /* = QString()*/)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Create instance if not yet created: */
+    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Machine))
+    {
+        m_settings[UIAdvancedSettingsDialog::Type_Machine] = new UIAdvancedSettingsDialogMachine(activeMachineWindow(),
+                                                                                                 uiCommon().managedVMUuid(),
+                                                                                                 actionPool(),
+                                                                                                 strCategory,
+                                                                                                 strControl);
+        connect(m_settings.value(UIAdvancedSettingsDialog::Type_Machine), &UIAdvancedSettingsDialog::sigClose,
+                this, &UIMachineLogic::sltCloseSettingsDialog);
+        const bool fSuccess = m_settings.value(UIAdvancedSettingsDialog::Type_Machine)->load();
+        if (!fSuccess)
+        {
+            delete m_settings.take(UIAdvancedSettingsDialog::Type_Machine);
+            return;
+        }
+    }
+
+    /* Expose instance: */
+    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Machine));
+}
+
 void UIMachineLogic::takeScreenshot(const QString &strFile, const QString &strFormat /* = "png" */) const
 {

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

@@ -228 +228 @@
 
     /* "Application" menu functionality: */
-    void sltOpenPreferencesDialog(const QString &strCategory = QString(), const QString &strControl = QString());
-    void sltOpenPreferencesDialogDefault() { sltOpenPreferencesDialog(); }
+    void sltOpenPreferencesDialogDefault() { openPreferencesDialog(); }
     void sltClosePreferencesDialog();
     void sltClose();
 
     /* "Machine" menu functionality: */
-    void sltOpenSettingsDialog(const QString &strCategory = QString(), const QString &strControl = QString());
-    void sltOpenSettingsDialogDefault() { sltOpenSettingsDialog(); }
+    void sltOpenSettingsDialogDefault() { openSettingsDialog(); }
     void sltCloseSettingsDialog();
     void sltTakeSnapshot();
@@ -356 +354 @@
     void askUserForTheDiskEncryptionPasswords();
 
+    /** Opens Global preferences dialog.
+      * @param  strCategory  Brings the category to open.
+      * @param  strControl   Brings the name of control to choose.
+      * @param  fAppModal    Brings whether dialog should be app modal. */
+    void openPreferencesDialog(const QString &strCategory = QString(),
+                               const QString &strControl = QString());
+
+    /** Opens VM settings dialog.
+      * @param  strCategory  Brings the category to open.
+      * @param  strControl   Brings the name of control to choose.
+      * @param  fAppModal    Brings whether dialog should be app modal. */
+    void openSettingsDialog(const QString &strCategory = QString(),
+                            const QString &strControl = QString());
+
     /* Helpers: */
     void takeScreenshot(const QString &strFile, const QString &strFormat /* = "png" */) const;