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

Timestamp:

Jul 12, 2011 1:25:38 PM (14 years ago)

Author:

vboxsync

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

72801

Message:

FE/Qt4: add option to let the user decide if the MACs should be reinitialized

Location:

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

Files:

• UICloneVMWizard.cpp (modified) (6 diffs)
• UICloneVMWizard.h (modified) (3 diffs)
• UICloneVMWizardPage1.ui (modified) (1 diff)

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

@@ -69 +69 @@
 }
 
-bool UICloneVMWizard::createClone(const QString &strName, KCloneMode mode)
+bool UICloneVMWizard::createClone(const QString &strName, KCloneMode mode, bool fReinitMACs)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -82 +82 @@
     }
 
-    /* NAT network adapters should keep there MAC address to prevent any
-     * reactivation. For the other modes they should be regenerated to prevent
-     * address conflicts in the network. */
+    /* Add the keep all MACs option to the import settings when requested. */
     QVector<KCloneOptions> options;
-    options.append(KCloneOptions_KeepNATMACs);
+    if (!fReinitMACs)
+        options.append(KCloneOptions_KeepAllMACs);
 
     /* Start cloning. */
@@ -124 +123 @@
 
     registerField("cloneName", this, "cloneName");
+    registerField("reinitMACs", this, "reinitMACs");
 
     connect(m_pNameEditor, SIGNAL(textChanged(const QString &)), this, SLOT(sltNameEditorTextChanged(const QString &)));
@@ -136 +136 @@
 {
     m_pNameEditor->setText(strName);
+}
+
+bool UICloneVMWizardPage1::isReinitMACsChecked() const
+{
+    return mReinitMACsCheckBox->isChecked();
 }
 
@@ -172 +177 @@
         startProcessing();
         /* Try to create the clone: */
-        bool fResult = static_cast<UICloneVMWizard*>(wizard())->createClone(cloneName(), KCloneMode_MachineState);
+        bool fResult = static_cast<UICloneVMWizard*>(wizard())->createClone(cloneName(), KCloneMode_MachineState, isReinitMACsChecked());
         /* Finish performing long-time operation: */
         endProcessing();
@@ -234 +239 @@
     /* Try to create the clone: */
     QString strName = field("cloneName").toString();
-    bool fResult = static_cast<UICloneVMWizard*>(wizard())->createClone(strName, cloneMode());
+    bool fReinitMACs = field("reinitMACs").toBool();
+    bool fResult = static_cast<UICloneVMWizard*>(wizard())->createClone(strName, cloneMode(), fReinitMACs);
     /* Finish performing long-time operation: */
     endProcessing();

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

@@ -38 +38 @@
     UICloneVMWizard(QWidget *pParent, CMachine machine, bool fShowChildsOption = true);
 
-    bool createClone(const QString &strName, KCloneMode mode);
+    bool createClone(const QString &strName, KCloneMode mode, bool fReinitMACs);
 
 private:
@@ -71 +71 @@
     Q_OBJECT;
     Q_PROPERTY(QString cloneName READ cloneName WRITE setCloneName);
+    Q_PROPERTY(bool reinitMACs READ isReinitMACsChecked);
 
 public:
@@ -79 +80 @@
     QString cloneName() const;
     void setCloneName(const QString &strName);
+
+    bool isReinitMACsChecked() const;
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizardPage1.ui

@@ -55 +55 @@
    </item>
    <item>
+    <widget class="QCheckBox" name="mReinitMACsCheckBox">
+     <property name="toolTip">
+      <string>When checked a new unique MAC address will assigned to all configured network cards.</string>
+     </property>
+     <property name="text">
+      <string>&amp;Reinitialize the MAC address of all network cards</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">