Changeset 38241 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 29, 2011 1:12:04 PM (14 years ago)

Author:

vboxsync

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

73224

Message:

FE/Qt4: enable linked cloning of the "Current State" by implicitly creating an snapshot first

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (1 diff)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• wizards/clonevm/UICloneVMWizard.cpp (modified) (7 diffs)
• wizards/clonevm/UICloneVMWizard.h (modified) (3 diffs)
• wizards/clonevm/UICloneVMWizardPage2.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp

@@ -1091 +1091 @@
 }
 
+void VBoxProblemReporter::cannotFindSnapshotByName(QWidget *pParent,
+                                                   const CMachine &machine,
+                                                   const QString &strName) const
+{
+    message (pParent ? pParent : mainWindowShown(), Error,
+             tr ("Can't find snapshot named <b>%1</b>.")
+             .arg(strName),
+             formatErrorInfo(machine)
+    );
+}
+
 void VBoxProblemReporter::cannotFindMachineByName (const CVirtualBox &vbox,
                                                    const QString &name)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.h

@@ -237 +237 @@
     void cannotDeleteSnapshot (const CConsole &aConsole, const QString &aSnapshotName);
     void cannotDeleteSnapshot (const CProgress &aProgress, const QString &aSnapshotName);
+    void cannotFindSnapshotByName(QWidget *pParent, const CMachine &machine, const QString &strMachine) const;
 
     void cannotFindMachineByName (const CVirtualBox &vbox, const QString &name);

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

@@ -34 +34 @@
     : QIWizard(pParent)
     , m_machine(machine)
+    , m_snapshot(snapshot)
 {
     /* Create & add pages: */
     setPage(PageIntro, new UICloneVMWizardPage1(machine.GetName()));
     /* If we are having a snapshot we can show the "Linked" option. */
-    if (!snapshot.isNull())
-        setPage(PageType, new UICloneVMWizardPage2());
+    setPage(PageType, new UICloneVMWizardPage2(snapshot.isNull()));
     /* If the machine has no snapshots, we don't bother the user about options
      * for it. */
@@ -77 +77 @@
     const QString &strSettingsFile = vbox.ComposeMachineFilename(strName, QString::null);
 
+    CMachine srcMachine = m_machine;
+    /* If the user like to create a linked clone from the current machine, we
+     * have to take a little bit more action. First we create an snapshot, so
+     * that new differencing images on the source VM are created. Based on that
+     * we could use the new snapshot machine for cloning. */
+    if (   fLinked
+        && m_snapshot.isNull())
+    {
+        const QString &strId = m_machine.GetId();
+        CSession session = vboxGlobal().openSession(strId);
+        if (session.isNull())
+            return false;
+        CConsole console = session.GetConsole();
+
+        /* Take the snapshot */
+        QString strSnapshotName = tr("Linked Base for %1 and %2").arg(m_machine.GetName()).arg(strName);
+        CProgress progress = console.TakeSnapshot(strSnapshotName, "");
+
+        if (console.isOk())
+        {
+            /* Show the "Taking Snapshot" progress dialog */
+            vboxProblem().showModalProgressDialog(progress, m_machine.GetName(), ":/progress_snapshot_create_90px.png", this, true);
+
+            if (!progress.isOk() || progress.GetResultCode() != 0)
+            {
+                vboxProblem().cannotTakeSnapshot(progress);
+                return false;
+            }
+        }
+        else
+        {
+            vboxProblem().cannotTakeSnapshot(console);
+            return false;
+        }
+
+        /* Unlock machine finally: */
+        session.UnlockMachine();
+
+        /* Get the new snapshot and the snapshot machine. */
+        const CSnapshot &newSnapshot = m_machine.FindSnapshot(strSnapshotName);
+        if (newSnapshot.isNull())
+        {
+            vboxProblem().cannotFindSnapshotByName(this, m_machine, strSnapshotName);
+            return false;
+        }
+        srcMachine = newSnapshot.GetMachine();
+    }
+
     /* Create a new machine object. */
     CMachine cloneMachine = vbox.CreateMachine(strSettingsFile, strName, QString::null, QString::null, false);
@@ -94 +142 @@
 
     /* Start cloning. */
-    CProgress progress = m_machine.CloneTo(cloneMachine, mode, options);
-    if (!m_machine.isOk())
-    {
-        vboxProblem().cannotCreateClone(m_machine, this);
+    CProgress progress = srcMachine.CloneTo(cloneMachine, mode, options);
+    if (!srcMachine.isOk())
+    {
+        vboxProblem().cannotCreateClone(srcMachine, this);
         return false;
     }
@@ -107 +155 @@
     if (!progress.isOk() || progress.GetResultCode() != 0)
     {
-        vboxProblem().cannotCreateClone(m_machine, progress, this);
+        vboxProblem().cannotCreateClone(srcMachine, progress, this);
         return false;
     }
@@ -115 +163 @@
     if (!vbox.isOk())
     {
-        vboxProblem().cannotRegisterMachine(vbox, m_machine, this);
+        vboxProblem().cannotRegisterMachine(vbox, cloneMachine, this);
         return false;
     }
@@ -198 +246 @@
 }
 
-UICloneVMWizardPage2::UICloneVMWizardPage2()
+UICloneVMWizardPage2::UICloneVMWizardPage2(bool fAdditionalInfo)
+  : m_fAdditionalInfo(fAdditionalInfo)
 {
     /* Decorate page: */
@@ -223 +272 @@
     /* Set 'Page2' page title: */
     setTitle(tr("Cloning Configuration"));
+
+
+    QString strLabel = tr("<p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p>");
+    if (m_fAdditionalInfo)
+        strLabel += tr("<p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p>");
+    m_pLabel->setText(strLabel);
 }
 

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

@@ -55 +55 @@
     /* Private member vars */
     CMachine m_machine;
+    CSnapshot m_snapshot;
 };
 
@@ -120 +121 @@
 
     /* Constructor: */
-    UICloneVMWizardPage2();
+    UICloneVMWizardPage2(bool fAdditionalInfo);
     int nextId() const;
 
@@ -136 +137 @@
 
     void buttonClicked(QAbstractButton *pButton);
+
+private:
+
+    bool m_fAdditionalInfo;
 };
 

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

@@ -34 +34 @@
     <widget class="QILabel" name="m_pLabel">
      <property name="text">
-      <string>&lt;p&gt;Please select the type of the clone.&lt;/p&gt;&lt;p&gt;If you choose &lt;b&gt;Full Clone&lt;/b&gt; an exact copy (including all virtual disk images) of the original VM will be created. If you select &lt;b&gt;Linked Clone&lt;/b&gt;, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.&lt;/p&gt;</string>
+      <string></string>
      </property>
      <property name="wordWrap">