Changeset 90411 in vbox for trunk/src

Timestamp:

Jul 29, 2021 2:16:15 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for virtual cloud machine terminate progress (in UIVirtualBoxManager) which should now go to center instead of modal dialogs; A bit of cleanup and sanity checks besides that.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (8 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -1247 +1247 @@
                             if (strConsoleConnectionFingerprint.isEmpty())
                             {
-                                /* Acquire machine name: */
-                                QString strName;
-                                if (cloudMachineName(comMachine, strName))
-                                {
-                                    /* Create cloud console connection: */
-                                    UINotificationProgressCloudConsoleConnectionCreate *pNotification =
-                                        new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
-                                                                                               pDialog->publicKey());
-                                    notificationCenter().append(pNotification);
-                                }
+                                /* Create cloud console connection: */
+                                UINotificationProgressCloudConsoleConnectionCreate *pNotification =
+                                    new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
+                                                                                           pDialog->publicKey());
+                                notificationCenter().append(pNotification);
                             }
                         }
@@ -1294 +1289 @@
                     if (strConsoleConnectionFingerprint.isEmpty())
                     {
-                        /* Acquire machine name: */
-                        QString strName;
-                        if (cloudMachineName(comMachine, strName))
-                        {
-                            /* Create cloud console connection: */
-                            UINotificationProgressCloudConsoleConnectionCreate *pNotification =
-                                new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
-                                                                                       pDialog->publicKey());
-                            notificationCenter().append(pNotification);
-                        }
+                        /* Create cloud console connection: */
+                        UINotificationProgressCloudConsoleConnectionCreate *pNotification =
+                            new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
+                                                                                   pDialog->publicKey());
+                        notificationCenter().append(pNotification);
                     }
                 }
@@ -1338 +1328 @@
                     if (!strConsoleConnectionFingerprint.isEmpty())
                     {
-                        /* Acquire machine name: */
-                        QString strName;
-                        if (cloudMachineName(comMachine, strName))
-                        {
-                            /* Delete cloud console connection: */
-                            UINotificationProgressCloudConsoleConnectionDelete *pNotification =
-                                new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
-                            notificationCenter().append(pNotification);
-                        }
+                        /* Delete cloud console connection: */
+                        UINotificationProgressCloudConsoleConnectionDelete *pNotification =
+                            new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
+                        notificationCenter().append(pNotification);
                     }
                 }
@@ -1375 +1360 @@
             if (!strConsoleConnectionFingerprint.isEmpty())
             {
-                /* Acquire machine name: */
-                QString strName;
-                if (cloudMachineName(comMachine, strName))
-                {
-                    /* Delete cloud console connection: */
-                    UINotificationProgressCloudConsoleConnectionDelete *pNotification =
-                        new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
-                    notificationCenter().append(pNotification);
-                }
+                /* Delete cloud console connection: */
+                UINotificationProgressCloudConsoleConnectionDelete *pNotification =
+                    new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
+                notificationCenter().append(pNotification);
             }
         }
@@ -1702 +1682 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
+        /* Sanity check: */
+        AssertPtrReturnVoid(pItem);
+
         /* Check if current item could be saved: */
-        AssertPtrReturnVoid(pItem);
         if (!isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
             continue;
@@ -1740 +1722 @@
     foreach (UIVirtualMachineItem *pItem, itemsToTerminate)
     {
-        /* Get cloud machine: */
+        /* Sanity check: */
         AssertPtrReturnVoid(pItem);
-        UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
-        AssertPtrReturnVoid(pCloudItem);
-        CCloudMachine comMachine = pCloudItem->machine();
-
-        /* Acquire machine name: */
-        QString strName;
-        if (!cloudMachineName(comMachine, strName))
-            continue;
-
-        /* Prepare terminate cloud instance progress: */
-        CProgress comProgress = comMachine.Terminate();
-        if (!comMachine.isOk())
-        {
-            msgCenter().cannotTerminateCloudInstance(comMachine);
-            continue;
-        }
-
-        /* Show terminate cloud instance progress: */
-        msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_delete_cloud_vm_90px.png", 0, 0);
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-            msgCenter().cannotTerminateCloudInstance(comProgress, strName);
+
+        /* Terminating cloud VM: */
+        UINotificationProgressCloudMachineTerminate *pNotification =
+            new UINotificationProgressCloudMachineTerminate(pItem->toCloud()->machine());
+        notificationCenter().append(pNotification);
     }
 }
@@ -1792 +1758 @@
     foreach (UIVirtualMachineItem *pItem, itemsToShutdown)
     {
+        /* Sanity check: */
+        AssertPtrReturnVoid(pItem);
+
         /* For local machine: */
         if (pItem->itemType() == UIVirtualMachineItemType_Local)
@@ -1815 +1784 @@
             /* Shutting cloud VM down: */
             UINotificationProgressCloudMachineShutdown *pNotification =
-                    new UINotificationProgressCloudMachineShutdown(pItem->toCloud()->machine());
+                new UINotificationProgressCloudMachineShutdown(pItem->toCloud()->machine());
             notificationCenter().append(pNotification);
         }

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

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

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

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