Changeset 43539 in vbox

Timestamp:

Oct 4, 2012 12:41:57 PM (12 years ago)

Author:

vboxsync

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

81140

Message:

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

Location:

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

Files:

• UIGChooserHandlerKeyboard.cpp (modified) (6 diffs)
• UIGChooserHandlerMouse.cpp (modified) (6 diffs)
• UIGChooserItemGroup.cpp (modified) (4 diffs)
• UIGChooserItemMachine.cpp (modified) (6 diffs)
• UIGChooserModel.cpp (modified) (20 diffs)
• UIGChooserModel.h (modified) (2 diffs)

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

@@ -116 +116 @@
                     model()->setFocusItem(pPreviousItem);
                     /* Calculate positions: */
-                    UIGChooserItem *pFirstItem = model()->selectionList().first();
+                    UIGChooserItem *pFirstItem = model()->currentItem();
                     int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                     int iPreviousPosition = model()->navigationList().indexOf(pPreviousItem);
@@ -124 +124 @@
                     if (iFirstPosition <= iPreviousPosition)
                         for (int i = iFirstPosition; i <= iPreviousPosition; ++i)
-                            model()->addToSelectionList(model()->navigationList().at(i));
+                            model()->addToCurrentItems(model()->navigationList().at(i));
                     else
                         for (int i = iFirstPosition; i >= iPreviousPosition; --i)
-                            model()->addToSelectionList(model()->navigationList().at(i));
+                            model()->addToCurrentItems(model()->navigationList().at(i));
                     /* Notify selection changed: */
-                    model()->notifySelectionChanged();
+                    model()->notifyCurrentItemChanged();
                     /* Filter-out this event: */
                     return true;
@@ -160 +160 @@
                     /* Move selection to 'previous' item: */
                     model()->clearSelectionList();
-                    model()->addToSelectionList(pPreviousItem);
+                    model()->addToCurrentItems(pPreviousItem);
                     /* Notify selection changed: */
-                    model()->notifySelectionChanged();
+                    model()->notifyCurrentItemChanged();
                     /* Filter-out this event: */
                     return true;
@@ -232 +232 @@
                     model()->setFocusItem(pNextItem);
                     /* Calculate positions: */
-                    UIGChooserItem *pFirstItem = model()->selectionList().first();
+                    UIGChooserItem *pFirstItem = model()->currentItem();
                     int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                     int iNextPosition = model()->navigationList().indexOf(pNextItem);
@@ -240 +240 @@
                     if (iFirstPosition <= iNextPosition)
                         for (int i = iFirstPosition; i <= iNextPosition; ++i)
-                            model()->addToSelectionList(model()->navigationList().at(i));
+                            model()->addToCurrentItems(model()->navigationList().at(i));
                     else
                         for (int i = iFirstPosition; i >= iNextPosition; --i)
-                            model()->addToSelectionList(model()->navigationList().at(i));
+                            model()->addToCurrentItems(model()->navigationList().at(i));
                     /* Notify selection changed: */
-                    model()->notifySelectionChanged();
+                    model()->notifyCurrentItemChanged();
                     /* Filter-out this event: */
                     return true;
@@ -276 +276 @@
                     /* Move selection to 'next' item: */
                     model()->clearSelectionList();
-                    model()->addToSelectionList(pNextItem);
+                    model()->addToCurrentItems(pNextItem);
                     /* Notify selection changed: */
-                    model()->notifySelectionChanged();
+                    model()->notifyCurrentItemChanged();
                     /* Filter-out this event: */
                     return true;

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

@@ -75 +75 @@
                 {
                     /* Old selection list: */
-                    QList<UIGChooserItem*> oldSelectionList = model()->selectionList();
+                    QList<UIGChooserItem*> oldSelectionList = model()->currentItems();
                     /* Move focus to clicked item: */
                     model()->setFocusItem(pClickedItem);
@@ -82 +82 @@
                     {
                         /* Calculate positions: */
-                        UIGChooserItem *pFirstItem = model()->selectionList().first();
+                        UIGChooserItem *pFirstItem = model()->currentItem();
                         int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                         int iClickedPosition = model()->navigationList().indexOf(pClickedItem);
@@ -90 +90 @@
                         if (iFirstPosition <= iClickedPosition)
                             for (int i = iFirstPosition; i <= iClickedPosition; ++i)
-                                model()->addToSelectionList(model()->navigationList().at(i));
+                                model()->addToCurrentItems(model()->navigationList().at(i));
                         else
                             for (int i = iFirstPosition; i >= iClickedPosition; --i)
-                                model()->addToSelectionList(model()->navigationList().at(i));
+                                model()->addToCurrentItems(model()->navigationList().at(i));
                     }
                     /* Was 'control' modifier pressed? */
@@ -99 +99 @@
                     {
                         /* Select clicked item, inverting if necessary: */
-                        if (model()->selectionList().contains(pClickedItem))
-                            model()->removeFromSelectionList(pClickedItem);
+                        if (model()->currentItems().contains(pClickedItem))
+                            model()->removeFromCurrentItems(pClickedItem);
                         else
-                            model()->addToSelectionList(pClickedItem);
+                            model()->addToCurrentItems(pClickedItem);
                     }
                     /* Was no modifiers pressed? */
@@ -109 +109 @@
                         /* Move selection to clicked item: */
                         model()->clearSelectionList();
-                        model()->addToSelectionList(pClickedItem);
+                        model()->addToCurrentItems(pClickedItem);
                     }
                     /* Selection list changed?: */
