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

Timestamp:

Aug 3, 2010 1:00:54 PM (15 years ago)

Author:

vboxsync

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

64371

Message:

Main: rework new implementation of Machine::Unregister() and Machine::Delete() to be more flexible and still easy to use

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

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

@@ -680 +680 @@
         {
             CMachine machine = item->machine();
-            QVector<QString> files = machine.Unregister(false /*fDetachMedia*/);
+            QVector<CMedium> aMedia = machine.Unregister(KCleanupMode_UnregisterOnly);          //  @todo replace with DetachAllReturnHardDisksOnly once a progress dialog is in place below
             if (machine.isOk() && item->accessible())
             {
                 /* delete machine settings */
-                machine.Delete();
+                CProgress progress = machine.Delete(aMedia);
+                progress.WaitForCompletion(-1);         // @todo do this nicely with a progress dialog, this can delete many files!
+
                 /* remove the item shortly: cmachine it refers to is no longer valid! */
                 int row = mVMModel->rowById (item->id());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -782 +782 @@
         {
             /* Unregister on failure */
-            QVector<QString> files = m_Machine.Unregister(false /*fDetachMedia*/);
+            QVector<CMedium> aMedia = m_Machine.Unregister(KCleanupMode_UnregisterOnly);   //  @todo replace with DetachAllReturnHardDisksOnly once a progress dialog is in place below
             if (vbox.isOk())
-                m_Machine.Delete();
+            {
+                CProgress progress = m_Machine.Delete(aMedia);
+                progress.WaitForCompletion(-1);         // @todo do this nicely with a progress dialog, this can delete lots of files
+            }
             return false;
         }