Changeset 90869 in vbox for trunk/src

Timestamp:

Aug 25, 2021 10:21:27 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Reworking r145997; UINotificationProgressMachinePowerDown should now be usable from within Runtime UI as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1821 +1821 @@
             /* Powering VM down: */
             UINotificationProgressMachinePowerDown *pNotification =
-                new UINotificationProgressMachinePowerDown(pItem->id());
+                new UINotificationProgressMachinePowerDown(pItem->toLocal()->machine());
             gpNotificationCenter->append(pNotification);
         }

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

@@ -976 +976 @@
 *********************************************************************************************************************************/
 
-UINotificationProgressMachinePowerDown::UINotificationProgressMachinePowerDown(const QUuid &uId)
-    : m_uId(uId)
+UINotificationProgressMachinePowerDown::UINotificationProgressMachinePowerDown(const CMachine &comMachine)
+    : m_comMachine(comMachine)
 {
     connect(this, &UINotificationProgress::sigProgressFinished,
@@ -983 +983 @@
 }
 
+UINotificationProgressMachinePowerDown::UINotificationProgressMachinePowerDown(const CConsole &comConsole)
+    : m_comConsole(comConsole)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressMachinePowerDown::sltHandleProgressFinished);
+}
+
 QString UINotificationProgressMachinePowerDown::name() const
 {
@@ -995 +1002 @@
 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();
+    /* Prepare machine to power off: */
+    CMachine comMachine = m_comMachine;
+
+    /* For Runtime UI: */
+    switch (uiCommon().uiType())
+    {
+        case UICommon::UIType_RuntimeUI:
+        {
+            /* Acquire VM: */
+            AssertReturn(m_comConsole.isNotNull(), CProgress());
+            comMachine = m_comConsole.GetMachine();
+            if (!m_comConsole.isOk())
+            {
+                comResult = m_comConsole;
+                return CProgress();
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Acquire VM id: */
+    const QUuid uId = comMachine.GetId();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
         return CProgress();
     }
@@ -1014 +1038 @@
     {
         comResult = comMachine;
+        return CProgress();
+    }
+
+    /* Prepare console to power off: */
+    CConsole comConsole = m_comConsole;
+
+    /* For Manager UI: */
+    switch (uiCommon().uiType())
+    {
+        case UICommon::UIType_SelectorUI:
+        {
+            /* Open a session thru which we will modify the machine: */
+            m_comSession = uiCommon().openExistingSession(uId);
+            if (m_comSession.isNull())
+                return CProgress();
+
+            /* Get session machine: */
+            comMachine = m_comSession.GetMachine();
+            if (!m_comSession.isOk())
+            {
+                comResult = m_comSession;
+                m_comSession.UnlockMachine();
+                return CProgress();
+            }
+
+            /* Get session console: */
+            comConsole = m_comSession.GetConsole();
+            if (!m_comSession.isOk())
+            {
+                comResult = m_comSession;
+                m_comSession.UnlockMachine();
+                return CProgress();
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comConsole.PowerDown();
+    /* Store COM result: */
+    comResult = comConsole;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMachinePowerDown::sltHandleProgressFinished()
+{
+    /* Unlock session finally: */
+    if (m_comSession.isNotNull())
         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();
 }
 

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

@@ -34 +34 @@
 #include "CCloudClient.h"
 #include "CCloudMachine.h"
+#include "CConsole.h"
 #include "CExtPackFile.h"
 #include "CExtPackManager.h"
@@ -47 +48 @@
 /* Forward declarations: */
 class CAudioAdapter;
-class CConsole;
 class CEmulatedUSB;
 class CNetworkAdapter;
@@ -567 +567 @@
 
     /** Constructs machine power-down notification-progress.
-      * @param  uId  Brings the machine id. */
-    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;
+      * @param  comMachine  Brings the machine being powered off. */
+    UINotificationProgressMachinePowerDown(const CMachine &comMachine);
+    /** Constructs machine power-down notification-progress.
+      * @param  comConsole  Brings the console of machine being powered off. */
+    UINotificationProgressMachinePowerDown(const CConsole &comConsole);
+
+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 being powered off. */
+    CMachine  m_comMachine;
+    /** Holds the console of machine being powered off. */
+    CConsole  m_comConsole;
     /** Holds the session being opened. */
     CSession  m_comSession;