Changeset 102139 in vbox

Timestamp:

Nov 17, 2023 2:35:57 PM (17 months ago)

Author:

vboxsync

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

160264

Message:

FE/Qt: bugref:10513: Get rid of UISettingsDialog/Specific usage; Keeping files for now, but not include or compile them.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/manager/UIVirtualBoxManager.cpp (modified) (6 diffs)
• src/manager/UIVirtualBoxManager.h (modified) (2 diffs)
• src/runtime/UISession.cpp (modified) (1 diff)
• src/settings/UIAdvancedSettingsDialogSpecific.cpp (modified) (1 diff)
• src/settings/UIAdvancedSettingsDialogSpecific.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -868 +868 @@
         src/settings/UIAdvancedSettingsDialog.h \
         src/settings/UIAdvancedSettingsDialogSpecific.h \
-        src/settings/UISettingsDialog.h \
-        src/settings/UISettingsDialogSpecific.h \
         src/settings/UISettingsPage.h \
         src/settings/UISettingsPageValidator.h \
@@ -1456 +1454 @@
         src/settings/UIAdvancedSettingsDialog.cpp \
         src/settings/UIAdvancedSettingsDialogSpecific.cpp \
-        src/settings/UISettingsDialog.cpp \
-        src/settings/UISettingsDialogSpecific.cpp \
         src/settings/UISettingsPage.cpp \
         src/settings/UISettingsPageValidator.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -881 +881 @@
     /* Special handling for opened settings dialog: */
     if (   m_pWidget->isLocalMachineItemSelected()
-        && m_settings.contains(UISettingsDialog::Type_Machine))
+        && m_settings.contains(UIAdvancedSettingsDialog::Type_Machine))
     {
         /* Cast dialog to required type: */
         UIAdvancedSettingsDialogMachine *pDialog =
-            qobject_cast<UIAdvancedSettingsDialogMachine*>(m_settings.value(UISettingsDialog::Type_Machine));
+            qobject_cast<UIAdvancedSettingsDialogMachine*>(m_settings.value(UIAdvancedSettingsDialog::Type_Machine));
         AssertPtrReturnVoid(pDialog);
 
@@ -1106 +1106 @@
 
     /* Create instance if not yet created: */
-    if (!m_settings.contains(UISettingsDialog::Type_Global))
-    {
-        m_settings[UISettingsDialog::Type_Global] = new UIAdvancedSettingsDialogGlobal(this);
-        connect(m_settings[UISettingsDialog::Type_Global], &UIAdvancedSettingsDialogGlobal::sigClose,
+    if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Global))
+    {
+        m_settings[UIAdvancedSettingsDialog::Type_Global] = new UIAdvancedSettingsDialogGlobal(this);
+        connect(m_settings[UIAdvancedSettingsDialog::Type_Global], &UIAdvancedSettingsDialogGlobal::sigClose,
                 this, &UIVirtualBoxManager::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));
 }
 
@@ -1121 +1121 @@
 {
     /* Remove instance if exist: */
-    delete m_settings.take(UISettingsDialog::Type_Global);
+    delete m_settings.take(UIAdvancedSettingsDialog::Type_Global);
 }
 
@@ -1304 +1304 @@
 
             /* Create instance if not yet created: */
-            if (!m_settings.contains(UISettingsDialog::Type_Machine))
+            if (!m_settings.contains(UIAdvancedSettingsDialog::Type_Machine))
             {
-                m_settings[UISettingsDialog::Type_Machine] = new UIAdvancedSettingsDialogMachine(this,
-                                                                                                 uID.isNull() ? pItem->id() : uID,
-                                                                                                 actionPool(),
-                                                                                                 strCategory,
-                                                                                                 strControl);
-                connect(m_settings[UISettingsDialog::Type_Machine], &UIAdvancedSettingsDialogMachine::sigClose,
+                m_settings[UIAdvancedSettingsDialog::Type_Machine] = new UIAdvancedSettingsDialogMachine(this,
+                                                                                                         uID.isNull() ? pItem->id() : uID,
+                                                                                                         actionPool(),
+                                                                                                         strCategory,
+                                                                                                         strControl);
+                connect(m_settings[UIAdvancedSettingsDialog::Type_Machine], &UIAdvancedSettingsDialogMachine::sigClose,
                         this, &UIVirtualBoxManager::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));
         }
     }
@@ -1341 +1341 @@
     /* What type of dialog should we delete? */
     enum DelType { None, Local, Cloud, All } enmType = None;
-    if (qobject_cast<UISettingsDialog*>(sender()))
+    if (qobject_cast<UIAdvancedSettingsDialog*>(sender()))
         enmType = (DelType)(enmType | Local);
     else if (qobject_cast<UICloudMachineSettingsDialog*>(sender()))
@@ -1352 +1352 @@
     /* Remove requested instances: */
     if (enmType & Local)
-        delete m_settings.take(UISettingsDialog::Type_Machine);
+        delete m_settings.take(UIAdvancedSettingsDialog::Type_Machine);
     if (enmType & Cloud)
         delete m_pCloudSettings;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -44 +44 @@
 #include "UICommon.h"
 #include "UIExtraDataDefs.h"
-#include "UISettingsDialog.h"
+#include "UIAdvancedSettingsDialog.h"
 
 /* Forward declarations: */
@@ -518 +518 @@
 
     /** Holds the map of various settings dialogs. */
-    QMap<UISettingsDialog::DialogType, UIAdvancedSettingsDialog*>  m_settings;
+    QMap<UIAdvancedSettingsDialog::DialogType, UIAdvancedSettingsDialog*>  m_settings;
 
     /** Holds the cloud settings dialog instance. */

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

@@ -51 +51 @@
 #include "UINotificationCenter.h"
 #include "UISession.h"
-#include "UISettingsDialogSpecific.h"
 #include "UITextTable.h"
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UISettingsDialogSpecific class implementation.
+ * VBox Qt GUI - UIAdvancedSettingsDialogSpecific class implementation.
  */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UISettingsDialogSpecific class declaration.
+ * VBox Qt GUI - UIAdvancedSettingsDialogSpecific class declaration.
  */