-                    if (oldSelectionList != model()->selectionList())
-                        model()->notifySelectionChanged();
+                    if (oldSelectionList != model()->currentItems())
+                        model()->notifyCurrentItemChanged();
                 }
                 break;
@@ -135 +135 @@
                     {
                         /* Is clicked item in selection list: */
-                        bool fIsClickedItemInSelectionList = contains(model()->selectionList(), pClickedItem);
+                        bool fIsClickedItemInSelectionList = contains(model()->currentItems(), pClickedItem);
                         /* Move focus to clicked item (with selection if not selected yet): */
                         model()->setFocusItem(pClickedItem, !fIsClickedItemInSelectionList);

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

@@ -169 +169 @@
     }
     /* If that item is NOT focused, but selected: */
-    else if (model()->selectionList().contains(this))
+    else if (model()->currentItems().contains(this))
     {
         /* Remove item from the selection list: */
-        model()->removeFromSelectionList(this);
+        model()->removeFromCurrentItems(this);
     }
     /* Remove item from the navigation list: */
@@ -1207 +1207 @@
     QPalette pal = palette();
     QColor windowColor = pal.color(QPalette::Active,
-                                   model()->selectionList().contains(this) ?
+                                   model()->currentItems().contains(this) ?
                                    QPalette::Highlight : QPalette::Window);
 
@@ -1333 +1333 @@
 
     /* Update palette: */
-    if (model()->selectionList().contains(this))
+    if (model()->currentItems().contains(this))
     {
         QPalette pal = palette();
@@ -1341 +1341 @@
     /* Update buttons: */
     if (m_pToggleButton)
-        m_pToggleButton->setParentSelected(model()->selectionList().contains(this));
+        m_pToggleButton->setParentSelected(model()->currentItems().contains(this));
     if (m_pEnterButton)
-        m_pEnterButton->setParentSelected(model()->selectionList().contains(this));
+        m_pEnterButton->setParentSelected(model()->currentItems().contains(this));
     if (m_pExitButton)
-        m_pExitButton->setParentSelected(model()->selectionList().contains(this));
+        m_pExitButton->setParentSelected(model()->currentItems().contains(this));
 
     /* Paint name: */

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

@@ -116 +116 @@
     }
     /* If that item is NOT focused, but selected: */
-    else if (model()->selectionList().contains(this))
+    else if (model()->currentItems().contains(this))
     {
         /* Remove item from the selection list: */
-        model()->removeFromSelectionList(this);
+        model()->removeFromCurrentItems(this);
     }
     /* Remove item from the navigation list: */
@@ -595 +595 @@
 
     /* Selection background: */
