Changeset 67947 in vbox

Timestamp:

Jul 13, 2017 9:56:45 AM (8 years ago)

Author:

vboxsync

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

116940

Message:

FE/Qt: bugref:8400: Virtual Media Manager: Prevent user from a try to resize fixed medium.

Location:

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

Files:

• UIMediumDetailsWidget.cpp (modified) (1 diff)
• UIMediumDetailsWidget.h (modified) (4 diffs)
• UIMediumManager.cpp (modified) (1 diff)

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

@@ -524 +524 @@
 
     /* Load size: */
-    m_pLabelSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
-    m_pEditorSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+    const bool fEnableResize =    m_newData.m_fValid
+                               && m_newData.m_enmType == UIMediumType_HardDisk
+                               && !(m_newData.m_enmVariant & KMediumVariant_Fixed);
+    m_pLabelSize->setEnabled(fEnableResize);
+    m_pEditorSize->setEnabled(fEnableResize);
     m_pEditorSize->setMediumSize(m_newData.m_options.m_uLogicalSize);
 }

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

@@ -113 +113 @@
         : m_fValid(false)
         , m_enmType(UIMediumType_Invalid)
+        , m_enmVariant(KMediumVariant_Max)
         , m_options(UIDataMediumOptions())
         , m_details(UIDataMediumDetails())
@@ -121 +122 @@
         : m_fValid(false)
         , m_enmType(enmType)
+        , m_enmVariant(KMediumVariant_Max)
         , m_options(UIDataMediumOptions())
         , m_details(UIDataMediumDetails())
@@ -131 +133 @@
                && (m_fValid == other.m_fValid)
                && (m_enmType == other.m_enmType)
+               && (m_enmVariant == other.m_enmVariant)
                && (m_options == other.m_options)
                && (m_details == other.m_details)
@@ -145 +148 @@
     /** Holds the medium type. */
     UIMediumType m_enmType;
+    /** Holds the medium variant. */
+    KMediumVariant m_enmVariant;
 
     /** Holds the medium options. */

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

@@ -383 +383 @@
     m_fValid = !m_guiMedium.isNull();
     m_enmType = m_guiMedium.type();
+    m_enmVariant = m_guiMedium.mediumVariant();
     /* Gather medium options data: */
     m_options.m_enmType = m_guiMedium.mediumType();