Changeset 46756 in vbox for trunk/src

Timestamp:

Jun 24, 2013 2:28:59 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: UI medium handling: Make sure medium attached to hidden VMs *only* is hidden too. Affected by the GUI/HideFromManager extra-data flag. Affects Virtual Medium Manager.

Location:

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

Files:

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

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

@@ -42 +42 @@
 UIMedium& UIMedium::operator= (const UIMedium &aOther)
 {
+    m_fAttachedToHiddenMachinesOnly = aOther.isAttachedToHiddenMachinesOnly();
+
     mMedium = aOther.medium();
     mType = aOther.type();
@@ -121 +123 @@
 void UIMedium::refresh()
 {
+    /* We assume this flag is 'false' by default: */
+    m_fAttachedToHiddenMachinesOnly = false;
+
     /* Detect basic parameters */
     mId = mMedium.isNull() ? QUuid().toString().remove ('{').remove ('}') : mMedium.GetId();
@@ -201 +206 @@
         if (machineIds.size() > 0)
         {
+            /* We assume this flag is 'true' if at least one machine present: */
+            m_fAttachedToHiddenMachinesOnly = true;
+
             QString sUsage;
 
@@ -214 +222 @@
                  * CVirtualBox::FindMachine() will return null machine for such case. */
                 if (machine.isNull())
+                {
+                    /* We can't decide for that medium yet,
+                     * assume this flag is 'false' for now: */
+                    m_fAttachedToHiddenMachinesOnly = false;
                     continue;
+                }
+
+                /* Finally, we are checking if current machine overrides this flag: */
+                if (m_fAttachedToHiddenMachinesOnly && vboxGlobal().shouldWeShowMachine(machine))
+                    m_fAttachedToHiddenMachinesOnly = false;
 
                 QString sName = machine.GetName();

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

@@ -130 +130 @@
     void refresh();
 
+    bool isAttachedToHiddenMachinesOnly() const { return m_fAttachedToHiddenMachinesOnly; }
+
     const CMedium &medium() const { return mMedium; }
 
@@ -242 +244 @@
     void checkNoDiffs (bool aNoDiffs);
 
+    bool m_fAttachedToHiddenMachinesOnly;
+
     CMedium mMedium;
 

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

@@ -778 +778 @@
         return;
 
+    /* Ignore mediums (and their children) attached to hidden machines only: */
+    if (isMediumAttachedToHiddenMachinesOnly(aMedium))
+        return;
+
     if (!mShowDiffs && aMedium.type() == UIMediumType_HardDisk)
     {
@@ -887 +891 @@
         (mType != UIMediumType_All && mType != aMedium.type()) ||
         (aMedium.isHostDrive()))
+        return;
+
+    /* Ignore mediums (and their children) attached to hidden machines only: */
+    if (isMediumAttachedToHiddenMachinesOnly(aMedium))
         return;
 
@@ -1983 +1991 @@
 }
 
+/* static */
+bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium)
+{
+    /* Iterate till the root: */
+    const UIMedium *pMedium = &medium;
+    do
+    {
+        /* Ignore medium if its attached to hidden machines only: */
+        if (pMedium->isAttachedToHiddenMachinesOnly())
+            return true;
+        /* Move iterator to parent: */
+        pMedium = pMedium->parent();
+    }
+    while (pMedium);
+    /* False by default: */
+    return false;
+}
+
 #include "UIMediumManager.moc"
 

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

@@ -133 +133 @@
     QString formatPaneText (const QString &aText, bool aCompact = true, const QString &aElipsis = "middle");
 
+    /* Helper: Enumeration stuff: */
+    static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
+
     /* Private member vars */
     /* Window status */