Changeset 67854 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 7, 2017 2:12:58 PM (8 years ago)

Author:

vboxsync

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

116809

Message:

FE/Qt: bugref:8400: Cache medium-type inside UIMedium; move related code from VBoxGlobal to UIMedium as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• medium/UIMedium.cpp (modified) (7 diffs)
• medium/UIMedium.h (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (1 diff)

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

@@ -697 +697 @@
 
 /**
- * Similar to toString (KMediumType), but returns 'Differencing' for
- * normal hard disks that have a parent.
- */
-QString VBoxGlobal::mediumTypeString(const CMedium &medium) const
-{
-    if (!medium.GetParent().isNull())
-    {
-        Assert(medium.GetType() == KMediumType_Normal);
-        return mDiskTypes_Differencing;
-    }
-    return gpConverter->toString(medium.GetType());
-}
-
-/**
  *  Returns the list of the standard COM port names (i.e. "COMx").
  */
@@ -1633 +1619 @@
 void VBoxGlobal::retranslateUi()
 {
-    mDiskTypes_Differencing = tr ("Differencing", "DiskType");
-
     mUserDefinedPortName = tr ("User-defined", "serial port");
 

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

@@ -271 +271 @@
         return tr("%n second(s)", "", cVal);
     }
-
-    QString differencingMediumTypeName() const { return mDiskTypes_Differencing; }
-
-    /**
-     * Similar to toString (KMediumType), but returns 'Differencing' for
-     * normal hard disks that have a parent.
-     */
-    QString mediumTypeString(const CMedium &medium) const;
 
     QStringList COMPortNames() const;
@@ -629 +621 @@
     int m3DAvailable;
 
-    QString mDiskTypes_Differencing;
-
     QString mUserDefinedPortName;
 

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

@@ -41 +41 @@
     , m_medium(CMedium())
     , m_state(KMediumState_NotCreated)
+    , m_enmMediumType(KMediumType_Max)
 {
     refresh();
@@ -49 +50 @@
     , m_medium(medium)
     , m_state(KMediumState_NotCreated)
+    , m_enmMediumType(KMediumType_Max)
 {
     refresh();
@@ -57 +59 @@
     , m_medium(medium)
     , m_state(state)
+    , m_enmMediumType(KMediumType_Max)
 {
     refresh();
@@ -87 +90 @@
     m_strSize = other.size();
     m_strLogicalSize = other.logicalSize();
+
+    m_enmMediumType = other.mediumType();
 
     m_strHardDiskType = other.hardDiskType();
@@ -147 +152 @@
     m_strName = VBoxGlobal::tr("Empty", "medium");
     m_strLocation = m_strSize = m_strLogicalSize = QString("--");
+
+    /* Reset medium type parameter: */
+    m_enmMediumType = KMediumType_Max;
 
     /* Reset hard drive related parameters: */
@@ -211 +219 @@
         }
 
+        /* Refresh medium type: */
+        m_enmMediumType = m_medium.GetType();
+
         /* For hard drive medium: */
         if (m_type == UIMediumType_HardDisk)
         {
             /* Refresh hard drive disk type: */
-            m_strHardDiskType = vboxGlobal().mediumTypeString(m_medium);
+            m_strHardDiskType = mediumTypeToString(m_medium);
             /* Refresh hard drive format: */
             m_strHardDiskFormat = m_medium.GetFormat();
@@ -610 +621 @@
 }
 
+/* static */
+QString UIMedium::mediumTypeToString(const CMedium &comMedium)
+{
+    if (!comMedium.GetParent().isNull())
+    {
+        Assert(comMedium.GetType() == KMediumType_Normal);
+        return QApplication::translate("VBoxGlobal", "Differencing", "MediumType");
+    }
+    return gpConverter->toString(comMedium.GetType());
+}
+

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

@@ -187 +187 @@
     QString logicalSize(bool fNoDiffs = false) const { return fNoDiffs ? root().m_strLogicalSize : m_strLogicalSize; }
 
+    /** Returns the medium disk type.
+      * @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 type of root in the given hard drive chain. */
+    KMediumType mediumType(bool fNoDiffs = false) const { return fNoDiffs ? root().m_enmMediumType : m_enmMediumType; }
+
     /** Returns the hard drive medium disk type.
       * @param fNoDiffs @c true to enable user-friendly "don't show diffs" mode.
@@ -307 +312 @@
     void checkNoDiffs(bool fNoDiffs);
 
+    /** Returns string representation for passed @a comMedium type. */
+    static QString mediumTypeToString(const CMedium &comMedium);
+
     /** Holds the type of UIMedium object. */
     UIMediumType m_type;
@@ -339 +347 @@
     /** Holds the medium logical size. */
     QString m_strLogicalSize;
+
+    /** Holds the medium disk type. */
+    KMediumType m_enmMediumType;
 
     /** Holds the hard drive medium disk type. */

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

@@ -384 +384 @@
     m_enmType = m_guiMedium.type();
     /* Gather medium options data: */
-    m_options.m_enmType = m_guiMedium.medium().GetType(); /// @todo: Cache it in UIMedium class!
+    m_options.m_enmType = m_guiMedium.mediumType();
     /* Gather medium details data: */
     m_details.m_aFields.clear();