Changeset 90302 in vbox for trunk/src

Timestamp:

Jul 23, 2021 1:08:11 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for final Add Cloud VM wizard progress which should now go to center instead of modal dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/addcloudvm/UIWizardAddCloudVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -4155 +4155 @@
 }
 
+void UICommon::sltHandleCloudMachineAdded(const QString &strShortProviderName,
+                                          const QString &strProfileName,
+                                          const CCloudMachine &comMachine)
+{
+    /* Make sure we cached added cloud VM in GUI: */
+    notifyCloudMachineRegistered(strShortProviderName,
+                                 strProfileName,
+                                 comMachine);
+}
+
 bool UICommon::eventFilter(QObject *pObject, QEvent *pEvent)
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -735 +735 @@
     /** @} */
 
+    /** @name Cloud Machine related stuff.
+     * @{ */
+        /** Handles signal about cloud machine was added. */
+        void sltHandleCloudMachineAdded(const QString &strShortProviderName,
+                                        const QString &strProfileName,
+                                        const CCloudMachine &comMachine);
+    /** @} */
+
 protected:
 

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

@@ -40 +40 @@
 QString UINotificationProgressMediumMove::details() const
 {
-    return UINotificationProgress::tr("<b>From</b>: %1<br><b>To</b>: %2").arg(m_strFrom, m_strTo);
+    return UINotificationProgress::tr("<b>From:</b> %1<br><b>To:</b> %2").arg(m_strFrom, m_strTo);
 }
 
@@ -76 +76 @@
 QString UINotificationProgressMediumCopy::details() const
 {
-    return UINotificationProgress::tr("<b>From</b>: %1<br><b>To</b>: %2")
+    return UINotificationProgress::tr("<b>From:</b> %1<br><b>To:</b> %2")
                                      .arg(m_comSource.GetLocation(), m_comTarget.GetLocation());
 }
@@ -95 +95 @@
         emit sigMediumCopied(m_comTarget);
 }
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressCloudMachineAdd implementation.                                                                  *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudMachineAdd::UINotificationProgressCloudMachineAdd(const CCloudClient &comClient,
+                                                                             const CCloudMachine &comMachine,
+                                                                             const QString &strInstanceName,
+                                                                             const QString &strShortProviderName,
+                                                                             const QString &strProfileName)
+    : m_comClient(comClient)
+    , m_comMachine(comMachine)
+    , m_strInstanceName(strInstanceName)
+    , m_strShortProviderName(strShortProviderName)
+    , m_strProfileName(strProfileName)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressCloudMachineAdd::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressCloudMachineAdd::name() const
+{
+    return UINotificationProgress::tr("Adding cloud VM ...");
+}
+
+QString UINotificationProgressCloudMachineAdd::details() const
+{
+    return UINotificationProgress::tr("<b>Provider:</b> %1<br><b>Profile:</b> %2<br><b>Instance Name:</b> %3")
+                                     .arg(m_strShortProviderName, m_strProfileName, m_strInstanceName);
+}
+
+CProgress UINotificationProgressCloudMachineAdd::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comClient.AddCloudMachine(m_strInstanceName, m_comMachine);
+    /* Store COM result: */
+    comResult = m_comClient;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressCloudMachineAdd::sltHandleProgressFinished()
+{
+    if (m_comMachine.isNotNull() && !m_comMachine.GetId().isNull())
+        emit sigCloudMachineAdded(m_strShortProviderName, m_strProfileName, m_comMachine);
+}

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

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CCloudClient.h"
+#include "CCloudMachine.h"
 #include "CMedium.h"
 
@@ -107 +109 @@
 };
 
+/** UINotificationProgress extension for cloud machine add functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachineAdd : public UINotificationProgress
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about cloud @a comMachine was added.
+      * @param  strShortProviderName  Brigns the short provider name.
+      * @param  strProfileName        Brings the profile name. */
+    void sigCloudMachineAdded(const QString &strShortProviderName,
+                              const QString &strProfileName,
+                              const CCloudMachine &comMachine);
+
+public:
+
+    /** Constructs cloud machine add notification-progress.
+      * @param  comClient             Brings the cloud client being adding machine.
+      * @param  comMachine            Brings the cloud machine being added.
+      * @param  strInstanceName       Brings the instance name.
+      * @param  strShortProviderName  Brings the short provider name.
+      * @param  strProfileName        Brings the profile name. */
+    UINotificationProgressCloudMachineAdd(const CCloudClient &comClient,
+                                          const CCloudMachine &comMachine,
+                                          const QString &strInstanceName,
+                                          const QString &strShortProviderName,
+                                          const QString &strProfileName);
+
+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 slots:
+
+    /** Handles signal about progress being finished. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the cloud client being adding machine. */
+    CCloudClient   m_comClient;
+    /** Holds the cloud machine being added. */
+    CCloudMachine  m_comMachine;
+    /** Holds the instance name. */
+    QString        m_strInstanceName;
+    /** Holds the short provider name. */
+    QString        m_strShortProviderName;
+    /** Holds the profile name. */
+    QString        m_strProfileName;
+};
+
 #endif /* !FEQT_INCLUDED_SRC_notificationcenter_UINotificationObjects_h */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVM.cpp

@@ -19 +19 @@
 #include "UICommon.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardAddCloudVM.h"
 #include "UIWizardAddCloudVMPageBasic1.h"
@@ -57 +58 @@
         /* Initiate cloud VM add procedure: */
         CCloudMachine comMachine;
-        CProgress comProgress = comClient.AddCloudMachine(strInstanceName, comMachine);
-        /* Check for immediate errors: */
-        if (!comClient.isOk())
-        {
-            msgCenter().cannotCreateCloudMachine(comClient, this);
-            break;
-        }
-        else
-        {
-            /* Show "Add cloud machine" progress: */
-            msgCenter().showModalProgressDialog(comProgress, QString(),
-                                                ":/progress_new_cloud_vm_90px.png", this, 0);
-            /* Check for canceled progress: */
-            if (comProgress.GetCanceled())
-                break;
-            else
-            {
-                /* Check for progress errors: */
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                {
-                    msgCenter().cannotCreateCloudMachine(comProgress, this);
-                    break;
-                }
-                else
-                {
-                    /* Check whether VM really added: */
-                    if (comMachine.isNotNull())
-                    {
-                        /* Notify GUI about VM was added: */
-                        uiCommon().notifyCloudMachineRegistered(shortProviderName(),
-                                                                profileName(),
-                                                                comMachine);
 
-                        /* Finally, success: */
-                        fResult = true;
-                    }
-                }
-            }
-        }
+        /* Add cloud VM: */
+        UINotificationProgressCloudMachineAdd *pNotification = new UINotificationProgressCloudMachineAdd(comClient,
+                                                                                                         comMachine,
+                                                                                                         strInstanceName,
+                                                                                                         shortProviderName(),
+                                                                                                         profileName());
+        connect(pNotification, &UINotificationProgressCloudMachineAdd::sigCloudMachineAdded,
+                &uiCommon(), &UICommon::sltHandleCloudMachineAdded);
+        notificationCenter().append(pNotification);
+
+        /* Positive: */
+        fResult = true;
     }