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

Timestamp:

Mar 21, 2011 12:13:16 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings Dialog: Some internal cleanup and refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/VBoxSelectorWnd.cpp (modified) (3 diffs)
• settings/UISettingsDialog.cpp (modified) (2 diffs)
• settings/UISettingsDialog.h (modified) (2 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (35 diffs)
• settings/UISettingsDialogSpecific.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -595 +595 @@
     CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
 
-    UISettingsDialog *dlg = new UIGLSettingsDlg(this);
+    UISettingsDialog *dlg = new UISettingsDialogGlobal(this);
     dlg->getFrom();
 
@@ -737 +737 @@
     mDoneInaccessibleWarningOnce = true;
 
-    UISettingsDialog *dlg = new UIVMSettingsDlg(this, m, strCategory, strControl);
+    UISettingsDialog *dlg = new UISettingsDialogMachine(this, m, strCategory, strControl);
     dlg->getFrom();
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
 
 /* Settings Dialog Constructor: */
-UISettingsDialog::UISettingsDialog(QWidget *pParent /* = 0 */)
+UISettingsDialog::UISettingsDialog(QWidget *pParent)
     /* Parent class: */
     : QIWithRetranslateUI<QIMainDialog>(pParent)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +41 @@
 
     /* Settings Dialog Constructor/Destructor: */
-    UISettingsDialog(QWidget *pParent = 0);
+    UISettingsDialog(QWidget *pParent);
    ~UISettingsDialog();
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -288 +288 @@
 UISettingsSerializer* UISettingsSerializer::m_pInstance = 0;
 
-UIGLSettingsDlg::UIGLSettingsDlg(QWidget *pParent)
+UISettingsDialogGlobal::UISettingsDialogGlobal(QWidget *pParent)
     : UISettingsDialog(pParent)
 {
@@ -297 +297 @@
 
     /* Creating settings pages: */
-    for (int i = GLSettingsPage_General; i < GLSettingsPage_MAX; ++i)
-    {
-        if (isAvailable(i))
-        {
-            switch (i)
+    for (int iPageIndex = GLSettingsPage_General; iPageIndex < GLSettingsPage_MAX; ++iPageIndex)
+    {
+        if (isAvailable(iPageIndex))
+        {
+            UISettingsPage *pSettingsPage = 0;
+            switch (iPageIndex)
             {
                 /* General page: */
                 case GLSettingsPage_General:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsGeneral;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsGeneral;
                     addItem(":/machine_32px.png", ":/machine_disabled_32px.png",
                             ":/machine_16px.png", ":/machine_disabled_16px.png",
-                            i, "#general", pSettingsPage);
+                            iPageIndex, "#general", pSettingsPage);
                     break;
                 }
@@ -316 +316 @@
                 case GLSettingsPage_Input:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsInput;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsInput;
                     addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png",
                             ":/hostkey_16px.png", ":/hostkey_disabled_16px.png",
-                            i, "#input", pSettingsPage);
+                            iPageIndex, "#input", pSettingsPage);
                     break;
                 }
@@ -326 +325 @@
                 case GLSettingsPage_Update:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsUpdate;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsUpdate;
                     addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
                             ":/refresh_16px.png", ":/refresh_disabled_16px.png",
-                            i, "#update", pSettingsPage);
+                            iPageIndex, "#update", pSettingsPage);
                     break;
                 }
@@ -336 +334 @@
                 case GLSettingsPage_Language:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsLanguage;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsLanguage;
                     addItem(":/site_32px.png", ":/site_disabled_32px.png",
                             ":/site_16px.png", ":/site_disabled_16px.png",
-                            i, "#language", pSettingsPage);
+                            iPageIndex, "#language", pSettingsPage);
                     break;
                 }
@@ -346 +343 @@
                 case GLSettingsPage_USB:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Global);
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Global);
                     addItem(":/usb_32px.png", ":/usb_disabled_32px.png",
                             ":/usb_16px.png", ":/usb_disabled_16px.png",
-                            i, "#usb", pSettingsPage);
+                            iPageIndex, "#usb", pSettingsPage);
                     break;
                 }
@@ -356 +352 @@
                 case GLSettingsPage_Network:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsNetwork;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsNetwork;
                     addItem(":/nw_32px.png", ":/nw_disabled_32px.png",
                             ":/nw_16px.png", ":/nw_disabled_16px.png",
-                            i, "#language", pSettingsPage);
+                            iPageIndex, "#language", pSettingsPage);
                     break;
                 }
@@ -366 +361 @@
                 case GLSettingsPage_Extension:
                 {
-                    UISettingsPage *pSettingsPage = new UIGlobalSettingsExtension;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIGlobalSettingsExtension;
                     addItem(":/extension_pack_32px.png", ":/extension_pack_disabled_32px.png",
                             ":/extension_pack_16px.png", ":/extension_pack_disabled_16px.png",
-                            i, "#extension", pSettingsPage);
+                            iPageIndex, "#extension", pSettingsPage);
                     break;
                 }
@@ -376 +370 @@
                     break;
             }
