Changeset 43552 in vbox

Timestamp:

Oct 5, 2012 10:52:56 AM (12 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIGChooserHandlerMouse.cpp (modified) (1 diff)
• UIGChooserModel.cpp (modified) (9 diffs)
• UIGChooserModel.h (modified) (2 diffs)

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

@@ -134 +134 @@
                     if (!pClickedItem->isRoot())
                     {
-                        /* Is clicked item in selection list: */
-                        bool fIsClickedItemInSelectionList = model()->currentItems().contains(pClickedItem);
                         /* Move focus to clicked item (with selection if not selected yet): */
-                        model()->setFocusItem(pClickedItem, !fIsClickedItemInSelectionList);
+                        model()->setCurrentItem(pClickedItem);
                     }
                 }

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

@@ -211 +211 @@
 }
 
+void UIGChooserModel::setCurrentItems(const QList<UIGChooserItem*> &items)
+{
+    /* Is there something seems to be changed? */
+    if (m_currentItems == items)
+        return;
+
+    /* Remember old current-item list: */
+    QList<UIGChooserItem*> oldCurrentItems = m_currentItems;
+
+    /* Clear current current-item list: */
+    m_currentItems.clear();
+
+    /* Iterate over all the passed items: */
+    foreach (UIGChooserItem *pItem, items)
+    {
+        /* If navigation list contains iterated-item: */
+        if (pItem && navigationList().contains(pItem))
+        {
+            /* Add that item to current: */
+            m_currentItems << pItem;
+        }
+        else
+            AssertMsgFailed(("Passed item not in navigation list!"));
+    }
+
+    /* Is there something really changed? */
+    if (oldCurrentItems == m_currentItems)
+        return;
+
+    /* Update all the old items (they are no longer selected): */
+    foreach (UIGChooserItem *pItem, oldCurrentItems)
+        pItem->update();
+
+    /* Update all the new items (they are selected): */
+    foreach (UIGChooserItem *pItem, m_currentItems)
+        pItem->update();
+
+    /* Notify about selection changes: */
+    notifyCurrentItemChanged();
+}
+
 void UIGChooserModel::setCurrentItem(UIGChooserItem *pItem)
 {
-    /* If navigation list contains passed item: */
-    if (navigationList().contains(pItem))
-    {
-        /* Pass focus/selection to that item: */
-        setFocusItem(pItem, true);
-    }
-    else
-        AssertMsgFailed(("Passed item not in navigation list!"));
-}
-
-void UIGChooserModel::setCurrentItem(int iItemIndex)
-{
-    /* Make sure passed index feats the bounds: */
-    if (iItemIndex >= 0 && iItemIndex < navigationList().size())
-    {
-        /* And call for other wrapper: */
-        setCurrentItem(navigationList().at(iItemIndex));
-    }
-    else
-        AssertMsgFailed(("Passed index out of bounds!"));
+    /* Call for wrapper above: */
+    setCurrentItems(QList<UIGChooserItem*>() << pItem);
+    /* Move focus to current-item: */
+    setFocusItem(currentItem());
 }
 
@@ -263 +288 @@
     }
 
-    /* Some item found? */
-    if (pItem)
-    {
-        /* This item should be in navigation list: */
-        AssertMsg(navigationList().contains(pItem),
-                  ("Passed item is NOT in navigation list!"));
-        /* Make this item current: */
-        setCurrentItem(pItem);
-    }
+    /* Make sure found item is in navigation list: */
+    if (!pItem || !navigationList().contains(pItem))
+        return;
+
+    /* Call for wrapper above: */
+    setCurrentItem(pItem);
 }
 
 void UIGChooserModel::unsetCurrentItem()
 {
-    /* Clear focus/selection: */
-    setFocusItem(0, true);
+    /* Call for wrapper above: */
+    setCurrentItem(0);
 }
 
 void UIGChooserModel::addToCurrentItems(UIGChooserItem *pItem)
 {
-    AssertMsg(pItem, ("Passed item is invalid!"));
-    m_currentItems << pItem;
-    pItem->update();
+    /* Call for wrapper above: */
+    setCurrentItems(QList<UIGChooserItem*>(m_currentItems) << pItem);
 }
 
 void UIGChooserModel::removeFromCurrentItems(UIGChooserItem *pItem)
 {
-    AssertMsg(pItem, ("Passed item is invalid!"));
-    m_currentItems.removeAll(pItem);
-    pItem->update();
+    /* Prepare filtered list: */
+    QList<UIGChooserItem*> list(m_currentItems);
+    list.removeAll(pItem);
+    /* Call for wrapper above: */
+    setCurrentItems(list);
 }
 
