Changeset 90365 in vbox

Timestamp:

Jul 28, 2021 11:18:52 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signatures for virtual machine media remove progress which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/chooser/UIChooserModel.cpp (modified) (4 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -44 +44 @@
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"
+#include "UINotificationCenter.h"
 #include "UIVirtualBoxManagerWidget.h"
 #include "UIVirtualMachineItemCloud.h"
@@ -1871 +1872 @@
         {
             /* Unregister machine first: */
-            CMediumVector comMedia = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!comMachine.isOk())
             {
@@ -1877 +1878 @@
                 continue;
             }
-            /* Prepare cleanup progress: */
-            CProgress comProgress = comMachine.DeleteConfig(comMedia);
-            if (!comMachine.isOk())
-            {
-                msgCenter().cannotRemoveMachine(comMachine);
-                continue;
-            }
-            /* And show cleanup progress finally: */
-            msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_delete_90px.png");
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            {
-                msgCenter().cannotRemoveMachine(comMachine, comProgress);
-                continue;
-            }
+            /* Remove machine: */
+            UINotificationProgressMachineMediaRemove *pNotification = new UINotificationProgressMachineMediaRemove(comMachine, media);
+            notificationCenter().append(pNotification);
         }
         else if (iResultCode == AlertButton_Choice2 || iResultCode == AlertButton_Ok)
         {
             /* Unregister machine first: */
-            CMediumVector comMedia = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!comMachine.isOk())
             {
@@ -1902 +1892 @@
             }
             /* Finally close all media, deliberately ignoring errors: */
-            foreach (CMedium comMedium, comMedia)
+            foreach (CMedium comMedium, media)
             {
                 if (!comMedium.isNull())

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

@@ -186 +186 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressMachineMediaRemove implementation.                                                                    *
+*********************************************************************************************************************************/
+
+UINotificationProgressMachineMediaRemove::UINotificationProgressMachineMediaRemove(const CMachine &comMachine,
+                                                                                   const CMediumVector &media)
+    : m_comMachine(comMachine)
+    , m_media(media)
+{
+}
+
+QString UINotificationProgressMachineMediaRemove::name() const
+{
+    return UINotificationProgress::tr("Removing machine media ...");
+}
+
+QString UINotificationProgressMachineMediaRemove::details() const
+{
+    return UINotificationProgress::tr("<b>Machine Name:</b> %1").arg(m_comMachine.GetName());
+}
+
+CProgress UINotificationProgressMachineMediaRemove::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comMachine.DeleteConfig(m_media);
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressCloudMachineAdd implementation.                                                                  *
 *********************************************************************************************************************************/

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

@@ -204 +204 @@
     /** Holds the target machine options. */
     QVector<KCloneOptions>  m_options;
+};
+
+/** UINotificationProgress extension for machine media remove functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMachineMediaRemove : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs machine media remove notification-progress.
+      * @param  comMachine  Brings the machine being removed.
+      * @param  media       Brings the machine media being removed. */
+    UINotificationProgressMachineMediaRemove(const CMachine &comMachine,
+                                             const CMediumVector &media);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private:
+
+    /** Holds the machine being removed. */
+    CMachine       m_comMachine;
+    /** Holds the machine media being removed. */
+    CMediumVector  m_media;
 };