+            if (pSettingsPage)
+                pSettingsPage->setId(iPageIndex);
         }
     }
@@ -386 +382 @@
 }
 
-void UIGLSettingsDlg::getFrom()
+void UISettingsDialogGlobal::getFrom()
 {
     /* Prepare global data: */
@@ -403 +399 @@
 }
 
-void UIGLSettingsDlg::putBackTo()
+void UISettingsDialogGlobal::putBackTo()
 {
     /* Get properties and settings: */
@@ -432 +428 @@
 }
 
-void UIGLSettingsDlg::retranslateUi()
+void UISettingsDialogGlobal::retranslateUi()
 {
     /* Set dialog's name: */
@@ -465 +461 @@
 }
 
-QString UIGLSettingsDlg::title() const
+QString UISettingsDialogGlobal::title() const
 {
     return tr("VirtualBox - %1").arg(titleExtension());
 }
 
-bool UIGLSettingsDlg::isAvailable(int id)
+bool UISettingsDialogGlobal::isAvailable(int id)
 {
     /* Show the host error message for particular group if present.
@@ -508 +504 @@
 }
 
-UIVMSettingsDlg::UIVMSettingsDlg(QWidget *pParent,
-                                 const CMachine &machine,
-                                 const QString &strCategory,
-                                 const QString &strControl)
+UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent,
+                                                 const CMachine &machine,
+                                                 const QString &strCategory,
+                                                 const QString &strControl)
     : UISettingsDialog(pParent)
     , m_machine(machine)
@@ -526 +522 @@
 
     /* Creating settings pages: */
-    for (int i = VMSettingsPage_General; i < VMSettingsPage_MAX; ++i)
-    {
-        if (isAvailable(i))
-        {
-            switch (i)
+    for (int iPageIndex = VMSettingsPage_General; iPageIndex < VMSettingsPage_MAX; ++iPageIndex)
+    {
+        if (isAvailable(iPageIndex))
+        {
+            UISettingsPage *pSettingsPage = 0;
+            switch (iPageIndex)
             {
                 /* General page: */
                 case VMSettingsPage_General:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsGeneral;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsGeneral;
                     addItem(":/machine_32px.png", ":/machine_disabled_32px.png",
                             ":/machine_16px.png", ":/machine_disabled_16px.png",
-                            i, "#general", pSettingsPage);
+                            iPageIndex, "#general", pSettingsPage);
                     break;
                 }
@@ -545 +541 @@
                 case VMSettingsPage_System:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsSystem;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsSystem;
                     connect(pSettingsPage, SIGNAL(tableChanged()), this, SLOT(sltResetFirstRunFlag()));
                     addItem(":/chipset_32px.png", ":/chipset_disabled_32px.png",
                             ":/chipset_16px.png", ":/chipset_disabled_16px.png",
-                            i, "#system", pSettingsPage);
+                            iPageIndex, "#system", pSettingsPage);
                     break;
                 }
@@ -556 +551 @@
                 case VMSettingsPage_Display:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsDisplay;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsDisplay;
                     addItem(":/vrdp_32px.png", ":/vrdp_disabled_32px.png",
                             ":/vrdp_16px.png", ":/vrdp_disabled_16px.png",
-                            i, "#display", pSettingsPage);
+                            iPageIndex, "#display", pSettingsPage);
                     break;
                 }
@@ -566 +560 @@
                 case VMSettingsPage_Storage:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsStorage;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsStorage;
                     connect(pSettingsPage, SIGNAL(storageChanged()), this, SLOT(sltResetFirstRunFlag()));
                     addItem(":/hd_32px.png", ":/hd_disabled_32px.png",
                             ":/attachment_16px.png", ":/attachment_disabled_16px.png",
-                            i, "#storage", pSettingsPage);
+                            iPageIndex, "#storage", pSettingsPage);
                     break;
                 }
@@ -577 +570 @@
                 case VMSettingsPage_Audio:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsAudio;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsAudio;
                     addItem(":/sound_32px.png", ":/sound_disabled_32px.png",
                             ":/sound_16px.png", ":/sound_disabled_16px.png",
-                            i, "#audio", pSettingsPage);
+                            iPageIndex, "#audio", pSettingsPage);
                     break;
                 }
@@ -587 +579 @@
                 case VMSettingsPage_Network:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsNetworkPage;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsNetworkPage;
                     addItem(":/nw_32px.png", ":/nw_disabled_32px.png",
                             ":/nw_16px.png", ":/nw_disabled_16px.png",
-                            i, "#network", pSettingsPage);
+                            iPageIndex, "#network", pSettingsPage);
                     break;
                 }
@@ -599 +590 @@
                     addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png",
                             ":/serial_port_16px.png", ":/serial_port_disabled_16px.png",
-                            i, "#ports");
+                            iPageIndex, "#ports");
                     break;
                 }
@@ -605 +596 @@
                 case VMSettingsPage_Serial:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsSerialPage;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsSerialPage;
                     addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png",
                             ":/serial_port_16px.png", ":/serial_port_disabled_16px.png",
