Changeset 82550 in vbox for trunk/src

Timestamp:

Dec 11, 2019 2:21:49 PM (5 years ago)

Author:

vboxsync

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

135419

Message:

FE/Qt: bugref:9390: UIWizardCloneVMPageExpert: Get rid of hardcoded clone option types, instead acquire these types through CSystemProperties interface (clone options related to additional functionality, like keeping disk names and hardware uuids).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm

Files:

• UIWizardCloneVMPageBasic1.cpp (modified) (2 diffs)
• UIWizardCloneVMPageBasic1.h (modified) (2 diffs)
• UIWizardCloneVMPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp

@@ -46 +46 @@
     , m_pMACComboBoxLabel(0)
     , m_pMACComboBox(0)
-    , m_pAdditionalOptionsLabel(0)
     , m_pKeepDiskNamesCheckBox(0)
     , m_pKeepHWUUIDsCheckBox(0)
@@ -191 +190 @@
     , m_pMainLabel(0)
     , m_pContainerLayout(0)
+    , m_pAdditionalOptionsLabel(0)
 {
     /* Create widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.h

@@ -92 +92 @@
     QLabel      *m_pMACComboBoxLabel;
     QComboBox   *m_pMACComboBox;
-    QLabel      *m_pAdditionalOptionsLabel;
     QCheckBox   *m_pKeepDiskNamesCheckBox;
     QCheckBox   *m_pKeepHWUUIDsCheckBox;
@@ -129 +128 @@
     QIRichTextLabel *m_pMainLabel;
     QGridLayout     *m_pContainerLayout;
+    QLabel          *m_pAdditionalOptionsLabel;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp

@@ -146 +146 @@
             const bool fSupportedKeepDiskNames = supportedOptions.contains(KCloneOptions_KeepDiskNames);
             const bool fSupportedKeepHWUUIDs = supportedOptions.contains(KCloneOptions_KeepHwUUIDs);
-            if (fSupportedKeepDiskNames || fSupportedKeepHWUUIDs)
-            {
-                m_pAdditionalOptionsLabel = new QLabel;
-                if (m_pAdditionalOptionsLabel)
-                {
-                    m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
-                    m_pCloneOptionsLayout->addWidget(m_pAdditionalOptionsLabel, iVerticalPosition, 0, 1, 1);
-                }
-            }
             if (fSupportedKeepDiskNames)
             {
@@ -264 +255 @@
     }
 
-    m_pAdditionalOptionsLabel->setText(UIWizardCloneVM::tr("Additional Options:"));
-    m_pKeepDiskNamesCheckBox->setToolTip(UIWizardCloneVM::tr("Don't change the disk names during cloning."));
-    m_pKeepDiskNamesCheckBox->setText(UIWizardCloneVM::tr("Keep &Disk Names"));
-    m_pKeepHWUUIDsCheckBox->setToolTip(UIWizardCloneVM::tr("Don't change hardware UUIDs during cloning."));
-    m_pKeepHWUUIDsCheckBox->setText(UIWizardCloneVM::tr("Keep &Hardware UUIDs"));
+    if (m_pKeepDiskNamesCheckBox)
+    {
+        m_pKeepDiskNamesCheckBox->setToolTip(UIWizardCloneVM::tr("Don't change the disk names during cloning."));
+        m_pKeepDiskNamesCheckBox->setText(UIWizardCloneVM::tr("Keep &Disk Names"));
+    }
+    if (m_pKeepHWUUIDsCheckBox)
+    {
+        m_pKeepHWUUIDsCheckBox->setToolTip(UIWizardCloneVM::tr("Don't change hardware UUIDs during cloning."));
+        m_pKeepHWUUIDsCheckBox->setText(UIWizardCloneVM::tr("Keep &Hardware UUIDs"));
+    }
 }