Changeset 90406 in vbox for trunk/src

Timestamp:

Jul 29, 2021 1:12:07 PM (4 years ago)

Author:

vboxsync

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

145997

Message:

FE/Qt: bugref:10067: Notification signature for virtual machine power-down progress (in UIVirtualBoxManager) which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1864 +1864 @@
         if (pItem->itemType() == UIVirtualMachineItemType_Local)
         {
-            /* Open a session to modify VM state: */
-            CSession comSession = uiCommon().openExistingSession(pItem->id());
-            if (comSession.isNull())
-                break;
-
-            /* Get session console: */
-            CConsole comConsole = comSession.GetConsole();
-            /* Prepare machine power down: */
-            CProgress comProgress = comConsole.PowerDown();
-            if (!comConsole.isOk())
-                msgCenter().cannotPowerDownMachine(comConsole);
-            else
-            {
-                /* Show machine power down progress: */
-                msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png");
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotPowerDownMachine(comProgress, pItem->name());
-                else
-                {
-                    /* Sanity check: */
-                    AssertPtrReturnVoid(pItem->toLocal());
-                    /* Restore snapshot if requested: */
-                    const bool fDiscardStateOnPowerOff = gEDataManager->discardStateOnPowerOff(pItem->id());
-                    if (fDiscardStateOnPowerOff && pItem->toLocal()->snapshotCount() > 0)
-                        uiCommon().restoreCurrentSnapshot(pItem->id());
-                }
-            }
-
-            /* Unlock machine finally: */
-            comSession.UnlockMachine();
+            /* Powering VM down: */
+            UINotificationProgressMachinePowerDown *pNotification = new UINotificationProgressMachinePowerDown(pItem->id());
+            notificationCenter().append(pNotification);
         }
         /* For real cloud machine: */

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

@@ -397 +397 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressMachinePowerDown implementation.                                                                 *
+*********************************************************************************************************************************/
+
+UINotificationProgressMachinePowerDown::UINotificationProgressMachinePowerDown(const QUuid &uId)
+    : m_uId(uId)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressMachinePowerDown::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressMachinePowerDown::name() const
+{
+    return UINotificationProgress::tr("Powering VM down ...");
+}
+
+QString UINotificationProgressMachinePowerDown::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressMachinePowerDown::createProgress(COMResult &comResult)
+{
+    /* Open a session thru which we will modify the machine: */
+    m_comSession = uiCommon().openExistingSession(m_uId);
+    if (m_comSession.isNull())
+        return CProgress();
+
+    /* Get session machine: */
+    CMachine comMachine = m_comSession.GetMachine();
+    if (!m_comSession.isOk())
+    {
+        comResult = m_comSession;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* Acquire VM name: */
+    m_strName = comMachine.GetName();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* Get session console: */
+    CConsole comConsole = m_comSession.GetConsole();
+    if (!m_comSession.isOk())
+    {
+        comResult = m_comSession;
+        m_comSession.UnlockMachine();
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comConsole.PowerDown();
+    /* Store COM result: */
+    comResult = comConsole;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMachinePowerDown::sltHandleProgressFinished()
+{
+    /* Unlock session finally: */
+    m_comSession.UnlockMachine();
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressMachineMediaRemove implementation.                                                               *
 *********************************************************************************************************************************/

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

@@ -298 +298 @@
 };
 
+/** UINotificationProgress extension for machine power-down functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMachinePowerDown : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs machine power-down notification-progress.
+      * @param  comMachine  Brings the machine being powered-down. */
+    UINotificationProgressMachinePowerDown(const QUuid &uId);
+
+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 machine id. */
+    QUuid     m_uId;
+    /** Holds the session being opened. */
+    CSession  m_comSession;
+    /** Holds the machine name. */
+    QString   m_strName;
+};
+
 /** UINotificationProgress extension for machine media remove functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressMachineMediaRemove : public UINotificationProgress