Changeset 102138 in vbox for trunk/src

Timestamp:

Nov 17, 2023 2:11:21 PM (17 months ago)

Author:

vboxsync

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

160263

Message:

FE/Qt: bugref:10513: Runtime UI / Machine logic: Switching to advanced settings dialog as well.

Location:

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

Files:

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

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

@@ -44 +44 @@
 #include "UIActionPoolRuntime.h"
 #include "UIAddDiskEncryptionPasswordDialog.h"
+#include "UIAdvancedSettingsDialogSpecific.h"
 #include "UIBootFailureDialog.h"
 #include "UICommon.h"
@@ -69 +70 @@
 #include "UIMouseHandler.h"
 #include "UINotificationCenter.h"
-#include "UISettingsDialogSpecific.h"
 #include "UISoftKeyboard.h"
 #include "UITakeSnapshotDialog.h"
@@ -1530 +1530 @@
 
     /* Create instance if not yet created: */
-    if (!m_settings.contains(UISettingsDialog::Type_Global))
-    {
-        m_settings[UISettingsDialog::Type_Global] = new UISettingsDialogGlobal(activeMachineWindow(),
-                                                                               strCategory,
-                                                                               strControl);
-        connect(m_settings[UISettingsDialog::Type_Global], &UISettingsDialogGlobal::sigClose,
+    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Global))
+    {
+        m_settings[UIAdvancedSettingsDialog::Type_Global] = new UIAdvancedSettingsDialogGlobal(activeMachineWindow(),
+                                                                                               strCategory,
+                                                                                               strControl);
+        connect(m_settings[UIAdvancedSettingsDialog::Type_Global], &UIAdvancedSettingsDialogGlobal::sigClose,
                 this, &UIMachineLogic::sltClosePreferencesDialog);
-        m_settings.value(UISettingsDialog::Type_Global)->load();
+        m_settings.value(UIAdvancedSettingsDialog::Type_Global)->load();
     }
 
     /* Expose instance: */
-    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UISettingsDialog::Type_Global));
+    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Global));
 }
 
@@ -1547 +1547 @@
 {
     /* Remove instance if exist: */
-    delete m_settings.take(UISettingsDialog::Type_Global);
+    delete m_settings.take(UIAdvancedSettingsDialog::Type_Global);
 }
 
@@ -1572 +1572 @@
 
     /* Create instance if not yet created: */
-    if (!m_settings.contains(UISettingsDialog::Type_Machine))
-    {
-        m_settings[UISettingsDialog::Type_Machine] = new UISettingsDialogMachine(activeMachineWindow(),
-                                                                                 uiCommon().managedVMUuid(),
-                                                                                 actionPool(),
-                                                                                 strCategory,
-                                                                                 strControl);
-        connect(m_settings[UISettingsDialog::Type_Machine], &UISettingsDialogGlobal::sigClose,
+    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], &UIAdvancedSettingsDialogGlobal::sigClose,
                 this, &UIMachineLogic::sltCloseSettingsDialog);
-        m_settings.value(UISettingsDialog::Type_Machine)->load();
+        m_settings.value(UIAdvancedSettingsDialog::Type_Machine)->load();
     }
 
     /* Expose instance: */
-    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UISettingsDialog::Type_Machine));
+    UIDesktopWidgetWatchdog::restoreWidget(m_settings.value(UIAdvancedSettingsDialog::Type_Machine));
 }
 
@@ -1591 +1591 @@
 {
     /* Remove instance if exist: */
-    delete m_settings.take(UISettingsDialog::Type_Machine);
+    delete m_settings.take(UIAdvancedSettingsDialog::Type_Machine);
 }
 

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

@@ -35 +35 @@
 #include "QIWithRetranslateUI.h"
 #include "UIExtraDataDefs.h"
-#include "UISettingsDialog.h"
+#include "UIAdvancedSettingsDialog.h"
 
 /* Forward declarations: */
@@ -398 +398 @@
 
     /** Holds the map of settings dialogs. */
-    QMap<UISettingsDialog::DialogType, UISettingsDialog*>  m_settings;
+    QMap<UIAdvancedSettingsDialog::DialogType, UIAdvancedSettingsDialog*>  m_settings;
 
     /** Holds the log viewer dialog instance. */