Changeset 47952 in vbox for trunk/src/VBox

Timestamp:

Aug 21, 2013 8:40:17 AM (11 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: add a way to hide a medium from the virtual media manager, independent of hiding VMs

Location:

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

Files:

• UIMedium.cpp (modified) (3 diffs)
• UIMedium.h (modified) (4 diffs)
• UIMediumManager.cpp (modified) (3 diffs)

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

@@ -42 +42 @@
 UIMedium& UIMedium::operator= (const UIMedium &aOther)
 {
-    m_fAttachedToHiddenMachinesOnly = aOther.isAttachedToHiddenMachinesOnly();
+    m_fHide = aOther.m_fHide;
+    m_fAttachedToHiddenMachinesOnly = aOther.m_fAttachedToHiddenMachinesOnly;
 
     mMedium = aOther.medium();
@@ -123 +124 @@
 void UIMedium::refresh()
 {
-    /* We assume this flag is 'false' by default: */
+    /* We assume these flags are 'false' by default: */
+    m_fHide = false;
     m_fAttachedToHiddenMachinesOnly = false;
 
@@ -142 +144 @@
     mLocation = mMedium.isNull() || mIsHostDrive ? QString ("--") :
                 QDir::toNativeSeparators (mMedium.GetLocation());
+
+    QString tmp;
+    if (!mMedium.isNull())
+        tmp = mMedium.GetProperty("Special/GUI/Hints");
+    if (!tmp.isEmpty())
+    {
+        QStringList tmpList(tmp.split(','));
+        if (tmpList.contains("Hide", Qt::CaseInsensitive))
+            m_fHide = true;
+    }
 
     if (mType == UIMediumType_HardDisk)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -130 +130 @@
     void refresh();
 
-    bool isAttachedToHiddenMachinesOnly() const { return m_fAttachedToHiddenMachinesOnly; }
+    bool isHidden() const { return m_fHide | m_fAttachedToHiddenMachinesOnly; }
 
     const CMedium &medium() const { return mMedium; }
@@ -244 +244 @@
     void checkNoDiffs (bool aNoDiffs);
 
-    bool m_fAttachedToHiddenMachinesOnly;
-
     CMedium mMedium;
 
@@ -272 +270 @@
     bool mIsUsedInSnapshots : 1;
     bool mIsHostDrive       : 1;
+    bool m_fHide            : 1;
+    bool m_fAttachedToHiddenMachinesOnly : 1;
 
     QList <QString> mCurStateMachineIds;

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

@@ -778 +778 @@
         return;
 
-    /* Ignore mediums (and their children) attached to hidden machines only: */
+    /* Ignore mediums (and their children) which are marked as hidden or
+     * which are attached to hidden machines only: */
     if (isMediumAttachedToHiddenMachinesOnly(aMedium))
         return;
@@ -893 +894 @@
         return;
 
-    /* Ignore mediums (and their children) attached to hidden machines only: */
+    /* Ignore mediums (and their children) which are marked as hidden or
+     * which are attached to hidden machines only: */
     if (isMediumAttachedToHiddenMachinesOnly(aMedium))
         return;
@@ -1998 +2000 @@
     do
     {
-        /* Ignore medium if its attached to hidden machines only: */
-        if (pMedium->isAttachedToHiddenMachinesOnly())
+        /* Ignore medium if its hidden or attached to hidden machines only: */
+        if (pMedium->isHidden())
             return true;
         /* Move iterator to parent: */