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

Timestamp:

Jan 30, 2019 6:12:57 PM (6 years ago)

Author:

vboxsync

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

128506

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Reworking Chooser-pane items hierarchy the way that they are really children of actual parent groups up to invisible root-group; this allows to manage z-order and visibility implicitly but requires a bit of magic for proper layout and animation handling.

Location:

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

Files:

• UIChooserItem.cpp (modified) (2 diffs)
• UIChooserItem.h (modified) (1 diff)
• UIChooserItemGlobal.cpp (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (10 diffs)
• UIChooserItemGroup.h (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (1 diff)
• UIChooserModel.cpp (modified) (2 diffs)

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

@@ -195 +195 @@
 UIChooserItem::UIChooserItem(UIChooserItem *pParent, bool fTemporary,
                              int iDefaultValue /* = 100 */, int iHoveredValue /* = 90 */)
-    : m_pParent(pParent)
+    : QIWithRetranslateUI4<QIGraphicsWidget>(pParent)
+    , m_pParent(pParent)
     , m_fTemporary(fTemporary)
     , m_fRoot(!pParent)
@@ -345 +346 @@
 }
 
-void UIChooserItem::show()
-{
-    /* Call to base-class: */
-    QIGraphicsWidget::show();
-}
-
-void UIChooserItem::hide()
-{
-    /* Call to base-class: */
-    QIGraphicsWidget::hide();
-}
-
 void UIChooserItem::setRoot(bool fRoot)
 {

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

@@ -134 +134 @@
         /** Defines a @a iLevel of item. */
         void setLevel(int iLevel);
-
-        /** Shows item. */
-        virtual void show();
-        /** Hides item. */
-        virtual void hide();
 
         /** Starts item editing. */

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

@@ -391 +391 @@
     AssertPtrReturnVoid(parentItem());
     parentItem()->addItem(this, m_iPosition);
-    setZValue(parentItem()->zValue() + 1);
 
     /* Configure connections: */

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

@@ -124 +124 @@
     AssertMsg(parentItem(), ("Incorrect parent passed!"));
     parentItem()->addItem(this, iPosition);
-    setZValue(parentItem()->zValue() + 1);
     connect(this, &UIChooserItemGroup::sigToggleStarted,
             model(), &UIChooserModel::sigToggleStarted);
@@ -169 +168 @@
     AssertMsg(parentItem(), ("Incorrect parent passed!"));
     parentItem()->addItem(this, iPosition);
-    setZValue(parentItem()->zValue() + 1);
     connect(this, &UIChooserItemGroup::sigToggleStarted,
             model(), &UIChooserModel::sigToggleStarted);
@@ -360 +358 @@
     /* Paint header: */
     paintHeader(pPainter, rectangle);
-}
-
-void UIChooserItemGroup::show()
-{
-    /* Call to base-class: */
-    UIChooserItem::show();
-    /* Show children: */
-    if (!isClosed())
-        foreach (UIChooserItem *pItem, items())
-            pItem->show();
-}
-
-void UIChooserItemGroup::hide()
-{
-    /* Call to base-class: */
-    UIChooserItem::hide();
-    /* Hide children: */
-    foreach (UIChooserItem *pItem, items())
-        pItem->hide();
 }
 
@@ -513 +492 @@
             else
                 m_groupItems.insert(iPosition, pItem);
-            scene()->addItem(pItem);
             break;
         }
@@ -523 +501 @@
             else
                 m_globalItems.insert(iPosition, pItem);
-            scene()->addItem(pItem);
             break;
         }
@@ -533 +510 @@
             else
                 m_machineItems.insert(iPosition, pItem);
-            scene()->addItem(pItem);
             break;
         }
@@ -557 +533 @@
         {
             AssertMsg(m_groupItems.contains(pItem), ("Group-item was not found!"));
-            scene()->removeItem(pItem);
             m_groupItems.removeAt(m_groupItems.indexOf(pItem));
             break;
@@ -564 +539 @@
         {
             AssertMsg(m_globalItems.contains(pItem), ("Global-item was not found!"));
-            scene()->removeItem(pItem);
             m_globalItems.removeAt(m_globalItems.indexOf(pItem));
             break;
@@ -571 +545 @@
         {
             AssertMsg(m_machineItems.contains(pItem), ("Machine-item was not found!"));
-            scene()->removeItem(pItem);
             m_machineItems.removeAt(m_machineItems.indexOf(pItem));
             break;
@@ -845 +818 @@
         const int iChildrenSpacing = data(GroupItemData_ChildrenSpacing).toInt();
         QRect geo = geometry().toRect();
-        int iX = geo.x();
-        int iY = geo.y();
+        int iX = 0;
+        int iY = 0;
         int iWidth = geo.width();
 

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

@@ -122 +122 @@
         /** Returns RTTI item type. */
         virtual int type() const /* override */ { return Type; }
-
-        /** Shows item. */
-        virtual void show() /* override */;
-        /** Hides item. */
-        virtual void hide() /* override */;
 
         /** Starts item editing. */

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

@@ -592 +592 @@
     AssertPtrReturnVoid(parentItem());
     parentItem()->addItem(this, m_iPosition);
-    setZValue(parentItem()->zValue() + 1);
 
     /* Configure connections: */

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

@@ -484 +484 @@
     m_pAfterSlidingFocus = root()->items().first();
 
+    /* Hiding new root: */
+    root()->hide();
+
+    /* Move it to scene (making it top-level item): */
+    root()->setParentItem(0);
+    scene()->addItem(root());
+
     /* Slide root: */
     slideRoot(true);
@@ -500 +507 @@
     /* Hiding old root: */
     root()->hide();
+
+    /* Remove it from scene (returning back to it's parent): */
+    root()->setParentItem(root()->parentItem());
 
     /* Create left root: */