Changeset 74576 in vbox for trunk

Timestamp:

Oct 2, 2018 10:05:14 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9260. Hadding keep hw UUIDs and disk names options to clone wizard(s)

Location:

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

Files:

• UIWizardCloneVM.cpp (modified) (2 diffs)
• UIWizardCloneVMPageBasic1.cpp (modified) (6 diffs)
• UIWizardCloneVMPageBasic1.h (modified) (3 diffs)
• UIWizardCloneVMPageExpert.cpp (modified) (6 diffs)
• UIWizardCloneVMPageExpert.h (modified) (1 diff)

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

@@ -129 +129 @@
     }
 
+    /* Clone options vector to pass to cloning: */
+    QVector<KCloneOptions> options;
     /* Set the selected MAC address policy: */
-    QVector<KCloneOptions> options;
     switch (field("macAddressClonePolicy").value<MACAddressClonePolicy>())
     {
@@ -142 +143 @@
             break;
     }
+
+    if (field("keepDiskNames").value<bool>())
+        options.append(KCloneOptions_KeepDiskNames);
+    if (field("keepHWUUIDs").value<bool>())
+        options.append(KCloneOptions_KeepHwUUIDs);
 
     /* Linked clones requested? */

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

@@ -51 +51 @@
     , m_pMACComboBoxLabel(0)
     , m_pMACComboBox(0)
+    , m_pAdditionalOptionsLabel(0)
+    , m_pKeepDiskNamesCheckBox(0)
+    , m_pKeepHWUUIDsCheckBox(0)
 {
 }
@@ -140 +143 @@
 }
 
+bool UIWizardCloneVMPage1::keepDiskNames() const
+{
+    if (!m_pKeepDiskNamesCheckBox)
+        return false;
+    return m_pKeepDiskNamesCheckBox->isChecked();
+}
+
+void UIWizardCloneVMPage1::setKeepDiskNames(bool fKeepDiskNames)
+{
+    if (!m_pKeepDiskNamesCheckBox)
+        return;
+    if (m_pKeepDiskNamesCheckBox->isChecked() == fKeepDiskNames)
+        return;
+    m_pKeepDiskNamesCheckBox->setChecked(fKeepDiskNames);
+}
+
+bool UIWizardCloneVMPage1::keepHWUUIDs() const
+{
+    if (!m_pKeepHWUUIDsCheckBox)
+        return false;
+    return m_pKeepHWUUIDsCheckBox->isChecked();
+}
+
+void UIWizardCloneVMPage1::setKeepHWUUIDs(bool fKeepHWUUIDs)
+{
+    if (!m_pKeepHWUUIDsCheckBox)
+        return;
+    if (m_pKeepHWUUIDsCheckBox->isChecked() == fKeepHWUUIDs)
+        return;
+    m_pKeepHWUUIDsCheckBox->setChecked(fKeepHWUUIDs);
+}
+
+
 UIWizardCloneVMPageBasic1::UIWizardCloneVMPageBasic1(const QString &strOriginalName, const QString &strDefaultPath, const QString &strGroup)
     : UIWizardCloneVMPage1(strOriginalName, strDefaultPath, strGroup)
@@ -210 +246 @@
             m_pContainerLayout->addWidget(m_pMACComboBoxLabel, 2, 0, 1, 1);
         }
+
+        m_pAdditionalOptionsLabel = new QLabel;
+        if (m_pAdditionalOptionsLabel)
+        {
+            m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+            m_pContainerLayout->addWidget(m_pAdditionalOptionsLabel, 3, 0, 1, 1);
+        }
+        m_pKeepDiskNamesCheckBox = new QCheckBox;
+        if (m_pKeepDiskNamesCheckBox)
+            m_pContainerLayout->addWidget(m_pKeepDiskNamesCheckBox, 3, 1, 1, 1);
+        m_pKeepHWUUIDsCheckBox = new QCheckBox;
+        if (m_pKeepHWUUIDsCheckBox)
+            m_pContainerLayout->addWidget(m_pKeepHWUUIDsCheckBox, 4, 1, 1, 1);
     }
     pMainLayout->addStretch();
@@ -220 +269 @@
     registerField("cloneFilePath", this, "cloneFilePath");
     registerField("macAddressClonePolicy", this, "macAddressClonePolicy");
+    registerField("keepDiskNames", this, "keepDiskNames");
+    registerField("keepHWUUIDs", this, "keepHWUUIDs");
 
     composeCloneFilePath();
@@ -268 +319 @@
                                                       "during cloning."), Qt::ToolTipRole);
 
+    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"));
+
     /* Adjust label widths: */
     QList<QWidget*> labels;
@@ -273 +330 @@
     labels <<m_pNameLabel;
     labels << m_pPathLabel;