-                            i, "#serialPorts", pSettingsPage, VMSettingsPage_Ports);
+                            iPageIndex, "#serialPorts", pSettingsPage, VMSettingsPage_Ports);
                     break;
                 }
@@ -615 +605 @@
                 case VMSettingsPage_Parallel:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsParallelPage;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsParallelPage;
                     addItem(":/parallel_port_32px.png", ":/parallel_port_disabled_32px.png",
                             ":/parallel_port_16px.png", ":/parallel_port_disabled_16px.png",
-                            i, "#parallelPorts", pSettingsPage, VMSettingsPage_Ports);
+                            iPageIndex, "#parallelPorts", pSettingsPage, VMSettingsPage_Ports);
                     break;
                 }
@@ -625 +614 @@
                 case VMSettingsPage_USB:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Machine);
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Machine);
                     addItem(":/usb_32px.png", ":/usb_disabled_32px.png",
                             ":/usb_16px.png", ":/usb_disabled_16px.png",
-                            i, "#usb", pSettingsPage, VMSettingsPage_Ports);
+                            iPageIndex, "#usb", pSettingsPage, VMSettingsPage_Ports);
                     break;
                 }
@@ -635 +623 @@
                 case VMSettingsPage_SF:
                 {
-                    UISettingsPage *pSettingsPage = new UIMachineSettingsSF;
-                    pSettingsPage->setId(i);
+                    pSettingsPage = new UIMachineSettingsSF;
                     addItem(":/shared_folder_32px.png", ":/shared_folder_disabled_32px.png",
                             ":/shared_folder_16px.png", ":/shared_folder_disabled_16px.png",
-                            i, "#sfolders", pSettingsPage);
+                            iPageIndex, "#sfolders", pSettingsPage);
                     break;
                 }
@@ -645 +632 @@
                     break;
             }
+            if (pSettingsPage)
+                pSettingsPage->setId(iPageIndex);
         }
     }
@@ -685 +674 @@
 }
 
-void UIVMSettingsDlg::getFrom()
+void UISettingsDialogMachine::getFrom()
 {
     /* Prepare machine data: */
@@ -705 +694 @@
 }
 
-void UIVMSettingsDlg::putBackTo()
+void UISettingsDialogMachine::putBackTo()
 {
     /* Prepare machine data: */
@@ -768 +757 @@
 }
 
-void UIVMSettingsDlg::retranslateUi()
+void UISettingsDialogMachine::retranslateUi()
 {
     /* Set dialog's name: */
@@ -833 +822 @@
 }
 
-QString UIVMSettingsDlg::title() const
+QString UISettingsDialogMachine::title() const
 {
     QString strDialogTitle;
@@ -841 +830 @@
 }
 
-bool UIVMSettingsDlg::recorrelate(QWidget *pPage, QString &strWarning)
+bool UISettingsDialogMachine::recorrelate(QWidget *pPage, QString &strWarning)
 {
     /* This method performs correlation option check
@@ -960 +949 @@
 }
 
-void UIVMSettingsDlg::sltCategoryChanged(int cId)
+void UISettingsDialogMachine::sltCategoryChanged(int cId)
 {
     if (UISettingsSerializer::instance())
@@ -968 +957 @@
 }
 
-void UIVMSettingsDlg::sltAllowResetFirstRunFlag()
+void UISettingsDialogMachine::sltAllowResetFirstRunFlag()
 {
     m_fAllowResetFirstRunFlag = true;
 }
 
-void UIVMSettingsDlg::sltSetFirstRunFlag()
+void UISettingsDialogMachine::sltSetFirstRunFlag()
 {
     m_fResetFirstRunFlag = false;
 }
 
-void UIVMSettingsDlg::sltResetFirstRunFlag()
+void UISettingsDialogMachine::sltResetFirstRunFlag()
 {
     if (m_fAllowResetFirstRunFlag)
@@ -984 +973 @@
 }
 
-bool UIVMSettingsDlg::isAvailable(int id)
+bool UISettingsDialogMachine::isAvailable(int id)
 {
     if (m_machine.isNull())

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 
 /* Dialog which encapsulate all the specific functionalities of the Global Settings */
-class UIGLSettingsDlg : public UISettingsDialog
+class UISettingsDialogGlobal : public UISettingsDialog
 {
     Q_OBJECT;
@@ -43 +43 @@
     };
 
-    UIGLSettingsDlg(QWidget *pParent);
+    UISettingsDialogGlobal(QWidget *pParent);
 
 protected:
@@ -60 +60 @@
 
 /* Dialog which encapsulate all the specific functionalities of the Virtual Machine Settings */
-class UIVMSettingsDlg : public UISettingsDialog
+class UISettingsDialogMachine : public UISettingsDialog
 {
     Q_OBJECT;
@@ -82 +82 @@
     };
 
-    UIVMSettingsDlg(QWidget *pParent, const CMachine &machine,
-                    const QString &strCategory, const QString &strControl);
+    UISettingsDialogMachine(QWidget *pParent, const CMachine &machine,
+                            const QString &strCategory, const QString &strControl);
 
 protected: