Changeset 45040 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 14, 2013 1:46:26 PM (12 years ago)

Author:

vboxsync

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

84288

Message:

Reverting r84283: Have to rework it according further similar code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -60 +60 @@
 const char* UIDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
 const char* UIDefs::GUI_PassCAD = "GUI/PassCAD";
-const char* UIDefs::GUI_HideFromManager = "GUI/HideFromManager";
 
 /* Mini tool-bar definitions: */

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

@@ -137 +137 @@
     extern const char* GUI_SaveMountedAtRuntime;
     extern const char* GUI_PassCAD;
-    extern const char* GUI_HideFromManager;
 
     /* Mini tool-bar declarations: */

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

@@ -597 +597 @@
 void UIGChooserModel::sltMachineRegistered(QString strId, bool fRegistered)
 {
-    /* New machine registered? */
+    /* New VM registered? */
     if (fRegistered)
     {
         /* Search for corresponding machine: */
         CMachine machine = vboxGlobal().virtualBox().FindMachine(strId);
-        /* Should we show this machine? */
-        if (shouldWeShowMachine(machine))
+        /* Machine was found? */
+        if (!machine.isNull())
         {
             /* Add new machine-item: */
@@ -615 +615 @@
         }
     }
-    /* Existing machine unregistered? */
+    /* Existing VM unregistered? */
     else
     {
@@ -884 +884 @@
     /* Remove all the items first: */
     mainRoot()->removeAll(strId);
-    /* Update model: */
+
+    /* Check if such machine still present: */
+    CMachine machine = vboxGlobal().virtualBox().FindMachine(strId);
+    if (machine.isNull())
+        return;
+
+    /* Add machine into the tree: */
+    addMachineIntoTheTree(machine);
+
+    /* And update model: */
     cleanupGroupTree();
-
-    /* Should we show this machine? */
-    CMachine machine = vboxGlobal().virtualBox().FindMachine(strId);
-    if (shouldWeShowMachine(machine))
-        addMachineIntoTheTree(machine);
-
-    /* Update model: */
     updateNavigation();
     updateLayout();
@@ -1614 +1616 @@
 void UIGChooserModel::loadGroupTree()
 {
-    /* Add all the approved machines we have into the group-tree: */
+    /* Add all the machines we have into the group-tree: */
     LogRel(("Loading VMs started...\n"));
-    foreach (CMachine machine, vboxGlobal().virtualBox().GetMachines())
-        if (shouldWeShowMachine(machine))
-            addMachineIntoTheTree(machine);
+    foreach (const CMachine &machine, vboxGlobal().virtualBox().GetMachines())
+        addMachineIntoTheTree(machine);
     LogRel(("Loading VMs finished.\n"));
 }
@@ -1834 +1835 @@
 }
 
-/* static */
-bool UIGChooserModel::shouldWeShowMachine(CMachine &machine)
-{
-    /* False for null machines: */
-    if (machine.isNull())
-        return false;
-
-    /* Check corresponding extra-data flag: */
-    QString strMachineIgnored(machine.GetExtraData(GUI_HideFromManager));
-    return    strMachineIgnored.compare("true", Qt::CaseInsensitive) != 0
-           && strMachineIgnored.compare("yes", Qt::CaseInsensitive) != 0
-           && strMachineIgnored != "1";
-}
-
 void UIGChooserModel::saveGroupDefinitions()
 {

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

@@ -266 +266 @@
     int positionFromDefinitions(UIGChooserItem *pParentItem, UIGChooserItemType type, const QString &strName);
     void createMachineItem(const CMachine &machine, UIGChooserItem *pParentItem);
-    static bool shouldWeShowMachine(CMachine &machine);
 
     /* Helpers: Saving stuff: */