Changeset 90410 in vbox for trunk/src

Timestamp:

Jul 29, 2021 1:54:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for virtual cloud machine shutdown 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) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -1813 +1813 @@
         else if (pItem->itemType() == UIVirtualMachineItemType_CloudReal)
         {
-            /* Acquire cloud machine: */
-            CCloudMachine comCloudMachine = pItem->toCloud()->machine();
-            /* Prepare machine ACPI shutdown: */
-            CProgress comProgress = comCloudMachine.Shutdown();
-            if (!comCloudMachine.isOk())
-                msgCenter().cannotACPIShutdownCloudMachine(comCloudMachine);
-            else
-            {
-                /* Show machine ACPI shutdown progress: */
-                msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png", 0, 0);
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotACPIShutdownCloudMachine(comProgress, pItem->name());
-                /* Update info in any case: */
-                pItem->toCloud()->updateInfoAsync(false /* delayed? */);
-            }
+            /* Shutting cloud VM down: */
+            UINotificationProgressCloudMachineShutdown *pNotification =
+                    new UINotificationProgressCloudMachineShutdown(pItem->toCloud()->machine());
+            notificationCenter().append(pNotification);
         }
     }

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

@@ -709 +709 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressCloudMachineShutdown implementation.                                                             *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudMachineShutdown::UINotificationProgressCloudMachineShutdown(const CCloudMachine &comMachine)
+    : m_comMachine(comMachine)
+{
+}
+
+QString UINotificationProgressCloudMachineShutdown::name() const
+{
+    return   UINotificationProgress::tr("Shutting cloud VM down ...");
+}
+
+QString UINotificationProgressCloudMachineShutdown::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressCloudMachineShutdown::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.Shutdown();
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressCloudConsoleConnectionCreate implementation.                                                     *
 *********************************************************************************************************************************/

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

@@ -560 +560 @@
 };
 
+/** UINotificationProgress extension for cloud machine shutdown functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachineShutdown : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud machine shutdown notification-progress.
+      * @param  comMachine  Brings the machine being shutdown. */
+    UINotificationProgressCloudMachineShutdown(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 shutdown. */
+    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