Changeset 92086 in vbox for trunk

Timestamp:

Oct 26, 2021 3:16:43 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardNewVM: Migrate a bit of UIMessageCenter stuff to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -980 +980 @@
 
 /* static */
-void UINotificationMessage::cannotRemoveMachine(const CMachine &comMachine)
+void UINotificationMessage::cannotRemoveMachine(const CMachine &comMachine, UINotificationCenter *pParent /* = 0 */)
 {
     createMessage(
@@ -986 +986 @@
         QApplication::translate("UIMessageCenter", "Failed to remove the virtual machine <b>%1</b>.")
                                                    .arg(CMachine(comMachine).GetName()) +
-        UIErrorString::formatErrorInfo(comMachine));
+        UIErrorString::formatErrorInfo(comMachine),
+        QString(), QString(), pParent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -394 +394 @@
         /** Notifies about inability to remove machine.
           * @param  comMachine  Brings machine being removed. */
-        static void cannotRemoveMachine(const CMachine &comMachine);
+        static void cannotRemoveMachine(const CMachine &comMachine, UINotificationCenter *pParent = 0);
 
         /** Notifies about inability to find snapshot by ID.

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

@@ -444 +444 @@
     if (!success)
     {
-        CVirtualBox vbox = uiCommon().virtualBox();
-        /* Unregister on failure */
-        QVector<CMedium> aMedia = m_machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
-        if (vbox.isOk())
-        {
-            CProgress progress = m_machine.DeleteConfig(aMedia);
-            progress.WaitForCompletion(-1);         /// @todo do this nicely with a progress dialog, this can delete lots of files
-        }
-    }
-
-    /* Make sure we detach CMedium wrapper from IMedium pointer to avoid deletion of IMedium as m_virtualDisk is deallocated: */
-    /* Or in case of IMachine::DeleteConfig IMedium has been already deleted so detach in this case as well:*/
+        /* Unregister VM on failure: */
+        const QVector<CMedium> media = m_machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+        if (!m_machine.isOk())
+            UINotificationMessage::cannotRemoveMachine(m_machine, notificationCenter());
+        else
+        {
+            UINotificationProgressMachineMediaRemove *pNotification =
+                new UINotificationProgressMachineMediaRemove(m_machine, media);
+            handleNotificationProgressNow(pNotification);
+        }
+    }
+
+    /* Make sure we detach CMedium wrapper from IMedium pointer to avoid deletion of IMedium as m_virtualDisk
+     * is deallocated.  Or in case of UINotificationProgressMachineMediaRemove handling, IMedium has been
+     * already deleted so detach in this case as well. */
     if (!m_virtualDisk.isNull())
         m_virtualDisk.detach();