Changeset 69568 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2017 2:56:45 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Media Manager: Options/Details widget: Do not propose medium type change to Writethrough or Shareable for disks with children.

Location:

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

Files:

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

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

@@ -102 +102 @@
     m_strHardDiskType = other.hardDiskType();
     m_strHardDiskFormat = other.hardDiskFormat();
+    m_fHasChildren = other.hasChildren();
     m_strStorageDetails = other.storageDetails();
     m_strEncryptionPasswordID = other.encryptionPasswordID();
@@ -169 +170 @@
     m_strHardDiskType = QString();
     m_strHardDiskFormat = QString();
+    m_fHasChildren = false;
     m_strStorageDetails = QString();
     m_strEncryptionPasswordID = QString();
@@ -253 +255 @@
             /* Refresh hard drive format: */
             m_strHardDiskFormat = m_medium.GetFormat();
+
+            /* Refresh hard drive parental status: */
+            m_fHasChildren = m_medium.GetChildren().size();
 
             /* Refresh hard drive storage details: */

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

@@ -217 +217 @@
     QString hardDiskFormat(bool fNoDiffs = false) const { return fNoDiffs ? root().m_strHardDiskFormat : m_strHardDiskFormat; }
 
+    /** Returns whether the hard drive medium disk has childred.
+      * @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 format of root in the given hard drive chain. */
+    bool hasChildren(bool fNoDiffs = false) const { return fNoDiffs ? root().m_fHasChildren : m_fHasChildren; }
+
     /** Returns the hard drive medium storage details. */
     QString storageDetails() const { return m_strStorageDetails; }
@@ -379 +384 @@
     /** Holds the hard drive medium disk format. */
     QString m_strHardDiskFormat;
+    /** Holds whether the hard drive medium disk has children. */
+    bool m_fHasChildren;
     /** Holds the hard drive medium storage details. */
     QString m_strStorageDetails;

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

@@ -280 +280 @@
                     /* Configure editor: */
                     m_pLabelType->setBuddy(m_pComboBoxType);
+                    m_pComboBoxType->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                     m_pComboBoxType->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
                     connect(m_pComboBoxType, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
@@ -630 +631 @@
                     m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Normal));
                     m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Immutable));
-                    m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Writethrough));
-                    m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Shareable));
+                    if (!m_newData.m_fHasChildren)
+                    {
+                        m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Writethrough));
+                        m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_Shareable));
+                    }
                     m_pComboBoxType->addItem(QString(), QVariant::fromValue(KMediumType_MultiAttach));
                 }

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

@@ -122 +122 @@
         , m_enmType(UIMediumType_Invalid)
         , m_enmVariant(KMediumVariant_Max)
+        , m_fHasChildren(false)
         , m_options(UIDataMediumOptions())
         , m_details(UIDataMediumDetails())
@@ -131 +132 @@
         , m_enmType(enmType)
         , m_enmVariant(KMediumVariant_Max)
+        , m_fHasChildren(false)
         , m_options(UIDataMediumOptions())
         , m_details(UIDataMediumDetails())
@@ -142 +144 @@
                && (m_enmType == other.m_enmType)
                && (m_enmVariant == other.m_enmVariant)
+               && (m_fHasChildren == other.m_fHasChildren)
                && (m_options == other.m_options)
                && (m_details == other.m_details)
@@ -158 +161 @@
     /** Holds the medium variant. */
     KMediumVariant m_enmVariant;
+    /** Holds whether medium has children. */
+    bool m_fHasChildren;
 
     /** Holds the medium options. */

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

@@ -400 +400 @@
     m_enmType = m_guiMedium.type();
     m_enmVariant = m_guiMedium.mediumVariant();
+    m_fHasChildren = m_guiMedium.hasChildren();
     /* Gather medium options data: */
     m_options.m_enmType = m_guiMedium.mediumType();