Changeset 43549 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 5, 2012 10:32:09 AM (13 years ago)

Author:

vboxsync

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

81161

Message:

FE/Qt: VM group feature UI: Mouse-handler cleanup (part 1).

Location:

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

Files:

• UIGChooserHandlerMouse.cpp (modified) (5 diffs)
• UIGChooserHandlerMouse.h (modified) (1 diff)

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

@@ -71 +71 @@
                 else if (UIGChooserItemMachine *pMachineItem = qgraphicsitem_cast<UIGChooserItemMachine*>(pItemUnderMouse))
                     pClickedItem = pMachineItem;
-                /* If we had clicked one of the required item types: */
+                /* If we had clicked one of required item types: */
                 if (pClickedItem && !pClickedItem->isRoot())
                 {
@@ -128 +128 @@
                 else if (UIGChooserItemMachine *pMachineItem = qgraphicsitem_cast<UIGChooserItemMachine*>(pItemUnderMouse))
                     pClickedItem = pMachineItem;
-                /* If we had clicked one of the required item types: */
+                /* If we had clicked one of required item types: */
                 if (pClickedItem)
                 {
@@ -135 +135 @@
                     {
                         /* Is clicked item in selection list: */
-                        bool fIsClickedItemInSelectionList = contains(model()->currentItems(), pClickedItem);
+                        bool fIsClickedItemInSelectionList = model()->currentItems().contains(pClickedItem);
                         /* Move focus to clicked item (with selection if not selected yet): */
                         model()->setFocusItem(pClickedItem, !fIsClickedItemInSelectionList);
@@ -216 +216 @@
                     model()->activate();
                 }
-#if 0
-                /* Or a machine one? */
-                else if (UIGChooserItemMachine *pMachineItem = qgraphicsitem_cast<UIGChooserItemMachine*>(pItemUnderMouse))
-                {
-                    /* Prepare variables: */
-                    int iMachineItemWidth = pMachineItem->geometry().toRect().width();
-                    int iMouseDoubleClickX = pEvent->scenePos().toPoint().x();
-                    /* If click was at left part: */
-                    if (iMouseDoubleClickX < iMachineItemWidth / 2)
-                    {
-                        /* Unindent root if possible: */
-                        if (model()->root() != model()->mainRoot())
-                        {
-                            pMachineItem->setHovered(false);
-                            model()->unindentRoot();
-                        }
-                    }
-                    else
-                    {
-                        /* Activate machine item: */
-                        model()->activate();
-                    }
-                    /* Filter that event out: */
-                    return true;
-                }
-#endif
                 break;
             }
@@ -252 +226 @@
 }
 
-bool UIGChooserHandlerMouse::contains(QList<UIGChooserItem*> list,
-                                      UIGChooserItem *pRequiredItem,
-                                      bool fRecursively /* = false */) const
-{
-    /* Search throught the all passed list items: */
-    foreach (UIGChooserItem *pItem, list)
-    {
-        /* Check item first: */
-        if (pItem == pRequiredItem)
-            return true;
-        /* Check if this item supports children: */
-        if (fRecursively && pItem->type() == UIGChooserItemType_Group)
-        {
-            /* Check items recursively: */
-            if (contains(pItem->items(), pRequiredItem))
-                return true;
-        }
-    }
-    return false;
-}
-

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

@@ -59 +59 @@
     bool handleMouseDoubleClick(QGraphicsSceneMouseEvent *pEvent) const;
 
-    /* Helper: Check if some list contains some item: */
-    bool contains(QList<UIGChooserItem*> list, UIGChooserItem *pRequiredItem, bool fRecursively = false) const;
-
     /* Variables: */
     UIGChooserModel *m_pModel;