Changeset 98675 in vbox

Timestamp:

Feb 21, 2023 3:12:32 PM (2 years ago)

Author:

vboxsync

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

155975

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Snapshot related stuff and close VM dialog finally.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineWindow.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)
• UIVMCloseDialog.cpp (modified) (3 diffs)
• UIVMCloseDialog.h (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -349 +349 @@
 {
     return uisession()->setPause(fPause);
+}
+
+bool UIMachine::acquireSnapshotCount(ulong &uCount)
+{
+    return uisession()->acquireSnapshotCount(uCount);
+}
+
+bool UIMachine::acquireCurrentSnapshotName(QString &strName)
+{
+    return uisession()->acquireCurrentSnapshotName(strName);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -246 +246 @@
     /** @} */
 
+    /** @name Snapshot stuff.
+     ** @{ */
+        /** Acquires snapshot count. */
+        bool acquireSnapshotCount(ulong &uCount);
+        /** Acquires current snapshot name. */
+        bool acquireCurrentSnapshotName(QString &strName);
+    /** @} */
+
     /** @name Host-screen stuff.
      ** @{ */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1794 +1794 @@
 
     LogRel(("GUI: User requested to power VM off.\n"));
+    ulong uSnapshotCount = 0;
+    uimachine()->acquireSnapshotCount(uSnapshotCount);
     const bool fDiscardStateOnPowerOff = gEDataManager->discardStateOnPowerOff(uiCommon().managedVMUuid());
-    uimachine()->powerOff(machine().GetSnapshotCount() > 0 && fDiscardStateOnPowerOff);
+    uimachine()->powerOff(uSnapshotCount > 0 && fDiscardStateOnPowerOff);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -272 +272 @@
 
         /* Append snapshot name: */
-        if (machine().GetSnapshotCount() > 0)
-        {
-            const CSnapshot comSnapshot = machine().GetCurrentSnapshot();
-            strMachineName += " (" + comSnapshot.GetName() + ")";
+        ulong uSnapshotCount = 0;
+        uimachine()->acquireSnapshotCount(uSnapshotCount);
+        if (uSnapshotCount > 0)
+        {
+            QString strCurrentSnapshotName;
+            uimachine()->acquireCurrentSnapshotName(strCurrentSnapshotName);
+            strMachineName += " (" + strCurrentSnapshotName + ")";
         }
 
@@ -423 +426 @@
         bool fInACPIMode = false;
         uimachine()->acquireWhetherGuestEnteredACPIMode(fInACPIMode);
-        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, machine(),
+        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, uimachine(),
                                                                   fInACPIMode,
                                                                   restrictedCloseActions);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -295 +295 @@
         else
             UINotificationMessage::cannotResumeMachine(comConsole);
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireSnapshotCount(ulong &uCount)
+{
+    CMachine comMachine = machine();
+    const ULONG uSnapshotCount = comMachine.GetSnapshotCount();
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+        uCount = uSnapshotCount;
+    return fSuccess;
+}
+
+bool UISession::acquireCurrentSnapshotName(QString &strName)
+{
+    CMachine comMachine = machine();
+    CSnapshot comSnapshot = comMachine.GetCurrentSnapshot();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    {
+        const QString strSnapshotName = comSnapshot.GetName();
+        fSuccess = comSnapshot.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireSnapshotParameter(comSnapshot);
+        else
+            strName = strSnapshotName;
     }
     return fSuccess;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -243 +243 @@
     /** @} */
 
+    /** @name Snapshot stuff.
+     ** @{ */
+        /** Acquires snapshot count. */
+        bool acquireSnapshotCount(ulong &uCount);
+        /** Acquires current snapshot name. */
+        bool acquireCurrentSnapshotName(QString &strName);
+    /** @} */
+
     /** @name Keyboard stuff.
      ** @{ */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -38 +38 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
+#include "UICommon.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UIMachine.h"
+#include "UIMessageCenter.h"
 #include "UIVMCloseDialog.h"
-#include "UIExtraDataManager.h"
-#include "UIMessageCenter.h"
-#include "UIConverter.h"
-#include "UICommon.h"
-#include "QIDialogButtonBox.h"
-
-/* COM includes: */
-#include "CMachine.h"
-#include "CSession.h"
-#include "CConsole.h"
-#include "CSnapshot.h"
-
-
-UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &comMachine,
+
+
+UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, UIMachine *pMachine,
                                  bool fIsACPIEnabled, MachineCloseAction restictedCloseActions)
     : QIWithRetranslateUI<QIDialog>(pParent)
-    , m_comMachine(comMachine)
+    , m_pMachine(pMachine)
     , m_fIsACPIEnabled(fIsACPIEnabled)
     , m_restictedCloseActions(restictedCloseActions)
@@ -543 +538 @@
 {
     /* Get actual machine-state: */
-    KMachineState machineState = m_comMachine.GetState();
+    KMachineState enmActualState = KMachineState_Null;
+    m_pMachine->acquireLiveMachineState(enmActualState);
 
     /* Check which close-actions are resticted: */
@@ -555 +551 @@
     setButtonVisibleDetach(fIsDetachAllowed);
     /* Make 'Detach' button enabled/disabled depending on machine-state: */
-    setButtonEnabledDetach(machineState != KMachineState_Stuck);
+    setButtonEnabledDetach(enmActualState != KMachineState_Stuck);
 
     /* Make 'Save state' button visible/hidden depending on restriction: */
     setButtonVisibleSave(fIsStateSavingAllowed);
     /* Make 'Save state' button enabled/disabled depending on machine-state: */
-    setButtonEnabledSave(machineState != KMachineState_Stuck);
+    setButtonEnabledSave(enmActualState != KMachineState_Stuck);
 
     /* Make 'Shutdown' button visible/hidden depending on restriction: */
     setButtonVisibleShutdown(fIsACPIShutdownAllowed);
     /* Make 'Shutdown' button enabled/disabled depending on console and machine-state: */
-    setButtonEnabledShutdown(m_fIsACPIEnabled && machineState != KMachineState_Stuck);
+    setButtonEnabledShutdown(m_fIsACPIEnabled && enmActualState != KMachineState_Stuck);
 
     /* Make 'Power off' button visible/hidden depending on restriction: */
     setButtonVisiblePowerOff(fIsPowerOffAllowed);
     /* Make the Restore Snapshot checkbox visible/hidden depending on snapshot count & restrictions: */
-    setCheckBoxVisibleDiscard(fIsPowerOffAndRestoreAllowed && m_comMachine.GetSnapshotCount() > 0);
+    ulong uSnapshotCount = 0;
+    m_pMachine->acquireSnapshotCount(uSnapshotCount);
+    setCheckBoxVisibleDiscard(fIsPowerOffAndRestoreAllowed && uSnapshotCount > 0);
     /* Assign Restore Snapshot checkbox text: */
-    if (!m_comMachine.GetCurrentSnapshot().isNull())
-        m_strDiscardCheckBoxText = m_comMachine.GetCurrentSnapshot().GetName();
+    if (uSnapshotCount > 0)
+    {
+        QString strCurrentSnapshotName;
+        m_pMachine->acquireCurrentSnapshotName(strCurrentSnapshotName);
+        m_strDiscardCheckBoxText = strCurrentSnapshotName;
+    }
 
     /* Check which radio-button should be initially chosen: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

@@ -47 +47 @@
 class QRadioButton;
 class QVBoxLayout;
-class CMachine;
+class UIMachine;
 
 /** QIDialog extension to handle Runtime UI close-event. */
@@ -57 +57 @@
 
     /** Constructs close dialog passing @a pParent to the base-class.
-      * @param  comMachine             Brings the machine dialog created for.
+      * @param  pMachine               Brings the machine UI dialog created for.
       * @param  fIsACPIEnabled         Brings whether ACPI is enabled.
       * @param  restictedCloseActions  Brings a set of restricted actions. */
-    UIVMCloseDialog(QWidget *pParent, CMachine &comMachine,
+    UIVMCloseDialog(QWidget *pParent, UIMachine *pMachine,
                     bool fIsACPIEnabled, MachineCloseAction restictedCloseActions);
 
@@ -137 +137 @@
     void updatePixmaps();
 
-    /** Holds the live machine reference. */
-    CMachine                 &m_comMachine;
+    /** Holds the machine UI reference. */
+    UIMachine                *m_pMachine;
     /** Holds whether ACPI is enabled. */
     bool                      m_fIsACPIEnabled;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -566 +566 @@
             /* Get snapshot(s): */
             QString strSnapshotName;
-            if (machine().GetSnapshotCount() > 0)
+            ulong uSnapshotCount = 0;
+            uimachine()->acquireSnapshotCount(uSnapshotCount);
+            if (uSnapshotCount > 0)
             {
-                CSnapshot snapshot = machine().GetCurrentSnapshot();
-                strSnapshotName = " (" + snapshot.GetName() + ")";
+                QString strCurrentSnapshotName;
+                uimachine()->acquireCurrentSnapshotName(strCurrentSnapshotName);
+                strSnapshotName = " (" + strCurrentSnapshotName + ")";
             }
             /* Update mini-toolbar text: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -311 +311 @@
             /* Get snapshot(s): */
             QString strSnapshotName;
-            if (machine().GetSnapshotCount() > 0)
+            ulong uSnapshotCount = 0;
+            uimachine()->acquireSnapshotCount(uSnapshotCount);
+            if (uSnapshotCount > 0)
             {
-                CSnapshot snapshot = machine().GetCurrentSnapshot();
-                strSnapshotName = " (" + snapshot.GetName() + ")";
+                QString strCurrentSnapshotName;
+                uimachine()->acquireCurrentSnapshotName(strCurrentSnapshotName);
+                strSnapshotName = " (" + strCurrentSnapshotName + ")";
             }
             /* Update mini-toolbar text: */