Changeset 90389 in vbox for trunk/src

Timestamp:

Jul 29, 2021 7:59:31 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145975

Message:

FE/Qt: bugref:10067: Notification signature for cloud console connection create 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

@@ -1251 +1251 @@
                                 if (cloudMachineName(comMachine, strName))
                                 {
-                                    /* Prepare "create console connection" progress: */
-                                    CProgress comProgress = comMachine.CreateConsoleConnection(pDialog->publicKey());
-                                    if (!comMachine.isOk())
-                                        msgCenter().cannotCreateConsoleConnection(comMachine);
-                                    else
-                                    {
-                                        /* Show "create console connection" progress: */
-                                        msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_new_cloud_vm_90px.png", 0, 0);
-                                        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                                            msgCenter().cannotCreateConsoleConnection(comProgress, strName);
-                                    }
+                                    /* Create cloud console connection: */
+                                    UINotificationProgressCloudConsoleConnectionCreate *pNotification =
+                                        new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
+                                                                                               pDialog->publicKey());
+                                    notificationCenter().append(pNotification);
                                 }
                             }
@@ -1304 +1298 @@
                         if (cloudMachineName(comMachine, strName))
                         {
-                            /* Prepare "create console connection" progress: */
-                            CProgress comProgress = comMachine.CreateConsoleConnection(pDialog->publicKey());
-                            if (!comMachine.isOk())
-                                msgCenter().cannotCreateConsoleConnection(comMachine);
-                            else
-                            {
-                                /* Show "create console connection" progress: */
-                                msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_new_cloud_vm_90px.png", 0, 0);
-                                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                                    msgCenter().cannotCreateConsoleConnection(comProgress, strName);
-                            }
+                            /* Create cloud console connection: */
+                            UINotificationProgressCloudConsoleConnectionCreate *pNotification =
+                                new UINotificationProgressCloudConsoleConnectionCreate(comMachine,
+                                                                                       pDialog->publicKey());
+                            notificationCenter().append(pNotification);
                         }
                     }

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

@@ -443 +443 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressCloudConsoleConnectionCreate implementation.                                                     *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudConsoleConnectionCreate::UINotificationProgressCloudConsoleConnectionCreate(const CCloudMachine &comMachine,
+                                                                                                       const QString &strPublicKey)
+    : m_comMachine(comMachine)
+    , m_strPublicKey(strPublicKey)
+{
+}
+
+QString UINotificationProgressCloudConsoleConnectionCreate::name() const
+{
+    return UINotificationProgress::tr("Creating cloud console connection ...");
+}
+
+QString UINotificationProgressCloudConsoleConnectionCreate::details() const
+{
+    return UINotificationProgress::tr("<b>Cloud VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressCloudConsoleConnectionCreate::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.CreateConsoleConnection(m_strPublicKey);
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressApplianceExport implementation.                                                                  *
 *********************************************************************************************************************************/

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

@@ -450 +450 @@
 };
 
+/** UINotificationProgress extension for cloud console connection create functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudConsoleConnectionCreate : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud console connection create notification-progress.
+      * @param  comMachine    Brings the cloud machine for which console connection being created.
+      * @param  strPublicKey  Brings the public key used for console connection being created. */
+    UINotificationProgressCloudConsoleConnectionCreate(const CCloudMachine &comMachine,
+                                                       const QString &strPublicKey);
+
+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 created. */
+    CCloudMachine  m_comMachine;
+    /** Holds the name acquired from cloud machine. */
+    QString        m_strName;
+    /** Holds the public key used for console connection being created. */
+    QString        m_strPublicKey;
+};
+
 /** UINotificationProgress extension for export appliance functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressApplianceExport : public UINotificationProgress