Changeset 50985 in vbox

Timestamp:

Apr 7, 2014 11:46:17 AM (11 years ago)

Author:

vboxsync

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

93167

Message:

FE/Qt: Make sure GUI/HideFromManager per-VM extra-data option affects medium-combo-box as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMedium.cpp (modified) (1 diff)
• medium/UIMedium.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (3 diffs)
• medium/UIMediumManager.h (modified) (1 diff)
• widgets/VBoxMediaComboBox.cpp (modified) (1 diff)

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

@@ -560 +560 @@
 }
 
+/* static */
+bool UIMedium::isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium)
+{
+    /* Iterate till the root: */
+    UIMedium mediumIterator = medium;
+    do
+    {
+        /* Ignore medium if its hidden
+         * or attached to hidden machines only: */
+        if (mediumIterator.isHidden())
+            return true;
+        /* Move iterator to parent: */
+        mediumIterator = mediumIterator.parent();
+    }
+    while (!mediumIterator.isNull());
+    /* False by default: */
+    return false;
+}
+
 /**
  * Checks if m_noDiffs is filled in and does it if not.

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

@@ -225 +225 @@
     static QString nullID();
 
+    /** Determines if passed @a medium attached to hidden machines only. */
+    static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
+
 private:
 

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

@@ -709 +709 @@
     /* Ignore mediums (and their children) which are
      * marked as hidden or attached to hidden machines only: */
-    if (isMediumAttachedToHiddenMachinesOnly(medium))
+    if (UIMedium::isMediumAttachedToHiddenMachinesOnly(medium))
         return;
 
@@ -780 +780 @@
     /* Ignore mediums (and their children) which are
      * marked as hidden or attached to hidden machines only: */
-    if (isMediumAttachedToHiddenMachinesOnly(medium))
+    if (UIMedium::isMediumAttachedToHiddenMachinesOnly(medium))
         return;
 
@@ -2327 +2327 @@
 }
 
-/* static */
-bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium)
-{
-    /* Iterate till the root: */
-    UIMedium mediumIterator = medium;
-    do
-    {
-        /* Ignore medium if its hidden
-         * or attached to hidden machines only: */
-        if (mediumIterator.isHidden())
-            return true;
-        /* Move iterator to parent: */
-        mediumIterator = mediumIterator.parent();
-    }
-    while (!mediumIterator.isNull());
-    /* False by default: */
-    return false;
-}
-
 #include "UIMediumManager.moc"
 

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

@@ -225 +225 @@
     /** Format information-field content. */
     static QString formatFieldText(const QString &strText, bool fCompact = true, const QString &strElipsis = "middle");
-
-    /** Determines if passed @a medium attached to hidden machines only. */
-    static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
 
     /** UIMediumManager singleton instance. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp

@@ -173 +173 @@
     UIMedium medium = vboxGlobal().medium(strMediumID);
 
+    /* Ignore mediums (and their children) which are
+     * marked as hidden or attached to hidden machines only: */
+    if (UIMedium::isMediumAttachedToHiddenMachinesOnly(medium))
+        return;
+
     /* Add only 1. NULL medium and 2. mediums of required type: */
     if (!medium.isNull() && medium.type() != mType)