Changeset 69553 in vbox for trunk/src/VBox

Timestamp:

Nov 2, 2017 3:11:26 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Media Manager: Propose to automatically release medium when changing medium type in certain cases, hard-coded rules taken from Medium::setType.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (5 diffs)

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

@@ -1220 +1220 @@
 }
 
-bool UIMessageCenter::confirmMediumRelease(const UIMedium &medium, QWidget *pParent /* = 0*/) const
+bool UIMessageCenter::confirmMediumRelease(const UIMedium &medium, bool fInduced, QWidget *pParent /* = 0 */) const
 {
     /* Prepare the usage: */
@@ -1233 +1233 @@
     }
     /* Show the question: */
-    return questionBinary(pParent, MessageType_Question,
-                          tr("<p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p>"
-                             "<p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>")
-                             .arg(medium.location(), usage.join(", ")),
-                          0 /* auto-confirm id */,
-                          tr("Release", "detach medium"));
+    return !fInduced
+           ? questionBinary(pParent, MessageType_Question,
+                            tr("<p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p>"
+                               "<p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>")
+                               .arg(medium.location(), usage.join(", ")),
+                            0 /* auto-confirm id */,
+                            tr("Release", "detach medium"))
+           : questionBinary(pParent, MessageType_Question,
+                            tr("<p>The changes you requested require this disk to "
+                               "be released from the machines it is attached to.</p>"
+                               "<p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p>"
+                               "<p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>")
+                               .arg(medium.location(), usage.join(", ")),
+                            0 /* auto-confirm id */,
+                            tr("Release", "detach medium"));
 }
 

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

@@ -246 +246 @@
     void cannotMoveMediumStorage(const CProgress &comProgress, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent = 0) const;
     void cannotChangeMediumDescription(const CMedium &comMedium, const QString &strLocation, QWidget *pParent = 0) const;
-    bool confirmMediumRelease(const UIMedium &medium, QWidget *pParent = 0) const;
+    bool confirmMediumRelease(const UIMedium &medium, bool fInduced, QWidget *pParent = 0) const;
     bool confirmMediumRemoval(const UIMedium &medium, QWidget *pParent = 0) const;
     int confirmDeleteHardDiskStorage(const QString &strLocation, QWidget *pParent = 0) const;

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

@@ -78 +78 @@
     /** Removes UIMedium wrapped by <i>this</i> item. */
     virtual bool remove() = 0;
-    /** Releases UIMedium wrapped by <i>this</i> item. */
-    virtual bool release();
+    /** Releases UIMedium wrapped by <i>this</i> item.
+      * @param  fInduced  Brings whether this action is caused by other user's action,
+      *                   not a direct order to release particularly selected medium. */
+    virtual bool release(bool fInduced = false);
 
     /** Refreshes item fully. */
@@ -113 +115 @@
     QString toolTip() const { return m_guiMedium.toolTip(); }
 
+    /** Returns a vector of IDs of all machines wrapped UIMedium is attached to. */
+    const QList<QString> &machineIds() const { return m_guiMedium.machineIds(); }
     /** Returns QString <i>usage</i> of the wrapped UIMedium. */
     QString usage() const { return m_guiMedium.usage(); }
@@ -328 +332 @@
 }
 
-bool UIMediumItem::release()
+bool UIMediumItem::release(bool fInduced /* = false */)
 {
     /* Refresh medium and item: */
@@ -339 +343 @@
 
     /* Confirm release: */
-    if (!msgCenter().confirmMediumRelease(medium(), treeWidget()))
+    if (!msgCenter().confirmMediumRelease(medium(), fInduced, treeWidget()))
         return false;
 
@@ -979 +983 @@
         && newData.m_options.m_enmType != oldData.m_options.m_enmType)
     {
-        comMedium.SetType(newData.m_options.m_enmType);
-
-        /* Show error message if necessary: */
-        if (!comMedium.isOk())
-            msgCenter().cannotChangeMediumType(comMedium, oldData.m_options.m_enmType, newData.m_options.m_enmType, this);
+        /* Check if we need to release medium first: */
+        bool fDo = true;
+        if (   pMediumItem->machineIds().size() > 1
+            || (   (   newData.m_options.m_enmType == KMediumType_Immutable
+                    || newData.m_options.m_enmType == KMediumType_MultiAttach)
+                && pMediumItem->machineIds().size() > 0))
+            fDo = pMediumItem->release(true);
+
+        if (fDo)
+        {
+            comMedium.SetType(newData.m_options.m_enmType);
+
+            /* Show error message if necessary: */
+            if (!comMedium.isOk())
+                msgCenter().cannotChangeMediumType(comMedium, oldData.m_options.m_enmType, newData.m_options.m_enmType, this);
+        }
     }