-    if (model()->selectionList().contains(this))
+    if (model()->currentItems().contains(this))
     {
         /* Prepare color: */
@@ -622 +622 @@
     {
         /* Window color: */
-        QColor base = pal.color(QPalette::Active, model()->selectionList().contains(this) ?
+        QColor base = pal.color(QPalette::Active, model()->currentItems().contains(this) ?
                                 QPalette::Highlight : QPalette::Window);
         QLinearGradient dragTokenGradient;
@@ -650 +650 @@
 {
     /* Only chosen and/or hovered item should have a frame: */
-    if (!model()->selectionList().contains(this) && !isHovered())
+    if (!model()->currentItems().contains(this) && !isHovered())
         return;
 
@@ -657 +657 @@
     QPalette pal = palette();
     QColor hc = pal.color(QPalette::Active, QPalette::Highlight);
-    if (model()->selectionList().contains(this))
+    if (model()->currentItems().contains(this))
         hc = hc.darker(strokeDarkness());
     pPainter->setPen(hc);
@@ -680 +680 @@
 
     /* Update palette: */
-    if (model()->selectionList().contains(this))
+    if (model()->currentItems().contains(this))
     {
         QPalette pal = palette();

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

@@ -189 +189 @@
 {
     /* Search for the first selected machine: */
-    return searchCurrentItem(selectionList());
+    return searchCurrentItem(currentItems());
 }
 
@@ -199 +199 @@
 
     /* Get first selected item: */
-    UIGChooserItem *pSelectedItem = selectionList().isEmpty() ? 0 : selectionList().first();
+    UIGChooserItem *pSelectedItem = currentItem();
     /* Item exists? */
     if (pSelectedItem)
@@ -220 +220 @@
 {
     /* Populate list of selected machines: */
-    QList<UIVMItem*> currentItemList;
-    enumerateCurrentItems(selectionList(), currentItemList);
-    return currentItemList;
-}
-
-const QList<UIGChooserItem*>& UIGChooserModel::selectionList() const
-{
-    return m_selectionList;
+    QList<UIVMItem*> currentMachineItemList;
+    enumerateCurrentItems(currentItems(), currentMachineItemList);
+    return currentMachineItemList;
+}
+
+UIGChooserItem* UIGChooserModel::currentItem() const
+{
+    /* Return first of current items, if any: */
+    return currentItems().isEmpty() ? 0 : currentItems().first();
+}
+
+const QList<UIGChooserItem*>& UIGChooserModel::currentItems() const
+{
+    return m_currentItems;
 }
 
@@ -309 +315 @@
 }
 
-void UIGChooserModel::addToSelectionList(UIGChooserItem *pItem)
+void UIGChooserModel::addToCurrentItems(UIGChooserItem *pItem)
 {
     AssertMsg(pItem, ("Passed item is invalid!"));
-    m_selectionList << pItem;
+    m_currentItems << pItem;
     pItem->update();
 }
 
-void UIGChooserModel::removeFromSelectionList(UIGChooserItem *pItem)
+void UIGChooserModel::removeFromCurrentItems(UIGChooserItem *pItem)
 {
     AssertMsg(pItem, ("Passed item is invalid!"));
-    m_selectionList.removeAll(pItem);
+    m_currentItems.removeAll(pItem);
     pItem->update();
 }
@@ -325 +331 @@
 void UIGChooserModel::clearSelectionList()
 {
-    QList<UIGChooserItem*> oldSelectedList = m_selectionList;
-    m_selectionList.clear();
-    foreach (UIGChooserItem *pItem, oldSelectedList)
+    QList<UIGChooserItem*> oldCurrentItems = m_currentItems;
+    m_currentItems.clear();
+    foreach (UIGChooserItem *pItem, oldCurrentItems)
         pItem->update();
 }
 
-void UIGChooserModel::notifySelectionChanged()
+void UIGChooserModel::notifyCurrentItemChanged()
 {
     /* Make sure selection item list is never empty
      * if at least one item (for example 'focus') present: */
-    if (selectionList().isEmpty() && focusItem())
-        addToSelectionList(focusItem());
+    if (currentItems().isEmpty() && focusItem())
+        addToCurrentItems(focusItem());
     /* Notify listeners about selection change: */
     emit sigSelectionChanged();
@@ -348 +354 @@
 bool UIGChooserModel::isSingleGroupSelected() const
 {
-    return selectionList().size() == 1 &&
-           selectionList().first()->type() == UIGChooserItemType_Group;
+    return currentItems().size() == 1 &&
+           currentItem()->type() == UIGChooserItemType_Group;
 }
 
@@ -355 +361 @@
 {
     /* Make sure at least on item selected: */
-    if (selectionList().isEmpty())
+    if (currentItems().isEmpty())
         return false;
 
     /* Determine the parent group of the first item: */
-    UIGChooserItem *pFirstParent = selectionList().first()->parentItem();
+    UIGChooserItem *pFirstParent = currentItem()->parentItem();
 
     /* Make sure this parent is not main root item: */
@@ -365 +371 @@
         return false;
 
-    /* Enumerate selected set: */
-    QSet<UIGChooserItem*> selectedSet;
-    foreach (UIGChooserItem *pSelectedItem, selectionList())
-        selectedSet << pSelectedItem;
+    /* Enumerate current-item set: */
+    QSet<UIGChooserItem*> currentItemSet;
+    foreach (UIGChooserItem *pCurrentItem, currentItems())
+        currentItemSet << pCurrentItem;
 
     /* Enumerate first parent children set: */
-    QSet<UIGChooserItem*> firstParentSet;
-    foreach (UIGChooserItem *pSelectedItem, pFirstParent->items())
-        firstParentSet << pSelectedItem;
+    QSet<UIGChooserItem*> firstParentItemSet;
+    foreach (UIGChooserItem *pFirstParentItem, pFirstParent->items())
+        firstParentItemSet << pFirstParentItem;
 
     /* Check if both sets contains the same: */
-    return selectedSet == firstParentSet;
+    return currentItemSet == firstParentItemSet;
 }
 
@@ -404 +410 @@
             /* Add focus item into selection (if any): */
             if (m_pFocusItem)
-                addToSelectionList(m_pFocusItem);
+                addToCurrentItems(m_pFocusItem);
             /* Notify selection changed: */
-            notifySelectionChanged();
+            notifyCurrentItemChanged();
         }
 
@@ -711 +717 @@
     QStringList busyGroupNames;
     QStringList busyMachineNames;
-    QList<UIGChooserItem*> selectedItems = selectionList();
+    QList<UIGChooserItem*> selectedItems = currentItems();
     foreach (UIGChooserItem *pItem, selectedItems)
     {
@@ -762 +768 @@
 
     /* Start editing group name: */
-    selectionList().first()->startEditing();
+    currentItem()->startEditing();
 }
 
@@ -768 +774 @@
 {
     if (isSingleGroupSelected())
-        sortItems(selectionList().first());
+        sortItems(currentItem());
 }
 
@@ -851 +857 @@
     UIGChooserItem *pGroup = 0;
     if (isSingleGroupSelected())
-        pGroup = selectionList().first();
-    else if (!selectionList().isEmpty())
-        pGroup = selectionList().first()->parentItem();
+        pGroup = currentItem();
+    else if (!currentItems().isEmpty())
+        pGroup = currentItem()->parentItem();
     QString strGroupName;
     if (pGroup)
@@ -888 +894 @@
 void UIGChooserModel::sltSortParentGroup()
 {
-    if (!selectionList().isEmpty())
-        sortItems(selectionList().first()->parentItem());
+    if (!currentItems().isEmpty())
+        sortItems(currentItem()->parentItem());
 }
 
@@ -896 +902 @@
     /* Gather list of chosen inaccessible VMs: */
     QList<UIGChooserItem*> inaccessibleItems;
-    enumerateInaccessibleItems(selectionList(), inaccessibleItems);
+    enumerateInaccessibleItems(currentItems(), inaccessibleItems);
 
     /* For each inaccessible item: */
@@ -928 +934 @@
 {
     /* Enumerate all the selected machine items: */
-    QList<UIGChooserItem*> selectedMachineItemList = gatherMachineItems(selectionList());
+    QList<UIGChooserItem*> selectedMachineItemList = gatherMachineItems(currentItems());
     /* Enumerate all the existing machine items: */
     QList<UIGChooserItem*> existingMachineItemList = gatherMachineItems(mainRoot()->items());
@@ -1603 +1609 @@
     updateNavigation();
     updateLayout();
-    if (mainRoot()->hasItems())
+    if (!navigationList().isEmpty())
         setCurrentItem(0);
     else
@@ -1679 +1685 @@
                             return false;
                         /* Is this group item only the one selected? */
-                        if (selectionList().contains(pGroupItem) && selectionList().size() == 1)
+                        if (currentItems().contains(pGroupItem) && currentItems().size() == 1)
                         {
                             /* Group context menu in that case: */
@@ -1701 +1707 @@
         {
             /* Get first selected item: */
-            if (UIGChooserItem *pItem = selectionList().first())
+            if (UIGChooserItem *pItem = currentItem())
             {
                 /* If this item of known type? */
@@ -1709 +1715 @@
                     {
                         /* Is this group item only the one selected? */
-                        if (selectionList().size() == 1)
+                        if (currentItems().size() == 1)
                         {
                             /* Group context menu in that case: */

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

@@ -113 +113 @@
     QString currentItemDefinition() const;
     QList<UIVMItem*> currentMachineItems() const;
-    const QList<UIGChooserItem*>& selectionList() const;
+    UIGChooserItem* currentItem() const;
+    const QList<UIGChooserItem*>& currentItems() const;
     void setCurrentItem(int iItemIndex);
     void setCurrentItem(UIGChooserItem *pItem);
     void setCurrentItemDefinition(const QString &strDefinition);
     void unsetCurrentItem();
-    void addToSelectionList(UIGChooserItem *pItem);
-    void removeFromSelectionList(UIGChooserItem *pItem);
+    void addToCurrentItems(UIGChooserItem *pItem);
+    void removeFromCurrentItems(UIGChooserItem *pItem);
     void clearSelectionList();
-    void notifySelectionChanged();
+    void notifyCurrentItemChanged();
     void activate();
     bool isSingleGroupSelected() const;
@@ -302 +303 @@
     QMap<QString, QStringList> m_groups;
     QList<UIGChooserItem*> m_navigationList;
-    QList<UIGChooserItem*> m_selectionList;
+    QList<UIGChooserItem*> m_currentItems;
     UIGChooserHandlerMouse *m_pMouseHandler;
     UIGChooserHandlerKeyboard *m_pKeyboardHandler;