Changeset 90394 in vbox

Timestamp:

Jul 29, 2021 8:38:39 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for cloud console connection delete progress 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) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -1342 +1342 @@
                         if (cloudMachineName(comMachine, strName))
                         {
-                            /* Prepare "delete console connection" progress: */
-                            CProgress comProgress = comMachine.DeleteConsoleConnection();
-                            if (!comMachine.isOk())
-                                msgCenter().cannotDeleteConsoleConnection(comMachine);
-                            else
-                            {
-                                /* Show "delete console connection" progress: */
-                                msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_delete_cloud_vm_90px.png", 0, 0);
-                                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                                    msgCenter().cannotDeleteConsoleConnection(comProgress, strName);
-                            }
+                            /* Delete cloud console connection: */
+                            UINotificationProgressCloudConsoleConnectionDelete *pNotification =
+                                new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
+                            notificationCenter().append(pNotification);
                         }
                     }
@@ -1386 +1379 @@
                 if (cloudMachineName(comMachine, strName))
                 {
-                    /* Prepare "delete console connection" progress: */
-                    CProgress comProgress = comMachine.DeleteConsoleConnection();
-                    if (!comMachine.isOk())
-                        msgCenter().cannotDeleteConsoleConnection(comMachine);
-                    else
-                    {
-                        /* Show "delete console connection" progress: */
-                        msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_delete_cloud_vm_90px.png", 0, 0);
-                        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                            msgCenter().cannotDeleteConsoleConnection(comProgress, strName);
-                    }
+                    /* Delete cloud console connection: */
+                    UINotificationProgressCloudConsoleConnectionDelete *pNotification =
+                        new UINotificationProgressCloudConsoleConnectionDelete(comMachine);
+                    notificationCenter().append(pNotification);
                 }
             }

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

@@ -544 +544 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressCloudConsoleConnectionDelete implementation.                                                     *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudConsoleConnectionDelete::UINotificationProgressCloudConsoleConnectionDelete(const CCloudMachine &comMachine)
+    : m_comMachine(comMachine)
+{
+}
+
+QString UINotificationProgressCloudConsoleConnectionDelete::name() const
+{
+    return UINotificationProgress::tr("Deleting cloud console connection ...");
+}
+
+QString UINotificationProgressCloudConsoleConnectionDelete::details() const
+{
+    return UINotificationProgress::tr("<b>Cloud VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressCloudConsoleConnectionDelete::createProgress(COMResult &comResult)
+{
+    /* Acquire cloud VM name: */
+    m_strName = m_comMachine.GetName();
+    if (!m_comMachine.isOk())
+    {
+        comResult = m_comMachine;
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comMachine.DeleteConsoleConnection();
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressApplianceExport implementation.                                                                  *
 *********************************************************************************************************************************/

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

@@ -494 +494 @@
 };
 
+/** UINotificationProgress extension for cloud console connection delete functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudConsoleConnectionDelete : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud console connection delete notification-progress.
+      * @param  comMachine  Brings the cloud machine for which console connection being deleted. */
+    UINotificationProgressCloudConsoleConnectionDelete(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 cloud machine for which console connection being deleted. */
+    CCloudMachine  m_comMachine;
+    /** Holds the cloud machine name. */
+    QString        m_strName;
+};
+
 /** UINotificationProgress extension for export appliance functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressApplianceExport : public UINotificationProgress