+    labels << m_pAdditionalOptionsLabel;
 
     int iMaxWidth = 0;

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

@@ -69 +69 @@
     void setMACAddressClonePolicy(MACAddressClonePolicy enmMACAddressClonePolicy);
 
+    bool keepDiskNames() const;
+    void setKeepDiskNames(bool fKeepDiskNames);
+
+    bool keepHWUUIDs() const;
+    void setKeepHWUUIDs(bool bKeepHWUUIDs);
+
     QString      m_strOriginalName;
     QString      m_strDefaultPath;
@@ -83 +89 @@
     QLabel      *m_pMACComboBoxLabel;
     QComboBox   *m_pMACComboBox;
+    QLabel      *m_pAdditionalOptionsLabel;
+    QCheckBox   *m_pKeepDiskNamesCheckBox;
+    QCheckBox   *m_pKeepHWUUIDsCheckBox;
 };
 
@@ -92 +101 @@
     Q_PROPERTY(QString cloneFilePath READ cloneFilePath WRITE setCloneFilePath);
     Q_PROPERTY(MACAddressClonePolicy macAddressClonePolicy READ macAddressClonePolicy WRITE setMACAddressClonePolicy);
+    Q_PROPERTY(bool keepDiskNames READ keepDiskNames WRITE setKeepDiskNames);
+    Q_PROPERTY(bool keepHWUUIDs READ keepHWUUIDs WRITE setKeepHWUUIDs);
+
 
 public:

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

@@ -50 +50 @@
             QGridLayout *pNameCntLayout = new QGridLayout(m_pNameCnt);
             {
-                pNameCntLayout->setContentsMargins(0, 0, 0, 0);
-
+                //pNameCntLayout->setContentsMargins(0, 0, 0, 0);
                 m_pNameLabel = new QLabel;
                 if (m_pNameLabel)
@@ -124 +123 @@
         {
             m_pCloneOptionsLayout = new QGridLayout(m_pCloneOptionsCnt);
-            //m_pCloneOptionsLayout->setContentsMargins(0, 0, 0, 0);
             /* Create MAC policy combo-box: */
             m_pMACComboBox = new QComboBox;
@@ -142 +140 @@
                 m_pCloneOptionsLayout->addWidget(m_pMACComboBoxLabel, 0, 0, 1, 1);
             }
+            m_pAdditionalOptionsLabel = new QLabel;
+            if (m_pAdditionalOptionsLabel)
+            {
+                m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                m_pCloneOptionsLayout->addWidget(m_pAdditionalOptionsLabel, 3, 0, 1, 1);
+            }
+            m_pKeepDiskNamesCheckBox = new QCheckBox;
+            if (m_pKeepDiskNamesCheckBox)
+                m_pCloneOptionsLayout->addWidget(m_pKeepDiskNamesCheckBox, 3, 1, 1, 1);
+            m_pKeepHWUUIDsCheckBox = new QCheckBox;
+            if (m_pKeepHWUUIDsCheckBox)
+                m_pCloneOptionsLayout->addWidget(m_pKeepHWUUIDsCheckBox, 4, 1, 1, 1);
+
         }
 
@@ -175 +186 @@
     registerField("cloneMode", this, "cloneMode");
     registerField("macAddressClonePolicy", this, "macAddressClonePolicy");
+    registerField("keepDiskNames", this, "keepDiskNames");
+    registerField("keepHWUUIDs", this, "keepHWUUIDs");
+
     composeCloneFilePath();
 }
@@ -205 +219 @@
     m_pPathLabel->setText(UIWizardCloneVM::tr("Path:"));
 
-    m_pCloneOptionsCnt->setTitle(UIWizardCloneVM::tr("Additional &options"));
+    m_pCloneOptionsCnt->setTitle(UIWizardCloneVM::tr("Clone options"));
 
     /* Translate MAC address policy combo-box: */
@@ -225 +239 @@
                                                       "during cloning."), Qt::ToolTipRole);
 
+    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"));
+
     /* Adjust label widths: */
     QList<QWidget*> labels;
     labels << m_pMACComboBoxLabel;
+    labels << m_pAdditionalOptionsLabel;
 
     int iMaxWidth = 0;

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

@@ -39 +39 @@
     Q_PROPERTY(KCloneMode cloneMode READ cloneMode WRITE setCloneMode);
     Q_PROPERTY(MACAddressClonePolicy macAddressClonePolicy READ macAddressClonePolicy WRITE setMACAddressClonePolicy);
+    Q_PROPERTY(bool keepDiskNames READ keepDiskNames WRITE setKeepDiskNames);
+    Q_PROPERTY(bool keepHWUUIDs READ keepHWUUIDs WRITE setKeepHWUUIDs);
 
 public: