Changeset 98779 in vbox

Timestamp:

Feb 28, 2023 11:48:37 AM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Rest of snapshot related stuff, immutable medium check for shared lib.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (3 diffs)
• UITakeSnapshotDialog.h (modified) (3 diffs)
• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)
• snapshots/UISnapshotPane.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

@@ -42 +42 @@
 #include "UITakeSnapshotDialog.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-#include "CMedium.h"
-#include "CMediumAttachment.h"
-
-
-UITakeSnapshotDialog::UITakeSnapshotDialog(QWidget *pParent, const CMachine &comMachine)
+
+UITakeSnapshotDialog::UITakeSnapshotDialog(QWidget *pParent, ulong cImmutableMedia)
     : QIWithRetranslateUI<QIDialog>(pParent)
-    , m_comMachine(comMachine)
-    , m_cImmutableMedia(0)
+    , m_cImmutableMedia(cImmutableMedia)
     , m_pLabelIcon(0)
     , m_pLabelName(0), m_pEditorName(0)
@@ -59 +52 @@
     , m_pButtonBox(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -289 +281 @@
             m_pLabelInfo->useSizeHintForWidth(400);
 
-            /* Calculate the amount of immutable attachments: */
-            if (m_comMachine.GetState() == KMachineState_Paused)
-            {
-                foreach (const CMediumAttachment &comAttachment, m_comMachine.GetMediumAttachments())
-                {
-                    CMedium comMedium = comAttachment.GetMedium();
-                    if (   !comMedium.isNull()
-                        && !comMedium.GetParent().isNull()
-                        && comMedium.GetBase().GetType() == KMediumType_Immutable)
-                        ++m_cImmutableMedia;
-                }
-            }
             /* Hide if machine have no immutable attachments: */
             if (!m_cImmutableMedia)

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.h

@@ -46 +46 @@
 class QIDialogButtonBox;
 class QILabel;
-class CMachine;
 
 /** QIDialog subclass for taking snapshot name/description. */
@@ -56 +55 @@
 
     /** Constructs take snapshot dialog passing @ pParent to the base-class.
-      * @param  comMachine  Brings the machine to take snapshot for. */
-    UITakeSnapshotDialog(QWidget *pParent, const CMachine &comMachine);
+      * @param  cImmutableMedia  Brings the amount of immutable mediums. */
+    UITakeSnapshotDialog(QWidget *pParent, ulong cImmutableMedia);
 
     /** Defines snapshot @a icon. */
@@ -93 +92 @@
     void updatePixmap();
 
-    /** Holds the wrapper of machine to take snapshot for. */
-    const CMachine &m_comMachine;
+    /** Holds the amount of immutable mediums. */
+    const ulong  m_cImmutableMedia;
 
     /** Holds the snapshot icon. */
     QIcon m_icon;
-
-    /** Holds the amount of immutable attachments. */
-    int  m_cImmutableMedia;
 
     /** Holds the icon label instance. */

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

@@ -2164 +2164 @@
 }
 
+/* static */
+bool UICommon::acquireAmountOfImmutableImages(const CMachine &comMachine, ulong &cAmount)
+{
+    /* Acquire state: */
+    ulong cAmountOfImmutableImages = 0;
+    const KMachineState enmState = comMachine.GetState();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        /// @todo Who knows why 13 years ago this condition was added ..
+        if (enmState == KMachineState_Paused)
+        {
+            const CMediumAttachmentVector comAttachments = comMachine.GetMediumAttachments();
+            fSuccess = comMachine.isOk();
+            if (!fSuccess)
+                UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+            else
+            {
+                /* Calculate the amount of immutable attachments: */
+                foreach (const CMediumAttachment &comAttachment, comAttachments)
+                {
+                    /* Get the medium: */
+                    const CMedium comMedium = comAttachment.GetMedium();
+                    if (   comMedium.isNull() /* Null medium is valid case as well */
+                        || comMedium.GetParent().isNull() /* Null parent is valid case as well */)
+                        continue;
+                    /* Get the base medium: */
+                    const CMedium comBaseMedium = comMedium.GetBase();
+                    fSuccess = comMedium.isOk();
+                    if (!fSuccess)
+                        UINotificationMessage::cannotAcquireMediumParameter(comMedium);
+                    else
+                    {
+                        const KMediumType enmType = comBaseMedium.GetType();
+                        fSuccess = comBaseMedium.isOk();
+                        if (!fSuccess)
+                            UINotificationMessage::cannotAcquireMediumParameter(comBaseMedium);
+                        else if (enmType == KMediumType_Immutable)
+                            ++cAmountOfImmutableImages;
+                    }
+                    if (!fSuccess)
+                        break;
+                }
+            }
+        }
+    }
+    if (fSuccess)
+        cAmount = cAmountOfImmutableImages;
+    return fSuccess;
+}
+
 #ifdef RT_OS_LINUX
 /* static */

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

@@ -441 +441 @@
           * @param  enmMediumType       Passes the medium type. */
         QString defaultFolderPathForType(UIMediumDeviceType enmMediumType);
+
+        /** Calculates @a cAmount of immutable images used by @a comMachine specified. */
+        static bool acquireAmountOfImmutableImages(const CMachine &comMachine, ulong &cAmount);
     /** @} */
 

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

@@ -735 +735 @@
 {
     return uisession()->addEncryptionPassword(strId, strPassword, fClearOnSuspend);
+}
+
+bool UIMachine::acquireAmountOfImmutableImages(ulong &cAmount)
+{
+    return uisession()->acquireAmountOfImmutableImages(cAmount);
 }
 

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

@@ -508 +508 @@
         /** Adds encryption password. */
         bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);
+
+        /** Calculates @a cAmount of immutable images. */
+        bool acquireAmountOfImmutableImages(ulong &cAmount);
     /** @} */
 

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

@@ -1587 +1587 @@
         return;
 
+    /* First of all, we should calculate amount of immutable images: */
+    ulong cAmountOfImmutableMediums = 0;
+    uimachine()->acquireAmountOfImmutableImages(cAmountOfImmutableMediums);
+
     /* Create take-snapshot dialog: */
     QWidget *pDlgParent = windowManager().realParentWindow(activeMachineWindow());
-    QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, machine());
+    QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, cAmountOfImmutableMediums);
     windowManager().registerNewParent(pDlg, pDlgParent);
 

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

@@ -552 +552 @@
         msgCenter().cannotAddDiskEncryptionPassword(comConsole);
     return fSuccess;
+}
+
+bool UISession::acquireAmountOfImmutableImages(ulong &cAmount)
+{
+    CMachine comMachine = machine();
+    return UICommon::acquireAmountOfImmutableImages(comMachine, cAmount);
 }
 

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

@@ -325 +325 @@
         /** Adds encryption password. */
         bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);
+
+        /** Calculates @a cAmount of immutable images. */
+        bool acquireAmountOfImmutableImages(ulong &cAmount);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -1621 +1621 @@
     if (!fAutomatically)
     {
+        /* First of all, we should calculate amount of immutable images: */
+        ulong cAmountOfImmutableMediums = 0;
+        UICommon::acquireAmountOfImmutableImages(comMachine, cAmountOfImmutableMediums);
+
         /* Create take-snapshot dialog: */
         QWidget *pDlgParent = windowManager().realParentWindow(this);
-        QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, comMachine);
+        QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, cAmountOfImmutableMediums);
         windowManager().registerNewParent(pDlg, pDlgParent);