Changeset 43597 in vbox

Timestamp:

Oct 10, 2012 2:37:37 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Current-item handling cleanup (part 9).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItem.h (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (1 diff)
• UIGChooserItemGroup.h (modified) (1 diff)
• UIGChooserItemMachine.cpp (modified) (1 diff)
• UIGChooserItemMachine.h (modified) (1 diff)
• UIGChooserModel.cpp (modified) (2 diffs)
• UIGChooserModel.h (modified) (1 diff)

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

@@ -94 +94 @@
     virtual bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const = 0;
     virtual void clearItems(UIGChooserItemType type = UIGChooserItemType_Any) = 0;
+    virtual UIGChooserItemMachine* firstMachineItem() = 0;
 
     /* API: Layout stuff: */

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

@@ -732 +732 @@
 }
 
+UIGChooserItemMachine* UIGChooserItemGroup::firstMachineItem()
+{
+    /* If this group-item have at least one machine-item: */
+    if (hasItems(UIGChooserItemType_Machine))
+        /* Return the first machine-item: */
+        return items(UIGChooserItemType_Machine).first()->firstMachineItem();
+    /* If this group-item have at least one group-item: */
+    else if (hasItems(UIGChooserItemType_Group))
+        /* Return the first machine-item of the first group-item: */
+        return items(UIGChooserItemType_Group).first()->firstMachineItem();
+    /* Found nothing? */
+    return 0;
+}
+
 void UIGChooserItemGroup::updateLayout()
 {

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

@@ -148 +148 @@
     bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const;
     void clearItems(UIGChooserItemType type = UIGChooserItemType_Any);
+    UIGChooserItemMachine* firstMachineItem();
 
     /* Helpers: Layout stuff: */

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

@@ -360 +360 @@
 }
 
+UIGChooserItemMachine* UIGChooserItemMachine::firstMachineItem()
+{
+    return this;
+}
+
 void UIGChooserItemMachine::updateLayout()
 {

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

@@ -127 +127 @@
     bool hasItems(UIGChooserItemType type) const;
     void clearItems(UIGChooserItemType type);
+    UIGChooserItemMachine* firstMachineItem();
 
     /* Helpers: Layout stuff: */

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

@@ -204 +204 @@
 UIVMItem* UIGChooserModel::currentMachineItem() const
 {
-    /* Return first machine-item: */
-    return firstMachineItem(currentItems());
+    /* Return first machine-item of the current-item: */
+    return currentItem() ? currentItem()->firstMachineItem() : 0;
 }
 
@@ -1357 +1357 @@
     /* Return navigation list: */
     return navigationItems;
-}
-
-UIGChooserItemMachine* UIGChooserModel::firstMachineItem(const QList<UIGChooserItem*> &list) const
-{
-    /* Iterate over all the passed items: */
-    foreach (UIGChooserItem *pItem, list)
-    {
-        /* If that is machine-item: */
-        if (pItem->type() == UIGChooserItemType_Machine)
-        {
-            /* Just return it: */
-            return pItem->toMachineItem();
-        }
-        /* If that is group-item: */
-        else if (pItem->type() == UIGChooserItemType_Group)
-        {
-            /* If that group-item have at least one machine-item: */
-            if (pItem->hasItems(UIGChooserItemType_Machine))
-                /* Iterate over all the machine-items recursively: */
-                return firstMachineItem(pItem->items(UIGChooserItemType_Machine));
-            /* If that group-item have at least one group-item: */
-            else if (pItem->hasItems(UIGChooserItemType_Group))
-                /* Iterate over all the group-items recursively: */
-                return firstMachineItem(pItem->items(UIGChooserItemType_Group));
-        }
-    }
-    return 0;
 }
 

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

@@ -238 +238 @@
     QList<UIGChooserItem*> createNavigationList(UIGChooserItem *pItem);
 
-    /* Helpers: Current-item stuff: */
-    UIGChooserItemMachine* firstMachineItem(const QList<UIGChooserItem*> &list) const;
-
     /* Helper: Focus-item stuff: */
     void clearRealFocus();