Changeset 43615 in vbox

Timestamp:

Oct 11, 2012 11:34:53 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Moving item sorting stuff into corresponding place.

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) (3 diffs)
• UIGChooserModel.h (modified) (1 diff)

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

@@ -107 +107 @@
     virtual UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags) = 0;
     virtual UIGChooserItemMachine* firstMachineItem() = 0;
+    virtual void sortItems() = 0;
 
     /* API: Layout stuff: */

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

@@ -779 +779 @@
 }
 
+void UIGChooserItemGroup::sortItems()
+{
+    /* Sort group-items: */
+    QMap<QString, UIGChooserItem*> sorter;
+    foreach (UIGChooserItem *pItem, items(UIGChooserItemType_Group))
+        sorter.insert(pItem->name().toLower(), pItem);
+    setItems(sorter.values(), UIGChooserItemType_Group);
+
+    /* Sort machine-items: */
+    sorter.clear();
+    foreach (UIGChooserItem *pItem, items(UIGChooserItemType_Machine))
+        sorter.insert(pItem->name().toLower(), pItem);
+    setItems(sorter.values(), UIGChooserItemType_Machine);
+
+    /* Update model: */
+    model()->updateNavigation();
+    model()->updateLayout();
+}
+
 void UIGChooserItemGroup::updateLayout()
 {

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

@@ -150 +150 @@
     UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags);
     UIGChooserItemMachine* firstMachineItem();
+    void sortItems();
 
     /* Helpers: Layout stuff: */

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

@@ -390 +390 @@
 }
 
+void UIGChooserItemMachine::sortItems()
+{
+    AssertMsgFailed(("Machine graphics item do NOT support children!"));
+}
+
 void UIGChooserItemMachine::updateLayout()
 {

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

@@ -126 +126 @@
     UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags);
     UIGChooserItemMachine* firstMachineItem();
+    void sortItems();
 
     /* Helpers: Layout stuff: */

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

@@ -728 +728 @@
 
     /* Sorting group: */
-    sortItems(currentItem());
+    currentItem()->sortItems();
 }
 
@@ -915 +915 @@
 
     /* Sorting parent group: */
-    sortItems(currentItem()->parentItem());
+    currentItem()->parentItem()->sortItems();
 }
 
@@ -1425 +1425 @@
             unindentRoot();
     }
-}
-
-void UIGChooserModel::sortItems(UIGChooserItem *pParent)
-{
-    /* Sort group-items: */
-    QMap<QString, UIGChooserItem*> sorter;
-    foreach (UIGChooserItem *pItem, pParent->items(UIGChooserItemType_Group))
-        sorter.insert(pItem->name().toLower(), pItem);
-    pParent->setItems(sorter.values(), UIGChooserItemType_Group);
-
-    /* Sort machine-items: */
-    sorter.clear();
-    foreach (UIGChooserItem *pItem, pParent->items(UIGChooserItemType_Machine))
-        sorter.insert(pItem->name().toLower(), pItem);
-    pParent->setItems(sorter.values(), UIGChooserItemType_Machine);
-
-    /* Update model: */
-    updateNavigation();
-    updateLayout();
 }
 

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

@@ -247 +247 @@
 
     /* Helpers: Machine-item stuff: */
-    void sortItems(UIGChooserItem *pParent);
     void updateMachineItems(const QString &strId, UIGChooserItem *pParent);
     void removeMachineItems(const QString &strId, UIGChooserItem *pParent);