Changeset 67946 in vbox

Timestamp:

Jul 13, 2017 9:50:52 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Caching medium variant in UIMedium.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMedium.cpp (modified) (7 diffs)
• UIMedium.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -42 +42 @@
     , m_state(KMediumState_NotCreated)
     , m_enmMediumType(KMediumType_Max)
+    , m_enmMediumVariant(KMediumVariant_Max)
 {
     refresh();
@@ -51 +52 @@
     , m_state(KMediumState_NotCreated)
     , m_enmMediumType(KMediumType_Max)
+    , m_enmMediumVariant(KMediumVariant_Max)
 {
     refresh();
@@ -60 +62 @@
     , m_state(state)
     , m_enmMediumType(KMediumType_Max)
+    , m_enmMediumVariant(KMediumVariant_Max)
 {
     refresh();
@@ -94 +97 @@
 
     m_enmMediumType = other.mediumType();
+    m_enmMediumVariant = other.mediumVariant();
 
     m_strHardDiskType = other.hardDiskType();
@@ -156 +160 @@
     m_uSize = m_uLogicalSize = 0;
 
-    /* Reset medium type parameter: */
+    /* Reset medium type & variant parameter: */
     m_enmMediumType = KMediumType_Max;
+    m_enmMediumVariant = KMediumVariant_Max;
 
     /* Reset hard drive related parameters: */
@@ -229 +234 @@
         }
 
-        /* Refresh medium type: */
+        /* Refresh medium type & variant: */
         m_enmMediumType = m_medium.GetType();
+        qlonglong iMediumVariant = 0;
+        foreach (const KMediumVariant &enmVariant, m_medium.GetVariant())
+            iMediumVariant |= enmVariant;
+        m_enmMediumVariant = (KMediumVariant)iMediumVariant;
 
         /* For hard drive medium: */
@@ -241 +250 @@
 
             /* Refresh hard drive storage details: */
-            qlonglong iMediumVariant = 0;
-            foreach (const KMediumVariant &enmVariant, m_medium.GetVariant())
-                iMediumVariant |= enmVariant;
-            m_strStorageDetails = gpConverter->toString((KMediumVariant)iMediumVariant);
+            m_strStorageDetails = gpConverter->toString(m_enmMediumVariant);
 
             /* Check whether this is read-only hard drive: */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

@@ -199 +199 @@
       * @note  In "don't show diffs" mode, this method returns the disk type of root in the given hard drive chain. */
     KMediumType mediumType(bool fNoDiffs = false) const { return fNoDiffs ? root().m_enmMediumType : m_enmMediumType; }
+    /** Returns the medium disk variant.
+      * @param fNoDiffs @c true to enable user-friendly "don't show diffs" mode.
+      * @note  In "don't show diffs" mode, this method returns the disk variant of root in the given hard drive chain. */
+    KMediumVariant mediumVariant(bool fNoDiffs = false) const { return fNoDiffs ? root().m_enmMediumVariant : m_enmMediumVariant; }
 
     /** Returns the hard drive medium disk type.
@@ -362 +366 @@
     /** Holds the medium disk type. */
     KMediumType m_enmMediumType;
+    /** Holds the medium disk variant. */
+    KMediumVariant m_enmMediumVariant;
 
     /** Holds the hard drive medium disk type. */