Changeset 77933 in vbox for trunk

Timestamp:

Mar 28, 2019 12:30:56 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Rename current-item(s) to selected-item(s) and focus-item to current-item afterwards as this stuff was initially named wrong.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooser.cpp (modified) (1 diff)
• UIChooser.h (modified) (1 diff)
• UIChooserHandlerKeyboard.cpp (modified) (19 diffs)
• UIChooserHandlerMouse.cpp (modified) (7 diffs)
• UIChooserItem.cpp (modified) (1 diff)
• UIChooserItemGlobal.cpp (modified) (10 diffs)
• UIChooserItemGroup.cpp (modified) (6 diffs)
• UIChooserItemMachine.cpp (modified) (13 diffs)
• UIChooserModel.cpp (modified) (43 diffs)
• UIChooserModel.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -51 +51 @@
 UIVirtualMachineItem *UIChooser::currentItem() const
 {
-    return m_pChooserModel->currentMachineItem();
+    return m_pChooserModel->firstSelectedMachineItem();
 }
 
 QList<UIVirtualMachineItem*> UIChooser::currentItems() const
 {
-    return m_pChooserModel->currentMachineItems();
+    return m_pChooserModel->selectedMachineItems();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -89 +89 @@
     /** @} */
 
-    /** @name Current item stuff.
+    /** @name Current-item stuff.
       * @{ */
-        /** Returns current item. */
+        /** Returns current-item. */
         UIVirtualMachineItem *currentItem() const;
-        /** Returns a list of current items. */
+        /** Returns a list of current-items. */
         QList<UIVirtualMachineItem*> currentItems() const;
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp

@@ -87 +87 @@
 #endif /* !VBOX_WS_MAC */
             {
-                /* Determine focus item position: */
-                int iPosition = model()->navigationList().indexOf(model()->focusItem());
+                /* Determine current-item position: */
+                int iPosition = model()->navigationList().indexOf(model()->currentItem());
                 /* Determine 'previous' item: */
                 UIChooserItem *pPreviousItem = 0;
@@ -103 +103 @@
                     pPreviousItem->makeSureItsVisible();
                     /* Calculate positions: */
-                    UIChooserItem *pFirstItem = model()->currentItem();
+                    UIChooserItem *pFirstItem = model()->firstSelectedItem();
                     int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                     int iPreviousPosition = model()->navigationList().indexOf(pPreviousItem);
@@ -114 +114 @@
                         for (int i = iFirstPosition; i >= iPreviousPosition; --i)
                             items << model()->navigationList().at(i);
-                    /* Set that list as current: */
-                    model()->setCurrentItems(items);
-                    /* Move focus to 'previous' item: */
-                    model()->setFocusItem(pPreviousItem);
+                    /* Set that list as selected: */
+                    model()->setSelectedItems(items);
+                    /* Make 'previous' item current one: */
+                    model()->setCurrentItem(pPreviousItem);
                     /* Filter-out this event: */
                     return true;
@@ -130 +130 @@
 #endif /* !VBOX_WS_MAC */
             {
-                /* Determine focus item position: */
-                int iPosition = model()->navigationList().indexOf(model()->focusItem());
+                /* Determine current-item position: */
+                int iPosition = model()->navigationList().indexOf(model()->currentItem());
                 /* Determine 'previous' item: */
                 UIChooserItem *pPreviousItem = 0;
@@ -145 +145 @@
                     /* Make sure 'previous' item is visible: */
                     pPreviousItem->makeSureItsVisible();
-                    /* Make 'previous' item the current one: */
-                    model()->setCurrentItem(pPreviousItem);
+                    /* Make 'previous' item the only selected: */
+                    model()->setSelectedItem(pPreviousItem);
                     /* Filter-out this event: */
                     return true;
@@ -180 +180 @@
 #endif /* !VBOX_WS_MAC */
             {
-                /* Determine focus item position: */
-                int iPosition = model()->navigationList().indexOf(model()->focusItem());
+                /* Determine current-item position: */
+                int iPosition = model()->navigationList().indexOf(model()->currentItem());
                 /* Determine 'next' item: */
                 UIChooserItem *pNextItem = 0;
@@ -196 +196 @@
                     pNextItem->makeSureItsVisible();
                     /* Calculate positions: */
-                    UIChooserItem *pFirstItem = model()->currentItem();
+                    UIChooserItem *pFirstItem = model()->firstSelectedItem();
                     int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                     int iNextPosition = model()->navigationList().indexOf(pNextItem);
@@ -207 +207 @@
                         for (int i = iFirstPosition; i >= iNextPosition; --i)
                             items << model()->navigationList().at(i);
-                    /* Set that list as current: */
-                    model()->setCurrentItems(items);
-                    /* Move focus to 'next' item: */
-                    model()->setFocusItem(pNextItem);
+                    /* Set that list as selected: */
+                    model()->setSelectedItems(items);
+                    /* Make 'next' item current one: */
+                    model()->setCurrentItem(pNextItem);
                     /* Filter-out this event: */
                     return true;
@@ -223 +223 @@
 #endif /* !VBOX_WS_MAC */
             {
-                /* Determine focus item position: */
-                int iPosition = model()->navigationList().indexOf(model()->focusItem());
+                /* Determine current-item position: */
+                int iPosition = model()->navigationList().indexOf(model()->currentItem());
                 /* Determine 'next' item: */
                 UIChooserItem *pNextItem = 0;
@@ -238 +238 @@
                     /* Make sure 'next' item is visible: */
                     pNextItem->makeSureItsVisible();
-                    /* Make 'next' item the current one: */
-                    model()->setCurrentItem(pNextItem);
+                    /* Make 'next' item the only selected one: */
+                    model()->setSelectedItem(pNextItem);
                     /* Filter-out this event: */
                     return true;
@@ -251 +251 @@
         {
             /* If this item is of group type: */
-            if (model()->focusItem()->type() == UIChooserItemType_Group)
-            {
-                /* Start embedded editing focus item: */
+            if (model()->currentItem()->type() == UIChooserItemType_Group)
+            {
+                /* Start embedded editing of current-item: */
                 model()->startEditingGroupItemName();
                 /* Filter that event out: */
@@ -265 +265 @@
         {
             /* If this item is of group or machine type: */
-            if (   model()->focusItem()->type() == UIChooserItemType_Group
-                || model()->focusItem()->type() == UIChooserItemType_Machine)
+            if (   model()->currentItem()->type() == UIChooserItemType_Group
+                || model()->currentItem()->type() == UIChooserItemType_Machine)
             {
                 /* Activate item: */
@@ -278 +278 @@
         case Qt::Key_Space:
         {
-            /* If there is a focus item: */
-            if (UIChooserItem *pFocusItem = model()->focusItem())
+            /* If there is a current-item: */
+            if (UIChooserItem *pCurrentItem = model()->currentItem())
             {
                 /* Of the group type: */
-                if (pFocusItem->type() == UIChooserItemType_Group)
+                if (pCurrentItem->type() == UIChooserItemType_Group)
                 {
                     /* Toggle that group: */
-                    UIChooserItemGroup *pGroupItem = pFocusItem->toGroupItem();
+                    UIChooserItemGroup *pGroupItem = pCurrentItem->toGroupItem();
                     if (pGroupItem->isClosed())
                         pGroupItem->open();
@@ -324 +324 @@
 void UIChooserHandlerKeyboard::shift(UIItemShiftDirection enmDirection, UIItemShiftType enmShiftType) const
 {
-    /* Get focus-node and its parent: */
-    UIChooserNode *pFocusNode = model()->focusItem()->node();
-    UIChooserNode *pParentNode = pFocusNode->parentNode();
-    /* Get focus-node position: */
-    const int iFocusNodePosition = pFocusNode->position();
+    /* Get current-node and its parent: */
+    UIChooserNode *pCurrentNode = model()->currentItem()->node();
+    UIChooserNode *pParentNode = pCurrentNode->parentNode();
+    /* Get current-node position: */
+    const int iCurrentNodePosition = pCurrentNode->position();
 
     /* Calculate new position: */
-    int iNewFocusNodePosition = -1;
+    int iNewCurrentNodePosition = -1;
     switch (enmDirection)
     {
         case UIItemShiftDirection_Up:
         {
-            if (iFocusNodePosition > 0)
+            if (iCurrentNodePosition > 0)
                 switch (enmShiftType)
                 {
-                    case UIItemShiftSize_Item: iNewFocusNodePosition = iFocusNodePosition - 1; break;
-                    case UIItemShiftSize_Full: iNewFocusNodePosition = 0; break;
+                    case UIItemShiftSize_Item: iNewCurrentNodePosition = iCurrentNodePosition - 1; break;
+                    case UIItemShiftSize_Full: iNewCurrentNodePosition = 0; break;
                     default: break;
                 }
@@ -347 +347 @@
         case UIItemShiftDirection_Down:
         {
-            if (iFocusNodePosition < pParentNode->nodes(pFocusNode->type()).size() - 1)
+            if (iCurrentNodePosition < pParentNode->nodes(pCurrentNode->type()).size() - 1)
                 switch (enmShiftType)
                 {
-                    case UIItemShiftSize_Item: iNewFocusNodePosition = iFocusNodePosition + 2; break;
-                    case UIItemShiftSize_Full: iNewFocusNodePosition = pParentNode->nodes(pFocusNode->type()).size();  break;
+                    case UIItemShiftSize_Item: iNewCurrentNodePosition = iCurrentNodePosition + 2; break;
+                    case UIItemShiftSize_Full: iNewCurrentNodePosition = pParentNode->nodes(pCurrentNode->type()).size();  break;
                     default: break;
                 }
@@ -360 +360 @@
     }
     /* Filter out invalid requests: */
-    if (iNewFocusNodePosition == -1)
+    if (iNewCurrentNodePosition == -1)
         return;
 
     /* Create shifted node/item: */
     UIChooserItem *pShiftedItem = 0;
-    switch (pFocusNode->type())
+    switch (pCurrentNode->type())
     {
         case UIChooserItemType_Group:
         {
-            UIChooserNodeGroup *pNewNode = new UIChooserNodeGroup(pParentNode, pFocusNode->toGroupNode(), iNewFocusNodePosition);
+            UIChooserNodeGroup *pNewNode = new UIChooserNodeGroup(pParentNode, pCurrentNode->toGroupNode(), iNewCurrentNodePosition);
             pShiftedItem = new UIChooserItemGroup(pParentNode->item(), pNewNode);
             break;
@@ -375 +375 @@
         case UIChooserItemType_Machine:
         {
-            UIChooserNodeMachine *pNewNode = new UIChooserNodeMachine(pParentNode, pFocusNode->toMachineNode(), iNewFocusNodePosition);
+            UIChooserNodeMachine *pNewNode = new UIChooserNodeMachine(pParentNode, pCurrentNode->toMachineNode(), iNewCurrentNodePosition);
             pShiftedItem = new UIChooserItemMachine(pParentNode->item(), pNewNode);
             break;
@@ -384 +384 @@
 
     /* Delete old node/item: */
-    delete pFocusNode;
+    delete pCurrentNode;
 
     /* Update model: */
@@ -390 +390 @@
     model()->updateNavigation();
     model()->updateLayout();
-    model()->setCurrentItem(pShiftedItem);
+    model()->setSelectedItem(pShiftedItem);
     model()->saveGroupSettings();
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp

@@ -73 +73 @@
                     const QPoint itemCursorPos = pGlobalItem->mapFromScene(scenePos).toPoint();
                     if (   pGlobalItem->isToolButtonArea(itemCursorPos)
-                        && (   model()->currentItem() == pGlobalItem
+                        && (   model()->firstSelectedItem() == pGlobalItem
                             || pGlobalItem->isHovered()))
                     {
                         model()->handleToolButtonClick(pGlobalItem);
-                        if (model()->currentItem() != pGlobalItem)
+                        if (model()->firstSelectedItem() != pGlobalItem)
                             pClickedItem = pGlobalItem;
                     }
                     else
                     if (   pGlobalItem->isPinButtonArea(itemCursorPos)
-                        && (   model()->currentItem() == pGlobalItem
+                        && (   model()->firstSelectedItem() == pGlobalItem
                             || pGlobalItem->isHovered()))
                         model()->handlePinButtonClick(pGlobalItem);
@@ -93 +93 @@
                     const QPoint itemCursorPos = pMachineItem->mapFromScene(scenePos).toPoint();
                     if (   pMachineItem->isToolButtonArea(itemCursorPos)
-                        && (   model()->currentItem() == pMachineItem
+                        && (   model()->firstSelectedItem() == pMachineItem
                             || pMachineItem->isHovered()))
                     {
                         model()->handleToolButtonClick(pMachineItem);
-                        if (model()->currentItem() != pMachineItem)
+                        if (model()->firstSelectedItem() != pMachineItem)
                             pClickedItem = pMachineItem;
                     }
@@ -110 +110 @@
                     {
                         /* Calculate positions: */
-                        UIChooserItem *pFirstItem = model()->currentItem();
+                        UIChooserItem *pFirstItem = model()->firstSelectedItem();
                         int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                         int iClickedPosition = model()->navigationList().indexOf(pClickedItem);
@@ -121 +121 @@
                             for (int i = iFirstPosition; i >= iClickedPosition; --i)
                                 items << model()->navigationList().at(i);
-                        /* Set that list as current: */
-                        model()->setCurrentItems(items);
-                        /* Move focus to clicked item: */
-                        model()->setFocusItem(pClickedItem);
+                        /* Make that list selected: */
+                        model()->setSelectedItems(items);
+                        /* Make clicked item current one: */
+                        model()->setCurrentItem(pClickedItem);
                     }
                     /* Was 'control' modifier pressed? */
@@ -130 +130 @@
                     {
                         /* Invert selection state for clicked item: */
-                        if (model()->currentItems().contains(pClickedItem))
-                            model()->removeFromCurrentItems(pClickedItem);
+                        if (model()->selectedItems().contains(pClickedItem))
+                            model()->removeFromSelectedItems(pClickedItem);
                         else
-                            model()->addToCurrentItems(pClickedItem);
-                        /* Move focus to clicked item: */
-                        model()->setFocusItem(pClickedItem);
+                            model()->addToSelectedItems(pClickedItem);
+                        /* Make clicked item current one: */
+                        model()->setCurrentItem(pClickedItem);
                         model()->makeSureSomeItemIsSelected();
                     }
@@ -141 +141 @@
                     else if (pEvent->modifiers() == Qt::NoModifier)
                     {
-                        /* Make clicked item the current one: */
-                        model()->setCurrentItem(pClickedItem);
+                        /* Make clicked item the only selected one: */
+                        model()->setSelectedItem(pClickedItem);
                     }
                 }
@@ -165 +165 @@
                 {
                     /* Select clicked item if not selected yet: */
-                    if (!model()->currentItems().contains(pClickedItem))
-                        model()->setCurrentItem(pClickedItem);
+                    if (!model()->selectedItems().contains(pClickedItem))
+                        model()->setSelectedItem(pClickedItem);
                 }
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp

@@ -186 +186 @@
         state.selectable = true;
 
-        /* Compose the state of current item: */
-        if (item() && item() == item()->model()->currentItem())
+        /* Compose the state of first selected-item: */
+        if (item() && item() == item()->model()->firstSelectedItem())
         {
             state.active = true;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -367 +367 @@
 void UIChooserItemGlobal::cleanup()
 {
-    /* If that item is focused: */
-    if (model()->focusItem() == this)
-    {
-        /* Unset the focus: */
-        model()->setFocusItem(0);
+    /* If that item is current: */
+    if (model()->currentItem() == this)
+    {
+        /* Unset current-item: */
+        model()->setCurrentItem(0);
     }
     /* If that item is in selection list: */
-    if (model()->currentItems().contains(this))
+    if (model()->selectedItems().contains(this))
     {
         /* Remove item from the selection list: */
-        model()->removeFromCurrentItems(this);
+        model()->removeFromSelectedItems(this);
     }
     /* If that item is in navigation list: */
@@ -556 +556 @@
     const QPalette pal = palette();
 
-    /* Selection background: */
-    if (model()->currentItems().contains(unconst(this)))
+    /* Selected-item background: */
+    if (model()->selectedItems().contains(unconst(this)))
     {
         /* Prepare color: */
@@ -578 +578 @@
 #endif
             animationColor2.setAlpha(0);
-            /* Draw hovering animated gradient: */
+            /* Draw hovered-item animated gradient: */
             QRect animatedRect = rectangle;
             animatedRect.setWidth(animatedRect.height());
@@ -593 +593 @@
         }
     }
-    /* Hovering background: */
+    /* Hovered-item background: */
     else if (isHovered())
     {
@@ -613 +613 @@
 #endif
         animationColor2.setAlpha(0);
-        /* Draw hovering animated gradient: */
+        /* Draw hovered-item animated gradient: */
         QRect animatedRect = rectangle;
         animatedRect.setWidth(animatedRect.height());
@@ -652 +652 @@
 void UIChooserItemGlobal::paintFrame(QPainter *pPainter, const QRect &rectangle) const
 {
-    /* Only chosen and/or hovered item should have a frame: */
-    if (!model()->currentItems().contains(unconst(this)) && !isHovered())
+    /* Only selected and/or hovered item should have a frame: */
+    if (!model()->selectedItems().contains(unconst(this)) && !isHovered())
         return;
 
@@ -663 +663 @@
     QColor strokeColor;
 
-    /* Selection frame: */
-    if (model()->currentItems().contains(unconst(this)))
+    /* Selected-item frame: */
+    if (model()->selectedItems().contains(unconst(this)))
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
-    /* Hovering frame: */
+    /* Hovered-item frame: */
     else if (isHovered())
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
@@ -697 +697 @@
     const int iButtonMargin = data(GlobalItemData_ButtonMargin).toInt();
 
-    /* Selected item foreground: */
-    if (model()->currentItems().contains(unconst(this)))
+    /* Selected-item foreground: */
+    if (model()->selectedItems().contains(unconst(this)))
     {
         const QPalette pal = palette();
@@ -765 +765 @@
 
     /* Paint right column: */
-    if (   model()->currentItem() == this
+    if (   model()->firstSelectedItem() == this
         || isHovered())
     {
@@ -800 +800 @@
 
     /* Paint right column: */
-    if (   model()->currentItem() == this
+    if (   model()->firstSelectedItem() == this
         || isHovered())
     {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -836 +836 @@
                 pModel->updateNavigation();
                 pModel->updateLayout();
-                pModel->setCurrentItem(pNewGroupItem);
+                pModel->setSelectedItem(pNewGroupItem);
                 pModel->saveGroupSettings();
                 break;
@@ -890 +890 @@
                 pModel->updateNavigation();
                 pModel->updateLayout();
-                pModel->setCurrentItem(pNewMachineItem);
+                pModel->setSelectedItem(pNewMachineItem);
                 pModel->saveGroupSettings();
                 break;
@@ -1204 +1204 @@
     while (!m_machineItems.isEmpty()) { delete m_machineItems.last(); }
 
-    /* If that item is focused: */
-    if (model()->focusItem() == this)
-    {
-        /* Unset the focus: */
-        model()->setFocusItem(0);
+    /* If that item is current: */
+    if (model()->currentItem() == this)
+    {
+        /* Unset current-item: */
+        model()->setCurrentItem(0);
     }
     /* If that item is in selection list: */
-    if (model()->currentItems().contains(this))
+    if (model()->selectedItems().contains(this))
     {
         /* Remove item from the selection list: */
-        model()->removeFromCurrentItems(this);
+        model()->removeFromSelectedItems(this);
     }
     /* If that item is in navigation list: */
@@ -1609 +1609 @@
     const QPalette pal = palette();
     const QColor headerColor = pal.color(QPalette::Active,
-                                         model()->currentItems().contains(this) ?
+                                         model()->selectedItems().contains(this) ?
                                          QPalette::Highlight : QPalette::Midlight);
 
@@ -1706 +1706 @@
     const QPalette pal = palette();
     const QColor strokeColor = pal.color(QPalette::Active,
-                                         model()->currentItems().contains(this) ?
+                                         model()->selectedItems().contains(this) ?
                                          QPalette::Highlight : QPalette::Midlight).darker(headerDarkness() + 10);
 
@@ -1745 +1745 @@
     /* Configure painter color: */
     pPainter->setPen(palette().color(QPalette::Active,
-                                     model()->currentItems().contains(this) ?
+                                     model()->selectedItems().contains(this) ?
                                      QPalette::HighlightedText : QPalette::ButtonText));
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -415 +415 @@
                 UIChooserNode *pNode = pCastedMime->item()->node();
 
-                /* Group passed item with current item into the new group: */
+                /* Group passed item with current-item into the new group: */
                 UIChooserNodeGroup *pNewGroupNode = new UIChooserNodeGroup(parentItem()->node(),
                                                                            false /* favorite */,
@@ -444 +444 @@
                 pModel->updateNavigation();
                 pModel->updateLayout();
-                pModel->setCurrentItem(pNewGroupItem);
+                pModel->setSelectedItem(pNewGroupItem);
                 pModel->saveGroupSettings();
                 break;
@@ -531 +531 @@
 void UIChooserItemMachine::cleanup()
 {
-    /* If that item is focused: */
-    if (model()->focusItem() == this)
-    {
-        /* Unset the focus: */
-        model()->setFocusItem(0);
+    /* If that item is current: */
+    if (model()->currentItem() == this)
+    {
+        /* Unset current-item: */
+        model()->setCurrentItem(0);
     }
     /* If that item is in selection list: */
-    if (model()->currentItems().contains(this))
+    if (model()->selectedItems().contains(this))
     {
         /* Remove item from the selection list: */
-        model()->removeFromCurrentItems(this);
+        model()->removeFromSelectedItems(this);
     }
     /* If that item is in navigation list: */
@@ -667 +667 @@
     iFirstRowMaximumWidth -= m_pixmapSize.width(); /* left pixmap width */
     iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between left pixmap and name(s) */
-    if (   model()->currentItem() == this
+    if (   model()->firstSelectedItem() == this
         || isHovered())
     {
@@ -834 +834 @@
     const QPalette pal = palette();
 
-    /* Selection background: */
-    if (model()->currentItems().contains(unconst(this)))
+    /* Selected-item background: */
+    if (model()->selectedItems().contains(unconst(this)))
     {
         /* Prepare color: */
@@ -856 +856 @@
 #endif
             animationColor2.setAlpha(0);
-            /* Draw hovering animated gradient: */
+            /* Draw hovered-item animated gradient: */
             QRect animatedRect = rectangle;
             animatedRect.setWidth(animatedRect.height());
@@ -871 +871 @@
         }
     }
-    /* Hovering background: */
+    /* Hovered-item background: */
     else if (isHovered())
     {
@@ -891 +891 @@
 #endif
         animationColor2.setAlpha(0);
-        /* Draw hovering animated gradient: */
+        /* Draw hovered-item animated gradient: */
         QRect animatedRect = rectangle;
         animatedRect.setWidth(animatedRect.height());
@@ -928 +928 @@
         if (dragTokenPlace() == UIChooserItemDragToken_Up)
         {
-            /* Selection background: */
-            if (model()->currentItems().contains(unconst(this)))
+            /* Selected-item background: */
+            if (model()->selectedItems().contains(unconst(this)))
             {
                 QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
@@ -949 +949 @@
         else if (dragTokenPlace() == UIChooserItemDragToken_Down)
         {
-            /* Selection background: */
-            if (model()->currentItems().contains(unconst(this)))
+            /* Selected-item background: */
+            if (model()->selectedItems().contains(unconst(this)))
             {
                 QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
@@ -986 +986 @@
     QColor strokeColor;
 
-    /* Selection frame: */
-    if (model()->currentItems().contains(unconst(this)))
+    /* Selected-item frame: */
+    if (model()->selectedItems().contains(unconst(this)))
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
-    /* Hovering frame: */
+    /* Hovered-item frame: */
     else if (isHovered())
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
@@ -1025 +1025 @@
 
     /* Selected or hovered item foreground: */
-    if (model()->currentItems().contains(unconst(this)) || isHovered())
+    if (model()->selectedItems().contains(unconst(this)) || isHovered())
     {
         /* Prepare color: */
@@ -1163 +1163 @@
 
     /* Paint right column: */
-    if (   model()->currentItem() == this
+    if (   model()->firstSelectedItem() == this
         || isHovered())
     {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -85 +85 @@
     updateLayout();
 
-    /* Load last selected item: */
+    /* Load last selected-item: */
     loadLastSelectedItem();
 }
@@ -91 +91 @@
 void UIChooserModel::deinit()
 {
-    /* Save last selected item: */
+    /* Save last selected-item: */
     saveLastSelectedItem();
 
-    /* Unset current items: */
-    unsetCurrentItems();
+    /* Clear list of selected-items: */
+    clearSelectedItems();
 
     /* Call to base-class: */
@@ -158 +158 @@
 }
 
-void UIChooserModel::setCurrentItems(const QList<UIChooserItem*> &items)
+void UIChooserModel::setSelectedItems(const QList<UIChooserItem*> &items)
 {
     /* Is there something changed? */
-    if (m_currentItems == items)
-        return;
-
-    /* Remember old current-item list: */
-    const QList<UIChooserItem*> oldCurrentItems = m_currentItems;
-
-    /* Clear current current-item list: */
-    m_currentItems.clear();
+    if (m_selectedItems == items)
+        return;
+
+    /* Remember old selected-item list: */
+    const QList<UIChooserItem*> oldCurrentItems = m_selectedItems;
+
+    /* Clear current selected-item list: */
+    m_selectedItems.clear();
 
     /* Iterate over all the passed items: */
     foreach (UIChooserItem *pItem, items)
     {
-        /* Add item to current list if navigation list contains it: */
+        /* Add item to current selected-item list if navigation list contains it: */
         if (pItem && navigationList().contains(pItem))
-            m_currentItems << pItem;
+            m_selectedItems << pItem;
         else
             AssertMsgFailed(("Passed item is not in navigation list!"));
@@ -181 +181 @@
 
     /* Is there something really changed? */
-    if (oldCurrentItems == m_currentItems)
+    if (oldCurrentItems == m_selectedItems)
         return;
 
@@ -188 +188 @@
         pItem->update();
     /* Update all the new items (they are selected now): */
-    foreach (UIChooserItem *pItem, m_currentItems)
+    foreach (UIChooserItem *pItem, m_selectedItems)
         pItem->update();
 
@@ -195 +195 @@
 }
 
-void UIChooserModel::setCurrentItem(UIChooserItem *pItem)
+void UIChooserModel::setSelectedItem(UIChooserItem *pItem)
 {
     /* Call for wrapper above: */
@@ -201 +201 @@
     if (pItem)
         items << pItem;
-    setCurrentItems(items);
-
-    /* Move focus to current-item: */
-    setFocusItem(currentItem());
-}
-
-void UIChooserModel::setCurrentItem(const QString &strDefinition)
+    setSelectedItems(items);
+
+    /* Make selected-item current one as well: */
+    setCurrentItem(firstSelectedItem());
+}
+
+void UIChooserModel::setSelectedItem(const QString &strDefinition)
 {
     /* Ignore if empty definition passed: */
@@ -244 +244 @@
 
     /* Call for wrapper above: */
-    setCurrentItem(pItem);
-}
-
-void UIChooserModel::unsetCurrentItems()
+    setSelectedItem(pItem);
+}
+
+void UIChooserModel::clearSelectedItems()
 {
     /* Call for wrapper above: */
-    setCurrentItem(0);
-}
-
-void UIChooserModel::addToCurrentItems(UIChooserItem *pItem)
+    setSelectedItem(0);
+}
+
+void UIChooserModel::addToSelectedItems(UIChooserItem *pItem)
 {
     /* Call for wrapper above: */
-    setCurrentItems(QList<UIChooserItem*>(m_currentItems) << pItem);
-}
-
-void UIChooserModel::removeFromCurrentItems(UIChooserItem *pItem)
+    setSelectedItems(QList<UIChooserItem*>(m_selectedItems) << pItem);
+}
+
+void UIChooserModel::removeFromSelectedItems(UIChooserItem *pItem)
 {
     /* Prepare filtered list: */
-    QList<UIChooserItem*> list(m_currentItems);
+    QList<UIChooserItem*> list(m_selectedItems);
     list.removeAll(pItem);
     /* Call for wrapper above: */
-    setCurrentItems(list);
-}
-
-UIChooserItem *UIChooserModel::currentItem() const
-{
-    /* Return first of current items, if any: */
-    return currentItems().isEmpty() ? 0 : currentItems().first();
-}
-
-const QList<UIChooserItem*> &UIChooserModel::currentItems() const
-{
-    return m_currentItems;
-}
-
-UIVirtualMachineItem *UIChooserModel::currentMachineItem() const
-{
-    /* Return first machine-item of the current-item: */
-    return   currentItem() && currentItem()->firstMachineItem() && currentItem()->firstMachineItem()->node()
-           ? currentItem()->firstMachineItem()->node()->toMachineNode()
+    setSelectedItems(list);
+}
+
+UIChooserItem *UIChooserModel::firstSelectedItem() const
+{
+    /* Return first of selected-items, if any: */
+    return selectedItems().isEmpty() ? 0 : selectedItems().first();
+}
+
+const QList<UIChooserItem*> &UIChooserModel::selectedItems() const
+{
+    return m_selectedItems;
+}
+
+UIVirtualMachineItem *UIChooserModel::firstSelectedMachineItem() const
+{
+    /* Return first machine-item of the selected-item: */
+    return   firstSelectedItem() && firstSelectedItem()->firstMachineItem() && firstSelectedItem()->firstMachineItem()->node()
+           ? firstSelectedItem()->firstMachineItem()->node()->toMachineNode()
            : 0;
 }
 
-QList<UIVirtualMachineItem*> UIChooserModel::currentMachineItems() const
-{
-    /* Gather list of current unique machine-items: */
+QList<UIVirtualMachineItem*> UIChooserModel::selectedMachineItems() const
+{
+    /* Gather list of selected unique machine-items: */
     QList<UIChooserItemMachine*> currentMachineItemList;
-    UIChooserItemMachine::enumerateMachineItems(currentItems(), currentMachineItemList,
+    UIChooserItemMachine::enumerateMachineItems(selectedItems(), currentMachineItemList,
                                                 UIChooserItemMachineEnumerationFlag_Unique);
 
@@ -303 +303 @@
 bool UIChooserModel::isGroupItemSelected() const
 {
-    return currentItem() && currentItem()->type() == UIChooserItemType_Group;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Group;
 }
 
 bool UIChooserModel::isGlobalItemSelected() const
 {
-    return currentItem() && currentItem()->type() == UIChooserItemType_Global;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Global;
 }
 
 bool UIChooserModel::isMachineItemSelected() const
 {
-    return currentItem() && currentItem()->type() == UIChooserItemType_Machine;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Machine;
 }
 
 bool UIChooserModel::isSingleGroupSelected() const
 {
-    return    currentItems().size() == 1
-           && currentItem()->type() == UIChooserItemType_Group;
+    return    selectedItems().size() == 1
+           && firstSelectedItem()->type() == UIChooserItemType_Group;
 }
 
@@ -325 +325 @@
 {
     /* Make sure at least one item selected: */
-    if (currentItems().isEmpty())
+    if (selectedItems().isEmpty())
         return false;
 
     /* Determine the parent group of the first item: */
-    UIChooserItem *pFirstParent = currentItem()->parentItem();
+    UIChooserItem *pFirstParent = firstSelectedItem()->parentItem();
 
     /* Make sure this parent is not main root-item: */
@@ -335 +335 @@
         return false;
 
-    /* Enumerate current-item set: */
+    /* Enumerate selected-item set: */
     QSet<UIChooserItem*> currentItemSet;
-    foreach (UIChooserItem *pCurrentItem, currentItems())
+    foreach (UIChooserItem *pCurrentItem, selectedItems())
         currentItemSet << pCurrentItem;
 
@@ -351 +351 @@
 UIChooserItem *UIChooserModel::findClosestUnselectedItem() const
 {
-    /* Take the focus item (if any) as a starting point
-     * and find the closest non-selected item. */
-    UIChooserItem *pItem = focusItem();
+    /* Take the current-item (if any) as a starting point
+     * and find the closest non-selected-item. */
+    UIChooserItem *pItem = currentItem();
     if (!pItem)
-        pItem = currentItem();
+        pItem = firstSelectedItem();
     if (pItem)
     {
@@ -365 +365 @@
             {
                 pItem = navigationList().at(idxBefore);
-                if (!currentItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
+                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
                     return pItem;
                 --idxBefore;
@@ -372 +372 @@
             {
                 pItem = navigationList().at(idxAfter);
-                if (!currentItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
+                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
                     return pItem;
                 ++idxAfter;
@@ -384 +384 @@
 {
     /* Make sure selection list is never empty if at
-     * least one item (for example 'focus') present: */
-    if (!currentItem() && focusItem())
-        setCurrentItem(focusItem());
-}
-
-void UIChooserModel::setFocusItem(UIChooserItem *pItem)
+     * least one item (for example 'current') present: */
+    if (!firstSelectedItem() && currentItem())
+        setSelectedItem(currentItem());
+}
+
+void UIChooserModel::setCurrentItem(UIChooserItem *pItem)
 {
     /* Make sure real focus unset: */
@@ -395 +395 @@
 
     /* Is there something changed? */
-    if (m_pFocusItem == pItem)
-        return;
-
-    /* Remember old focus-item: */
-    UIChooserItem *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()));
+    if (m_pCurrentItem == pItem)
+        return;
+
+    /* Remember old current-item: */
+    UIChooserItem *pOldCurrentItem = m_pCurrentItem;
+
+    /* Set new current-item: */
+    m_pCurrentItem = pItem;
+
+    /* Disconnect old current-item (if any): */
+    if (pOldCurrentItem)
+        disconnect(pOldCurrentItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltCurrentItemDestroyed()));
+    /* Connect new current-item (if any): */
+    if (m_pCurrentItem)
+        connect(m_pCurrentItem, SIGNAL(destroyed(QObject*)), this, SLOT(sltCurrentItemDestroyed()));
 
     /* If dialog is visible and item exists => make it visible as well: */
@@ -417 +417 @@
 }
 
-UIChooserItem *UIChooserModel::focusItem() const
-{
-    return m_pFocusItem;
+UIChooserItem *UIChooserModel::currentItem() const
+{
+    return m_pCurrentItem;
 }
 
@@ -523 +523 @@
         {
             pItem->makeSureItsVisible();
-            setCurrentItem(pItem);
+            setSelectedItem(pItem);
         }
     }
@@ -668 +668 @@
         updateLayout();
 
+        /* Make sure selected-item present, if possible: */
+        if (!firstSelectedItem() && !navigationList().isEmpty())
+            setSelectedItem(navigationList().first());
         /* Make sure current-item present, if possible: */
-        if (!currentItem() && !navigationList().isEmpty())
-            setCurrentItem(navigationList().first());
-        /* Make sure focus-item present, if possible: */
-        else if (!focusItem() && currentItem())
-            setFocusItem(currentItem());
-        /* Notify about current-item change: */
+        else if (!currentItem() && firstSelectedItem())
+            setCurrentItem(firstSelectedItem());
+        /* Notify about selected-item change: */
         emit sigSelectionChanged();
     }
@@ -688 +688 @@
             updateLayout();
 
-            /* Choose newly added item: */
+            /* Select newly added item: */
             CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
-            setCurrentItem(root()->searchForItem(comMachine.GetName(),
+            setSelectedItem(root()->searchForItem(comMachine.GetName(),
                                                  UIChooserItemSearchFlag_Machine |
                                                  UIChooserItemSearchFlag_ExactName));
@@ -710 +710 @@
         updateLayout();
 
-        /* Choose newly added item: */
+        /* Select newly added item: */
         CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
-        setCurrentItem(root()->searchForItem(comMachine.GetName(),
+        setSelectedItem(root()->searchForItem(comMachine.GetName(),
                                              UIChooserItemSearchFlag_Machine |
                                              UIChooserItemSearchFlag_ExactName));
@@ -719 +719 @@
     {
         /* Make sure at least one item selected after that: */
-        if (!currentItem() && !navigationList().isEmpty())
-            setCurrentItem(navigationList().first());
+        if (!firstSelectedItem() && !navigationList().isEmpty())
+            setSelectedItem(navigationList().first());
     }
 
@@ -727 +727 @@
 }
 
-void UIChooserModel::sltFocusItemDestroyed()
-{
-    AssertMsgFailed(("Focus item destroyed!"));
+void UIChooserModel::sltCurrentItemDestroyed()
+{
+    AssertMsgFailed(("Current-item destroyed!"));
 }
 
@@ -742 +742 @@
 
     /* Start editing group name: */
-    currentItem()->startEditing();
+    firstSelectedItem()->startEditing();
 }
 
@@ -755 +755 @@
 
     /* Sort nodes: */
-    currentItem()->node()->sortNodes();
+    firstSelectedItem()->node()->sortNodes();
 
     /* Rebuild tree for main root: */
@@ -769 +769 @@
         return;
 
-    /* Make sure focus item is of group type! */
-    AssertMsg(focusItem()->type() == UIChooserItemType_Group, ("This is not group-item!"));
+    /* Make sure current-item is of group type! */
+    AssertMsg(currentItem()->type() == UIChooserItemType_Group, ("This is not group-item!"));
 
     /* Check if we have collisions with our siblings: */
-    UIChooserItem *pFocusItem = focusItem();
-    UIChooserNode *pFocusNode = pFocusItem->node();
-    UIChooserItem *pParentItem = pFocusItem->parentItem();
+    UIChooserItem *pCurrentItem = currentItem();
+    UIChooserNode *pCurrentNode = pCurrentItem->node();
+    UIChooserItem *pParentItem = pCurrentItem->parentItem();
     UIChooserNode *pParentNode = pParentItem->node();
     QList<UIChooserNode*> siblings = pParentNode->nodes();
     QList<UIChooserNode*> toBeRenamed;
     QList<UIChooserNode*> toBeRemoved;
-    foreach (UIChooserNode *pNode, pFocusNode->nodes())
+    foreach (UIChooserNode *pNode, pCurrentNode->nodes())
     {
         QString strItemName = pNode->name();
         UIChooserNode *pCollisionSibling = 0;
         foreach (UIChooserNode *pSibling, siblings)
-            if (pSibling != pFocusNode && pSibling->name() == strItemName)
+            if (pSibling != pCurrentNode && pSibling->name() == strItemName)
                 pCollisionSibling = pSibling;
         if (pCollisionSibling)
@@ -811 +811 @@
     /* Copy all the children into our parent: */
     QList<UIChooserItem*> copiedItems;
-    foreach (UIChooserNode *pNode, pFocusNode->nodes())
+    foreach (UIChooserNode *pNode, pCurrentNode->nodes())
     {
         if (toBeRemoved.contains(pNode))
@@ -842 +842 @@
     }
 
-    /* Delete focus group: */
-    delete pFocusNode;
+    /* Delete current group: */
+    delete pCurrentNode;
 
     /* Notify about selection invalidated: */
@@ -853 +853 @@
     if (!copiedItems.isEmpty())
     {
-        setCurrentItems(copiedItems);
-        setFocusItem(currentItem());
+        setSelectedItems(copiedItems);
+        setCurrentItem(firstSelectedItem());
     }
     else
-        setCurrentItem(navigationList().first());
+        setSelectedItem(navigationList().first());
     saveGroupSettings();
 }
@@ -867 +867 @@
         return;
 
-    /* Choose the parent: */
+    /* Select the parent: */
     UIChooserItem *pGroup = 0;
     if (isSingleGroupSelected())
-        pGroup = currentItem();
-    else if (!currentItems().isEmpty())
-        pGroup = currentItem()->parentItem();
+        pGroup = firstSelectedItem();
+    else if (!selectedItems().isEmpty())
+        pGroup = firstSelectedItem()->parentItem();
     QString strGroupName;
     if (pGroup)
@@ -913 +913 @@
     UIChooserItemGroup *pNewGroupItem = new UIChooserItemGroup(root(), pNewGroupNode);
 
-    /* Enumerate all the currently chosen items: */
+    /* Enumerate all the currently selected-items: */
     QStringList busyGroupNames;
     QStringList busyMachineNames;
-    QList<UIChooserItem*> selectedItems = currentItems();
-    foreach (UIChooserItem *pItem, selectedItems)
+    foreach (UIChooserItem *pItem, selectedItems())
     {
         /* For each of known types: */
@@ -959 +958 @@
     updateNavigation();
     updateLayout();
-    setCurrentItem(pNewGroupItem);
+    setSelectedItem(pNewGroupItem);
     saveGroupSettings();
 }
@@ -970 +969 @@
 
     /* Only if some item selected: */
-    if (!currentItem())
+    if (!firstSelectedItem())
         return;
 
     /* Sort nodes: */
-    currentItem()->parentItem()->node()->sortNodes();
+    firstSelectedItem()->parentItem()->node()->sortNodes();
 
     /* Rebuild tree for main root: */
@@ -990 +989 @@
     /* Gather list of current unique inaccessible machine-items: */
     QList<UIChooserItemMachine*> inaccessibleMachineItemList;
-    UIChooserItemMachine::enumerateMachineItems(currentItems(), inaccessibleMachineItemList,
+    UIChooserItemMachine::enumerateMachineItems(selectedItems(), inaccessibleMachineItemList,
                                                 UIChooserItemMachineEnumerationFlag_Unique |
                                                 UIChooserItemMachineEnumerationFlag_Inaccessible);
@@ -1019 +1018 @@
     {
         pSelectedItem->makeSureItsVisible();
-        setCurrentItem(pSelectedItem);
+        setSelectedItem(pSelectedItem);
     }
 }
@@ -1031 +1030 @@
     /* Enumerate all the selected machine-items: */
     QList<UIChooserItemMachine*> selectedMachineItemList;
-    UIChooserItemMachine::enumerateMachineItems(currentItems(), selectedMachineItemList);
+    UIChooserItemMachine::enumerateMachineItems(selectedItems(), selectedMachineItemList);
     /* Enumerate all the existing machine-items: */
     QList<UIChooserItemMachine*> existingMachineItemList;
@@ -1068 +1067 @@
         /* If selected copy count equal to existing copy count,
          * we will propose ro unregister machine fully else
-         * we will just propose to remove selected items: */
+         * we will just propose to remove selected-items: */
         bool fVerdict = iSelectedCopyCount == iExistingCopyCount;
         verdicts.insert(uId, fVerdict);
@@ -1298 +1297 @@
 void UIChooserModel::loadLastSelectedItem()
 {
-    /* Load last selected item (choose first if unable to load): */
-    setCurrentItem(gEDataManager->selectorWindowLastItemChosen());
-    if (!currentItem() && !navigationList().isEmpty())
-        setCurrentItem(navigationList().first());
+    /* Load last selected-item (choose first if unable to load): */
+    setSelectedItem(gEDataManager->selectorWindowLastItemChosen());
+    if (!firstSelectedItem() && !navigationList().isEmpty())
+        setSelectedItem(navigationList().first());
 }
 
 void UIChooserModel::saveLastSelectedItem()
 {
-    /* Save last selected item: */
-    gEDataManager->setSelectorWindowLastItemChosen(currentItem() ? currentItem()->definition() : QString());
+    /* Save last selected-item: */
+    gEDataManager->setSelectorWindowLastItemChosen(firstSelectedItem() ? firstSelectedItem()->definition() : QString());
 }
 
@@ -1368 +1367 @@
                             return false;
                         /* Is this group-item only the one selected? */
-                        if (currentItems().contains(pGroupItem) && currentItems().size() == 1)
+                        if (selectedItems().contains(pGroupItem) && selectedItems().size() == 1)
                         {
                             /* Group context menu in that case: */
@@ -1390 +1389 @@
         case QGraphicsSceneContextMenuEvent::Keyboard:
         {
-            /* Get first selected item: */
-            if (UIChooserItem *pItem = currentItem())
+            /* Get first selected-item: */
+            if (UIChooserItem *pItem = firstSelectedItem())
             {
                 /* If this item of known type? */
@@ -1405 +1404 @@
                     {
                         /* Is this group-item only the one selected? */
-                        if (currentItems().size() == 1)
+                        if (selectedItems().size() == 1)
                         {
                             /* Group context menu in that case: */
@@ -1519 +1518 @@
     updateLayout();
     if (!navigationList().isEmpty())
-        setCurrentItem(navigationList().first());
+        setSelectedItem(navigationList().first());
     else
-        unsetCurrentItems();
+        clearSelectedItems();
     saveGroupSettings();
 }
@@ -1543 +1542 @@
 
     /* Change selection to some close by item: */
-    setCurrentItem(findClosestUnselectedItem());
-
-    /* For every selected item: */
+    setSelectedItem(findClosestUnselectedItem());
+
+    /* For every selected-item: */
     for (int iMachineIndex = 0; iMachineIndex < machines.size(); ++iMachineIndex)
     {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -120 +120 @@
     /** @name Selection stuff.
       * @{ */
-        /** Sets a list of current @a items. */
-        void setCurrentItems(const QList<UIChooserItem*> &items);
-        /** Defines current @a pItem. */
-        void setCurrentItem(UIChooserItem *pItem);
-        /** Defines current item by @a definition. */
-        void setCurrentItem(const QString &strDefinition);
-        /** Unsets all current items. */
-        void unsetCurrentItems();
-
-        /** Adds @a pItem to list of current. */
-        void addToCurrentItems(UIChooserItem *pItem);
-        /** Removes @a pItem from list of current. */
-        void removeFromCurrentItems(UIChooserItem *pItem);
-
-        /** Returns current item. */
-        UIChooserItem *currentItem() const;
-        /** Returns a list of current items. */
-        const QList<UIChooserItem*> &currentItems() const;
-
-        /** Returns current machine item. */
-        UIVirtualMachineItem *currentMachineItem() const;
-        /** Returns a list of current machine items. */
-        QList<UIVirtualMachineItem*> currentMachineItems() const;
+        /** Sets a list of selected @a items. */
+        void setSelectedItems(const QList<UIChooserItem*> &items);
+        /** Defines selected @a pItem. */
+        void setSelectedItem(UIChooserItem *pItem);
+        /** Defines selected-item by @a definition. */
+        void setSelectedItem(const QString &strDefinition);
+        /** Clear selected-items list. */
+        void clearSelectedItems();
+
+        /** Adds @a pItem to list of selected. */
+        void addToSelectedItems(UIChooserItem *pItem);
+        /** Removes @a pItem from list of selected. */
+        void removeFromSelectedItems(UIChooserItem *pItem);
+
+        /** Returns first selected-item. */
+        UIChooserItem *firstSelectedItem() const;
+        /** Returns a list of selected-items. */
+        const QList<UIChooserItem*> &selectedItems() const;
+
+        /** Returns first selected machine item. */
+        UIVirtualMachineItem *firstSelectedMachineItem() const;
+        /** Returns a list of selected machine items. */
+        QList<UIVirtualMachineItem*> selectedMachineItems() const;
 
         /** Returns whether group item is selected. */
@@ -156 +156 @@
         bool isAllItemsOfOneGroupSelected() const;
 
-        /** Finds closest non-selected item. */
+        /** Finds closest non-selected-item. */
         UIChooserItem *findClosestUnselectedItem() const;
 
@@ -162 +162 @@
         void makeSureSomeItemIsSelected();
 
-        /** Defines focus @a pItem. */
-        void setFocusItem(UIChooserItem *pItem);
-        /** Returns focus item. */
-        UIChooserItem *focusItem() const;
+        /** Defines current @a pItem. */
+        void setCurrentItem(UIChooserItem *pItem);
+        /** Returns current-item. */
+        UIChooserItem *currentItem() const;
     /** @} */
 
@@ -252 +252 @@
     /** @name Selection stuff.
       * @{ */
-        /** Handles focus item destruction. */
-        void sltFocusItemDestroyed();
+        /** Handles current-item destruction. */
+        void sltCurrentItemDestroyed();
     /** @} */
 
@@ -299 +299 @@
         /** Prepares connections. */
         void prepareConnections();
-        /** Loads last selected items. */
+        /** Loads last selected-items. */
         void loadLastSelectedItem();
 
-        /** Saves last selected items. */
+        /** Saves last selected-items. */
         void saveLastSelectedItem();
         /** Cleanups connections. */
@@ -373 +373 @@
     /** @name Selection stuff.
       * @{ */
-        /** Holds the focus item reference. */
-        QPointer<UIChooserItem>  m_pFocusItem;
+        /** Holds the current-item reference. */
+        QPointer<UIChooserItem>  m_pCurrentItem;
     /** @} */
 
@@ -392 +392 @@
         /** Holds the navigation list. */
         QList<UIChooserItem*>  m_navigationList;
-        QList<UIChooserItem*>  m_currentItems;
+        /** Holds the selected-items. */
+        QList<UIChooserItem*>  m_selectedItems;
 
         /** Holds the current drag object instance. */