@@ -306 +329 @@
     /* Make sure selection item list is never empty
      * if at least one item (for example 'focus') present: */
-    if (currentItems().isEmpty() && focusItem())
-        addToCurrentItems(focusItem());
+    if (!currentItem() && focusItem())
+        setCurrentItem(focusItem());
     /* Notify listeners about selection change: */
     emit sigSelectionChanged();
@@ -350 +373 @@
 }
 
-void UIGChooserModel::setFocusItem(UIGChooserItem *pItem, bool fWithSelection /* = false */)
+void UIGChooserModel::setFocusItem(UIGChooserItem *pItem)
 {
     /* Make sure real focus unset: */
     clearRealFocus();
 
-    /* Something changed? */
-    if (m_pFocusItem != pItem || !pItem)
-    {
-        /* Remember previous focus item: */
-        QPointer<UIGChooserItem> pPreviousFocusItem = m_pFocusItem;
-        /* Set new focus item: */
-        m_pFocusItem = pItem;
-
-        /* Should we move selection too? */
-        if (fWithSelection)
-        {
-            /* Clear selection: */
-            clearSelectionList();
-            /* Add focus item into selection (if any): */
-            if (m_pFocusItem)
-                addToCurrentItems(m_pFocusItem);
-            /* Notify selection changed: */
-            notifyCurrentItemChanged();
-        }
-
-        /* Update previous focus item (if any): */
-        if (pPreviousFocusItem)
-        {
-            disconnect(pPreviousFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
-            pPreviousFocusItem->update();
-        }
-        /* Update new focus item (if any): */
-        if (m_pFocusItem)
-        {
-            connect(m_pFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
-            m_pFocusItem->update();
-        }
-
-        /* Notify focus changed: */
-        emit sigFocusChanged(m_pFocusItem);
-    }
+    /* Is there something changed? */
+    if (m_pFocusItem == pItem)
+        return;
+
+    /* Remember old focus-item: */
+    UIGChooserItem *pOldFocusItem = m_pFocusItem;
+
+    /* Set new focus-item: */
+    m_pFocusItem = pItem;
+
+    /* Disconnect old focus-item (if any): */
+    if (pOldFocusItem)
+        disconnect(pOldFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
+    /* Connect new focus item (if any): */
+    if (m_pFocusItem)
+        connect(m_pFocusItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltFocusItemDestroyed()));
+
+    /* Notify listeners about focus change: */
+    emit sigFocusChanged(m_pFocusItem);
 }
 
@@ -602 +608 @@
         updateNavigation();
         updateLayout();
-        /* Make sure focus-item present, if possible: */
-        if (!focusItem() && currentItem())
-            setFocusItem(currentItem());
         /* Make sure current-item present, if possible: */
         if (!currentItem() && !navigationList().isEmpty())
-            setCurrentItem(0);
+            setCurrentItem(navigationList().first());
+        /* Make sure focus-item present, if possible: */
+        else if (!focusItem() && currentItem())
+            setFocusItem(currentItem());
         /* Notify about current-item change: */
         notifyCurrentItemChanged();
@@ -672 +678 @@
     else
     {
-        if (root()->hasItems())
-            setCurrentItem(root()->items().first());
+        if (!navigationList().isEmpty())
+            setCurrentItem(navigationList().first());
         else
             unsetCurrentItem();
@@ -814 +820 @@
     updateNavigation();
     updateLayout();
-    setCurrentItem(0);
+    setCurrentItem(navigationList().first());
     saveGroupSettings();
 }
@@ -1204 +1210 @@
     setCurrentItem(vboxGlobal().virtualBox().GetExtraData(GUI_LastItemSelected));
     if (!currentItem() && !navigationList().isEmpty())
-        setCurrentItem(0);
+        setCurrentItem(navigationList().first());
 }
 
@@ -1580 +1586 @@
     updateLayout();
     if (!navigationList().isEmpty())
-        setCurrentItem(0);
+        setCurrentItem(navigationList().first());
     else
         unsetCurrentItem();

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

@@ -114 +114 @@
     UIGChooserItem* currentItem() const;
     const QList<UIGChooserItem*>& currentItems() const;
+    void setCurrentItems(const QList<UIGChooserItem*> &items);
     void setCurrentItem(UIGChooserItem *pItem);
-    void setCurrentItem(int iItemIndex);
     void setCurrentItem(const QString &strDefinition);
     void unsetCurrentItem();
@@ -127 +127 @@
     /* API: Focus-item stuff: */
     UIGChooserItem* focusItem() const;
-    void setFocusItem(UIGChooserItem *pItem, bool fWithSelection = false);
+    void setFocusItem(UIGChooserItem *pItem);
 
     /* API: Root-item stuff: */