Changeset 90409 in vbox for trunk

Timestamp:

Jul 29, 2021 1:40:19 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for virtual cloud machine power-down progress (in UIVirtualBoxManager) which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (4 diffs)
• notificationcenter/UINotificationObjects.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1865 +1865 @@
         {
             /* Powering VM down: */
-            UINotificationProgressMachinePowerDown *pNotification = new UINotificationProgressMachinePowerDown(pItem->id());
+            UINotificationProgressMachinePowerDown *pNotification =
+                new UINotificationProgressMachinePowerDown(pItem->id());
             notificationCenter().append(pNotification);
         }
@@ -1871 +1872 @@
         else if (pItem->itemType() == UIVirtualMachineItemType_CloudReal)
         {
-            /* Acquire cloud machine: */
-            CCloudMachine comCloudMachine = pItem->toCloud()->machine();
-            /* Prepare machine power down: */
-            CProgress comProgress = comCloudMachine.PowerDown();
-            if (!comCloudMachine.isOk())
-                msgCenter().cannotPowerDownCloudMachine(comCloudMachine);
-            else
-            {
-                /* Show machine power down progress: */
-                msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png", 0, 0);
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotPowerDownCloudMachine(comProgress, pItem->name());
-                /* Update info in any case: */
-                pItem->toCloud()->updateInfoAsync(false /* delayed? */);
-            }
+            /* Powering cloud VM down: */
+            UINotificationProgressCloudMachinePowerDown *pNotification =
+                new UINotificationProgressCloudMachinePowerDown(pItem->toCloud()->machine());
+            notificationCenter().append(pNotification);
         }
     }

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

@@ -581 +581 @@
 QString UINotificationProgressCloudMachineCreate::details() const
 {
-    return UINotificationProgress::tr("<b>Provider:</b> %1<br><b>Profile:</b> %2<br><b>Name:</b> %3")
+    return UINotificationProgress::tr("<b>Provider:</b> %1<br><b>Profile:</b> %2<br><b>VM Name:</b> %3")
                                       .arg(m_strProviderShortName, m_strProfileName, m_strName);
 }
@@ -611 +611 @@
 
 /*********************************************************************************************************************************
-*   Class UINotificationProgressCloudMachineCreate implementation.                                                               *
+*   Class UINotificationProgressCloudMachineRemove implementation.                                                               *
 *********************************************************************************************************************************/
 
@@ -636 +636 @@
 QString UINotificationProgressCloudMachineRemove::details() const
 {
-    return UINotificationProgress::tr("<b>Name:</b> %1").arg(m_strName);
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
 }
 
@@ -665 +665 @@
     if (error().isEmpty())
         emit sigCloudMachineRemoved(m_strProviderShortName, m_strProfileName, m_strName);
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressCloudMachinePowerDown implementation.                                                            *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudMachinePowerDown::UINotificationProgressCloudMachinePowerDown(const CCloudMachine &comMachine)
+    : m_comMachine(comMachine)
+{
+}
+
+QString UINotificationProgressCloudMachinePowerDown::name() const
+{
+    return   UINotificationProgress::tr("Powering cloud VM down ...");
+}
+
+QString UINotificationProgressCloudMachinePowerDown::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressCloudMachinePowerDown::createProgress(COMResult &comResult)
+{
+    /* Acquire cloud VM name: */
+    m_strName = m_comMachine.GetName();
+    if (!m_comMachine.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comMachine;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comMachine.PowerDown();
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
 }
 

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

@@ -271 +271 @@
 
     /** Constructs machine save-state notification-progress.
-      * @param  comMachine  Brings the machine being saved. */
+      * @param  uId  Brings the machine id. */
     UINotificationProgressMachineSaveState(const QUuid &uId);
 
@@ -306 +306 @@
 
     /** Constructs machine power-down notification-progress.
-      * @param  comMachine  Brings the machine being powered-down. */
+      * @param  uId  Brings the machine id. */
     UINotificationProgressMachinePowerDown(const QUuid &uId);
 
@@ -532 +532 @@
 };
 
+/** UINotificationProgress extension for cloud machine power-down functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachinePowerDown : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud machine power-down notification-progress.
+      * @param  comMachine  Brings the machine being powered-down. */
+    UINotificationProgressCloudMachinePowerDown(const CCloudMachine &comMachine);
+
+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 powered-down. */
+    CCloudMachine  m_comMachine;
+    /** Holds the machine name. */
+    QString        m_strName;
+};
+
 /** UINotificationProgress extension for cloud console connection create functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressCloudConsoleConnectionCreate : public UINotificationProgress