Changeset 45049 in vbox

Timestamp:

Mar 15, 2013 12:52:34 PM (12 years ago)

Author:

vboxsync

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

84300

Message:

FE/Qt: 6644: Per-VM extra-data option to hide VM from VM selector.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)

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

@@ -45 +45 @@
 const char* UIDefs::GUI_LastItemSelected = "GUI/LastItemSelected";
 const char* UIDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";
+const char* UIDefs::GUI_HideFromManager = "GUI/HideFromManager";
 
 /* Machine-window definitions: */

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

@@ -122 +122 @@
     extern const char* GUI_LastItemSelected;
     extern const char* GUI_GroupDefinitions;
+    extern const char* GUI_HideFromManager;
 
     /* Machine-window declarations: */

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

@@ -3917 +3917 @@
         return tr("QCOW (QEMU Copy-On-Write)");
     return strBaseMediumFormatName;
+}
+
+/* static */
+bool VBoxGlobal::isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey)
+{
+    /* Load corresponding extra-data value: */
+    QString strExtraDataValue(machine.GetExtraData(strExtraDataKey));
+
+    /* 'false' if value was not set: */
+    if (strExtraDataValue.isEmpty())
+        return false;
+
+    /* Handle particular values: */
+    return    strExtraDataValue.compare("true", Qt::CaseInsensitive) == 0
+           || strExtraDataValue.compare("yes", Qt::CaseInsensitive) == 0
+           || strExtraDataValue.compare("on", Qt::CaseInsensitive) == 0
+           || strExtraDataValue == "1";
+}
+
+/* static */
+bool VBoxGlobal::shouldWeShowMachine(CMachine &machine)
+{
+    /* 'false' for null machines: */
+    if (machine.isNull())
+        return false;
+
+    /* 'true' for inaccessible machines,
+     * because we can't verify anything in that case: */
+    if (!machine.GetAccessible())
+        return true;
+
+    /* 'true' if hiding is not approved by the extra-data: */
+    return !isApprovedByExtraData(machine, GUI_HideFromManager);
 }
 

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

@@ -393 +393 @@
     /* Returns full medium-format name for the given base medium-format name: */
     static QString fullMediumFormatName(const QString &strBaseMediumFormatName);
+
+    /* Extra-data settings stuff: */
+    static bool isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey);
+    static bool shouldWeShowMachine(CMachine &machine);
 
 signals:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -602 +602 @@
         /* Search for corresponding machine: */
         CMachine machine = vboxGlobal().virtualBox().FindMachine(strId);
-        /* Machine was found? */
-        if (!machine.isNull())
+        /* Should we show this machine? */
+        if (VBoxGlobal::shouldWeShowMachine(machine))
         {
             /* Add new machine-item: */
@@ -884 +884 @@
     /* Remove all the items first: */
     mainRoot()->removeAll(strId);
-
-    /* Check if such machine still present: */
+    /* Wipe out empty groups: */
+    cleanupGroupTree();
+
+    /* Show machine if we should: */
     CMachine machine = vboxGlobal().virtualBox().FindMachine(strId);
-    if (machine.isNull())
-        return;
-
-    /* Add machine into the tree: */
-    addMachineIntoTheTree(machine);
+    if (VBoxGlobal::shouldWeShowMachine(machine))
+        addMachineIntoTheTree(machine);
 
     /* And update model: */
-    cleanupGroupTree();
     updateNavigation();
     updateLayout();
@@ -1616 +1614 @@
 void UIGChooserModel::loadGroupTree()
 {
-    /* Add all the machines we have into the group-tree: */
+    /* Add all the approved machines we have into the group-tree: */
     LogRel(("Loading VMs started...\n"));
-    foreach (const CMachine &machine, vboxGlobal().virtualBox().GetMachines())
-        addMachineIntoTheTree(machine);
+    foreach (CMachine machine, vboxGlobal().virtualBox().GetMachines())
+        if (VBoxGlobal::shouldWeShowMachine(machine))
+            addMachineIntoTheTree(machine);
     LogRel(("Loading VMs finished.\n"));
 }