Changeset 90760 in vbox for trunk/src/VBox

Timestamp:

Aug 20, 2021 3:06:17 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for cloud VM power-up progress which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -2510 +2510 @@
 }
 
-bool UICommon::launchMachine(CCloudMachine &comMachine)
-{
-    /* Acquire machine name: */
-    const QString strName = comMachine.GetName();
-    if (!comMachine.isOk())
-    {
-        msgCenter().cannotAcquireCloudMachineParameter(comMachine);
-        return false;
-    }
-
-    /* Prepare machine power up: */
-    CProgress comProgress = comMachine.PowerUp();
-    if (!comMachine.isOk())
-    {
-        msgCenter().cannotPowerUpCloudMachine(comMachine);
-        return false;
-    }
-
-    /* Show machine power up progress: */
-    msgCenter().showModalProgressDialog(comProgress, strName, ":/progress_start_90px.png", 0, 0);
-    if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-    {
-        msgCenter().cannotPowerUpCloudMachine(comProgress, strName);
-        return false;
-    }
-
-    /* Success by default: */
-    return true;
-}
-
 CSession UICommon::openSession(const QUuid &uId, KLockType lockType /* = KLockType_Shared */)
 {

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

@@ -509 +509 @@
         /** Launches certain @a comMachine in specified @a enmLaunchMode. */
         bool launchMachine(CMachine &comMachine, LaunchMode enmLaunchMode = LaunchMode_Default);
-        /** Launches certain @a comMachine. */
-        bool launchMachine(CCloudMachine &comMachine);
 
         /** Opens session of certain @a enmLockType for VM with certain @a uId. */

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

@@ -2478 +2478 @@
 }
 
+void UIVirtualBoxManager::launchMachine(CCloudMachine &comMachine)
+{
+    /* Powering cloud VM up: */
+    UINotificationProgressCloudMachinePowerUp *pNotification =
+        new UINotificationProgressCloudMachinePowerUp(comMachine);
+    gpNotificationCenter->append(pNotification);
+}
+
 void UIVirtualBoxManager::startUnattendedInstall(CUnattended &comUnattendedInstaller, const UIUnattendedInstallData &unattendedData)
 {
@@ -2574 +2582 @@
                 CCloudMachine comCloudMachine = pItem->toCloud()->machine();
                 /* Launch current VM: */
-                uiCommon().launchMachine(comCloudMachine);
-                /* Update info in any case: */
-                pItem->toCloud()->updateInfoAsync(false /* delayed? */);
+                launchMachine(comCloudMachine);
             }
         }

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

@@ -40 +40 @@
 class UIVirtualBoxManagerWidget;
 class UIVirtualMachineItem;
+class CCloudMachine;
 
 /* Type definitions: */
@@ -361 +362 @@
         /** Opens add machine dialog specifying initial name with @a strFileName. */
         void openAddMachineDialog(const QString &strFileName = QString());
+
+        /** Launches certain @a comMachine. */
+        void launchMachine(CCloudMachine &comMachine);
 
         /** Creates an unattended installer and uses it to install guest os to newly created vm. */

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

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

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

@@ -749 +749 @@
 };
 
+/** UINotificationProgress extension for cloud machine power-up functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachinePowerUp : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud machine power-up notification-progress.
+      * @param  comMachine  Brings the machine being powered-up. */
+    UINotificationProgressCloudMachinePowerUp(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 powered-up. */
+    CCloudMachine  m_comMachine;
+    /** Holds the machine name. */
+    QString        m_strName;
+};
+
 /** UINotificationProgress extension for cloud machine power-down functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachinePowerDown : public UINotificationProgress