Changeset 42678 in vbox for trunk

Timestamp:

Aug 8, 2012 11:25:47 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Sliding buttons, anti-aliasing, frames redraw, few bug-fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/graphics/chooser/UIGChooserHandlerMouse.cpp (modified) (6 diffs)
• selector/graphics/chooser/UIGChooserItem.cpp (modified) (4 diffs)
• selector/graphics/chooser/UIGChooserItem.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserItemGroup.cpp (modified) (37 diffs)
• selector/graphics/chooser/UIGChooserItemGroup.h (modified) (8 diffs)
• selector/graphics/chooser/UIGChooserItemMachine.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)
• selector/graphics/details/UIGDetailsElement.cpp (modified) (5 diffs)
• selector/graphics/details/UIGDetailsGroup.cpp (modified) (1 diff)
• selector/graphics/details/UIGDetailsSet.cpp (modified) (1 diff)
• widgets/graphics/UIGraphicsButton.cpp (modified) (3 diffs)
• widgets/graphics/UIGraphicsButton.h (modified) (1 diff)

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

@@ -72 +72 @@
                     pClickedItem = pMachineItem;
                 /* If we had clicked one of the required item types: */
-                if (pClickedItem && pClickedItem->parentItem())
+                if (pClickedItem && !pClickedItem->isRoot())
                 {
                     /* Old selection list: */
@@ -132 +132 @@
                 {
                     /* For non-root items: */
-                    if (pClickedItem->parentItem())
+                    if (!pClickedItem->isRoot())
                     {
                         /* Is clicked item in selection list: */
@@ -177 +177 @@
                     if (iMouseDoubleClickX < iGroupItemWidth / 2)
                     {
+                        /* Do not allow for unhovered root: */
+                        if (pGroupItem->isRoot() && !pGroupItem->isHovered())
+                            return false;
                         /* Unindent root if possible: */
                         if (model()->root() != model()->mainRoot())
@@ -186 +189 @@
                     else
                     {
+                        /* Do not allow for root: */
+                        if (pGroupItem->isRoot())
+                            return false;
                         /* Indent root with group item: */
                         pGroupItem->setHovered(false);
@@ -193 +199 @@
                     return true;
                 }
+                /* Or a machine one? */
+                else if (pItemUnderMouse->type() == UIGChooserItemType_Machine)
+                {
+                    /* Activate machine item: */
+                    model()->activate();
+                }
+#if 0
                 /* Or a machine one? */
                 else if (UIGChooserItemMachine *pMachineItem = qgraphicsitem_cast<UIGChooserItemMachine*>(pItemUnderMouse))
@@ -217 +230 @@
                     return true;
                 }
+#endif
                 break;
             }

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

@@ -53 +53 @@
     setFocusPolicy(Qt::NoFocus);
     setFlag(QGraphicsItem::ItemIsSelectable, false);
+    setAcceptHoverEvents(!isRoot());
 
     /* Non-root item? */
     if (!isRoot())
     {
-        /* Non-root item setup: */
-        setAcceptHoverEvents(true);
-
         /* Create state machine: */
         m_pHighlightMachine = new QStateMachine(this);
@@ -133 +131 @@
 {
     m_fRoot = fRoot;
-    setAcceptHoverEvents(!m_fRoot);
 }
 
@@ -139 +136 @@
 {
     return m_fRoot;
+}
+
+bool UIGChooserItem::isHovered() const
+{
+    return m_fHovered;
+}
+
+void UIGChooserItem::setHovered(bool fHovered)
+{
+    m_fHovered = fHovered;
+    if (m_fHovered)
+        emit sigHoverEnter();
+    else
+        emit sigHoverLeave();
 }
 
@@ -282 +293 @@
         QPainterPath roundedPath;
         roundedPath.addRoundedRect(pOption->rect, iRadius, iRadius);
-        pPainter->setRenderHint(QPainter::Antialiasing);
         pPainter->setClipPath(roundedPath);
     }

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

@@ -82 +82 @@
     void setRoot(bool fRoot);
     bool isRoot() const;
-    bool isHovered() const { return m_fHovered; }
-    void setHovered(bool fHovered) { m_fHovered = fHovered; }
+    bool isHovered() const;
+    void setHovered(bool fHovered);
 
     /* API: Children stuff: */

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

@@ -39 +39 @@
     : UIGChooserItem(0)
     , m_fClosed(false)
-    , m_pButton(0)
+    , m_pToggleButton(0)
+    , m_pEnterButton(0)
+    , m_pExitButton(0)
     , m_pNameEditorWidget(0)
     , m_pNameEditor(0)
     , m_iAdditionalHeight(0)
     , m_iCornerRadius(10)
-{
+    , m_fMainRoot(true)
+{
+    /* Prepare: */
+    prepare();
+
     /* Add item to the scene: */
     if (pScene)
@@ -51 +57 @@
 
 UIGChooserItemGroup::UIGChooserItemGroup(QGraphicsScene *pScene,
-                                         UIGChooserItemGroup *pCopyFrom)
+                                         UIGChooserItemGroup *pCopyFrom,
+                                         bool fMainRoot)
     : UIGChooserItem(0)
     , m_strName(pCopyFrom->name())
     , m_fClosed(pCopyFrom->closed())
-    , m_pButton(0)
+    , m_pToggleButton(0)
+    , m_pEnterButton(0)
+    , m_pExitButton(0)
     , m_pNameEditorWidget(0)
     , m_pNameEditor(0)
     , m_iAdditionalHeight(0)
     , m_iCornerRadius(10)
-{
+    , m_fMainRoot(fMainRoot)
+{
+    /* Prepare: */
+    prepare();
+
     /* Add item to the scene: */
     if (pScene)
@@ -76 +89 @@
     , m_strName(strName)
     , m_fClosed(!fOpened)
-    , m_pButton(0)
+    , m_pToggleButton(0)
+    , m_pEnterButton(0)
+    , m_pExitButton(0)
     , m_pNameEditorWidget(0)
     , m_pNameEditor(0)
     , m_iAdditionalHeight(0)
     , m_iCornerRadius(10)
+    , m_fMainRoot(false)
 {
     /* Prepare: */
@@ -97 +113 @@
     , m_strName(pCopyFrom->name())
     , m_fClosed(pCopyFrom->closed())
-    , m_pButton(0)
+    , m_pToggleButton(0)
+    , m_pEnterButton(0)
+    , m_pExitButton(0)
     , m_pNameEditorWidget(0)
     , m_pNameEditor(0)
     , m_iAdditionalHeight(0)
     , m_iCornerRadius(10)
+    , m_fMainRoot(false)
 {
     /* Prepare: */
@@ -158 +177 @@
 {
     AssertMsg(parentItem(), ("Can't close root-item!"));
-    m_pButton->setToggled(false ,fAnimated);
+    m_pToggleButton->setToggled(false ,fAnimated);
 }
 
@@ -164 +183 @@
 {
     AssertMsg(parentItem(), ("Can't open root-item!"));
-    m_pButton->setToggled(true, fAnimated);
+    m_pToggleButton->setToggled(true, fAnimated);
 }
 
@@ -244 +263 @@
 }
 
+void UIGChooserItemGroup::sltIndentRoot()
+{
+    setHovered(false);
+    model()->indentRoot(this);
+}
+
+void UIGChooserItemGroup::sltUnindentRoot()
+{
+    setHovered(false);
+    model()->unindentRoot();
+}
+
 QVariant UIGChooserItemGroup::data(int iKey) const
 {
@@ -250 +281 @@
     {
         /* Layout hints: */
-        case GroupItemData_HorizonalMargin: return isRoot() ? 1 : 8;
-        case GroupItemData_VerticalMargin: return isRoot() ? 1 : 5;
-        case GroupItemData_MajorSpacing: return isRoot() ? 0 : 10;
-        case GroupItemData_MinorSpacing: return 0;
+        case GroupItemData_HorizonalMargin: return 8;
+        case GroupItemData_VerticalMargin: return 5;
+        case GroupItemData_MajorSpacing: return 10;
+        case GroupItemData_MinorSpacing: return 3;
         /* Pixmaps: */
-        case GroupItemData_ButtonPixmap: return UIIconPool::iconSet(":/arrow_right_10px.png");
+        case GroupItemData_ToggleButtonPixmap: return UIIconPool::iconSet(":/arrow_right_10px.png");
+        case GroupItemData_EnterButtonPixmap: return UIIconPool::iconSet(":/start_16px.png");
         case GroupItemData_GroupPixmap: return UIIconPool::iconSet(":/nw_16px.png");
         case GroupItemData_MachinePixmap: return UIIconPool::iconSet(":/machine_16px.png");
@@ -275 +307 @@
             /* Prepare variables: */
             int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-            int iButtonWidth = data(GroupItemData_ButtonSize).toSize().width();
-            int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
+            int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+            int iToggleButtonWidth = data(GroupItemData_ToggleButtonSize).toSizeF().width();
+            int iEnterButtonWidth = data(GroupItemData_EnterButtonSize).toSizeF().width();
+            int iExitButtonWidth = data(GroupItemData_ExitButtonSize).toSizeF().width();
             int iGroupPixmapWidth = data(GroupItemData_GroupPixmapSize).toSize().width();
             int iMachinePixmapWidth = data(GroupItemData_MachinePixmapSize).toSize().width();
             int iGroupCountTextWidth = data(GroupItemData_GroupCountTextSize).toSize().width();
             int iMachineCountTextWidth = data(GroupItemData_MachineCountTextSize).toSize().width();
-            int iMaximumWidth = (int)geometry().width() - iHorizontalMargin -
-                                                          iButtonWidth - iMinorSpacing -
-                                                          iHorizontalMargin -
-                                                          iGroupPixmapWidth - iMinorSpacing -
-                                                          iMachinePixmapWidth - iMinorSpacing -
-                                                          iGroupCountTextWidth - iMinorSpacing -
-                                                          iMachineCountTextWidth;
-            QString strCompressedName = compressText(data(GroupItemData_NameFont).value<QFont>(),
-                                                     m_strName, iMaximumWidth);
-            return strCompressedName;
-        }
-        case GroupItemData_GroupCountText: return QString::number(m_groupItems.size());
-        case GroupItemData_MachineCountText: return QString::number(m_machineItems.size());
+            int iMaximumWidth = (int)geometry().width();
+            QString strGroupCountText = data(GroupItemData_GroupCountText).toString();
+            QString strMachineCountText = data(GroupItemData_MachineCountText).toString();
+
+            /* Calculate name width: */
+            iMaximumWidth -= 2 * iHorizontalMargin;
+            if (isRoot())
+                iMaximumWidth -= (iExitButtonWidth + iMajorSpacing);
+            else
+            {
+                iMaximumWidth -= (iToggleButtonWidth + iMajorSpacing);
+                if (isHovered())
+                    iMaximumWidth -= (iEnterButtonWidth + iMajorSpacing);
+            }
+            if (isHovered() && !strGroupCountText.isEmpty())
+                iMaximumWidth -= (iGroupPixmapWidth + iGroupCountTextWidth);
+            if (isHovered() && !strMachineCountText.isEmpty())
+                iMaximumWidth -= (iMachinePixmapWidth + iMachineCountTextWidth);
+            return compressText(data(GroupItemData_NameFont).value<QFont>(), m_strName, iMaximumWidth);
+        }
+        case GroupItemData_GroupCountText: return m_groupItems.isEmpty() ? QString() : QString::number(m_groupItems.size());
+        case GroupItemData_MachineCountText: return m_machineItems.isEmpty() ? QString() : QString::number(m_machineItems.size());
         /* Sizes: */
-        case GroupItemData_ButtonSize: return m_pButton ? m_pButton->minimumSizeHint() : QSizeF(0, 0);
+        case GroupItemData_ToggleButtonSize: return m_pToggleButton ? m_pToggleButton->minimumSizeHint() : QSizeF(0, 0);
+        case GroupItemData_EnterButtonSize: return m_pEnterButton ? m_pEnterButton->minimumSizeHint() : QSizeF(0, 0);
+        case GroupItemData_ExitButtonSize: return m_pExitButton ? m_pExitButton->minimumSizeHint() : QSizeF(0, 0);
         case GroupItemData_MinimumNameSize:
         {
-            if (isRoot())
+            if (isMainRoot())
                 return QSizeF(0, 0);
             QFont font = data(GroupItemData_NameFont).value<QFont>();
@@ -308 +353 @@
         case GroupItemData_NameSize:
         {
-            if (isRoot())
+            if (isMainRoot())
                 return QSizeF(0, 0);
             QFontMetrics fm(data(GroupItemData_NameFont).value<QFont>());
@@ -320 +365 @@
         }
         case GroupItemData_GroupPixmapSize:
-            return isRoot() ? QSizeF(0, 0) : data(GroupItemData_GroupPixmap).value<QIcon>().availableSizes().at(0);
+            return isMainRoot() ? QSizeF(0, 0) : data(GroupItemData_GroupPixmap).value<QIcon>().availableSizes().at(0);
         case GroupItemData_MachinePixmapSize:
-            return isRoot() ? QSizeF(0, 0) : data(GroupItemData_MachinePixmap).value<QIcon>().availableSizes().at(0);
+            return isMainRoot() ? QSizeF(0, 0) : data(GroupItemData_MachinePixmap).value<QIcon>().availableSizes().at(0);
         case GroupItemData_GroupCountTextSize:
         {
-            if (isRoot())
+            if (isMainRoot())
                 return QSizeF(0, 0);
             QFontMetrics fm(data(GroupItemData_InfoFont).value<QFont>());
@@ -332 +377 @@
         case GroupItemData_MachineCountTextSize:
         {
-            if (isRoot())
+            if (isMainRoot())
                 return QSizeF(0, 0);
             QFontMetrics fm(data(GroupItemData_InfoFont).value<QFont>());
@@ -341 +386 @@
             /* Prepare variables: */
             int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
-            int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
-            QSize buttonSize = data(GroupItemData_ButtonSize).toSize();
+            QSize toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSize();
+            QSize enterButtonSize = data(GroupItemData_EnterButtonSize).toSize();
+            QSize exitButtonSize = data(GroupItemData_ExitButtonSize).toSize();
             QSize minimumNameSize = data(GroupItemData_MinimumNameSize).toSize();
             QSize groupPixmapSize = data(GroupItemData_GroupPixmapSize).toSize();
@@ -350 +396 @@
 
             /* Calculate minimum width: */
-            int iGroupItemHeaderWidth = /* Button width: */
-                                        buttonSize.width() +
-                                        /* Spacing between button and name: */
-                                        iMajorSpacing +
-                                        /* Some hardcoded magic: */
-                                        1 /* frame width from Qt sources */ +
-                                        2 /* internal QLineEdit margin from Qt sources */ +
-                                        1 /* internal QLineEdit align shifting from Qt sources */ +
-                                        /* Minimum name width: */
-                                        minimumNameSize.width() +
-                                        /* Spacing between name and info: */
-                                        iMajorSpacing +
-                                        /* Group stuff width: */
-                                        groupPixmapSize.width() + iMinorSpacing +
-                                        groupCountTextSize.width() + iMinorSpacing +
-                                        /* Machine stuff width: */
-                                        machinePixmapSize.width() + iMinorSpacing +
-                                        machineCountTextSize.width();
+            int iGroupItemHeaderWidth = 0;
+            if (isRoot() && !isMainRoot())
+                iGroupItemHeaderWidth += exitButtonSize.width();
+            if (!isRoot())
+                iGroupItemHeaderWidth += toggleButtonSize.width();
+            if (!isMainRoot())
+                iGroupItemHeaderWidth += /* Spacing between button and name: */
+                                         iMajorSpacing +
+                                         minimumNameSize.width() +
+                                         /* Spacing between name and info: */
+                                         iMajorSpacing +
+                                         /* Group stuff width: */
+                                         groupPixmapSize.width() +
+                                         groupCountTextSize.width() +
+                                         /* Machine stuff width: */
+                                         machinePixmapSize.width() +
+                                         machineCountTextSize.width();
+            if (!isRoot())
+                iGroupItemHeaderWidth += enterButtonSize.width();
 
             /* Search for maximum height: */
             QList<int> heights;
-            heights << buttonSize.height()
-                    << minimumNameSize.height()
-                    << groupPixmapSize.height() << machinePixmapSize.height()
-                    << groupCountTextSize.height() << machineCountTextSize.height();
+            if (isRoot() && !isMainRoot())
+                heights << exitButtonSize.height();
+            if (!isRoot())
+                heights << toggleButtonSize.height();
+            if (!isMainRoot())
+                heights << minimumNameSize.height()
+                        << groupPixmapSize.height() << machinePixmapSize.height()
+                        << groupCountTextSize.height() << machineCountTextSize.height();
+            if (!isRoot())
+                heights << enterButtonSize.height();
             int iGroupItemHeaderHeight = 0;
             foreach (int iHeight, heights)
@@ -426 +479 @@
         case UIGChooserItemType_Group:
         {
+            AssertMsg(!m_groupItems.contains(pItem), ("Group item already added!"));
             if (iPosition < 0 || iPosition >= m_groupItems.size())
                 m_groupItems.append(pItem);
@@ -435 +489 @@
         case UIGChooserItemType_Machine:
         {
+            AssertMsg(!m_machineItems.contains(pItem), ("Machine item already added!"));
             if (iPosition < 0 || iPosition >= m_machineItems.size())
                 m_machineItems.append(pItem);
@@ -457 +512 @@
         case UIGChooserItemType_Group:
         {
+            AssertMsg(m_groupItems.contains(pItem), ("Group item was not found!"));
             scene()->removeItem(pItem);
             m_groupItems.removeAt(m_groupItems.indexOf(pItem));
@@ -463 +519 @@
         case UIGChooserItemType_Machine:
         {
+            AssertMsg(m_machineItems.contains(pItem), ("Machine item was not found!"));
             scene()->removeItem(pItem);
             m_machineItems.removeAt(m_machineItems.indexOf(pItem));
@@ -524 +581 @@
         case UIGChooserItemType_Group:
         {
-            while (!m_groupItems.isEmpty()) { delete m_groupItems.takeLast(); }
+            while (!m_groupItems.isEmpty()) { delete m_groupItems.last(); }
             AssertMsg(m_groupItems.isEmpty(), ("Group items cleanup failed!"));
             break;
@@ -530 +587 @@
         case UIGChooserItemType_Machine:
         {
-            while (!m_machineItems.isEmpty()) { delete m_machineItems.takeLast(); }
+            while (!m_machineItems.isEmpty()) { delete m_machineItems.last(); }
             AssertMsg(m_machineItems.isEmpty(), ("Machine items cleanup failed!"));
             break;
@@ -551 +608 @@
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
+    int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
-    int iButtonHeight = data(GroupItemData_ButtonSize).toSize().height();
-    int iButtonWidth = data(GroupItemData_ButtonSize).toSize().width();
     int iFullHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
     int iPreviousVerticalIndent = 0;
@@ -560 +616 @@
     if (isRoot())
     {
-        /* Hide button: */
-        if (m_pButton && m_pButton->isVisible())
-            m_pButton->hide();
-
-        /* Hide name-editor: */
-        if (m_pNameEditor && m_pNameEditor->isVisible())
-            m_pNameEditor->hide();
-
-        /* Prepare body indent: */
-        iPreviousVerticalIndent = iVerticalMargin;
+        /* Hide widgets: */
+        if (m_pToggleButton)
+            m_pToggleButton->hide();
+        if (m_pEnterButton)
+            m_pEnterButton->hide();
+
+        if (!isMainRoot())
+        {
+            /* Exit-button? */
+            if (m_pExitButton)
+            {
+                /* Show exit-button: */
+                m_pExitButton->show();
+
+                /* Prepare variables: */
+                int iExitButtonHeight = data(GroupItemData_ExitButtonSize).toSizeF().height();
+
+                /* Layout exit-button: */
+                int iExitButtonX = iHorizontalMargin;
+                int iExitButtonY = iExitButtonHeight == iFullHeaderHeight ? iVerticalMargin :
+                                   iVerticalMargin + (iFullHeaderHeight - iExitButtonHeight) / 2;
+                m_pExitButton->setPos(iExitButtonX, iExitButtonY);
+            }
+
+            /* Prepare body indent: */
+            iPreviousVerticalIndent = iVerticalMargin + iFullHeaderHeight + iVerticalMargin + iMinorSpacing;
+        }
+        else
+        {
+            /* Prepare body indent: */
+            iPreviousVerticalIndent = 2;
+        }
     }
     /* Header (non-root item): */
     else
     {
-        /* Show button: */
-        if (!m_pButton->isVisible())
-            m_pButton->show();
-        /* Layout button: */
-        int iButtonX = iHorizontalMargin;
-        int iButtonY = iButtonHeight == iFullHeaderHeight ? iVerticalMargin :
-                       iVerticalMargin + (iFullHeaderHeight - iButtonHeight) / 2;
-        m_pButton->setPos(iButtonX, iButtonY);
+        /* Hide exit-button: */
+        if (m_pExitButton)
+            m_pExitButton->hide();
+        /* Show toggle-button: */
+        if (m_pToggleButton)
+            m_pToggleButton->show();
+
+        /* Prepare variables: */
+        int iFullWidth = geometry().width();
+        QSizeF toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSizeF().toSize();
+        int iToggleButtonWidth = toggleButtonSize.width();
+        int iButtonHeight = toggleButtonSize.height();
+        QSizeF enterButtonSize = data(GroupItemData_EnterButtonSize).toSizeF().toSize();
+        int iEnterButtonWidth = enterButtonSize.width();
+        int iEnterButtonHeight = enterButtonSize.height();
+
+        /* Layout toggle-button: */
+        int iToggleButtonX = iHorizontalMargin;
+        int iToggleButtonY = iButtonHeight == iFullHeaderHeight ? iVerticalMargin :
+                             iVerticalMargin + (iFullHeaderHeight - iButtonHeight) / 2;
+        m_pToggleButton->setPos(iToggleButtonX, iToggleButtonY);
+
+        /* Layout enter-button: */
+        int iEnterButtonX = iFullWidth - iHorizontalMargin - iEnterButtonWidth;
+        int iEnterButtonY = iEnterButtonHeight == iFullHeaderHeight ? iVerticalMargin :
+                            iVerticalMargin + (iFullHeaderHeight - iEnterButtonHeight) / 2;
+        m_pEnterButton->setPos(iEnterButtonX, iEnterButtonY);
 
         /* Layout name-editor: */
-        int iNameEditorX = iHorizontalMargin + iButtonWidth + iMinorSpacing;
+        int iNameEditorX = iHorizontalMargin + iToggleButtonWidth + iMajorSpacing;
         int iNameEditorY = 1;
         m_pNameEditor->setPos(iNameEditorX, iNameEditorY);
@@ -598 +695 @@
         /* Hide all the items: */
         foreach (UIGChooserItem *pItem, items())
-            if (pItem->isVisible())
-                pItem->hide();
+            pItem->hide();
     }
     /* Body for opened group: */
@@ -605 +701 @@
     {
         /* Prepare variables: */
-        int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
+        int iHorizontalIndent = isRoot() ? 1 : iHorizontalMargin;
         QRect geo = geometry().toRect();
         int iX = geo.x();
         int iY = geo.y();
         int iWidth = geo.width();
+
         /* Layout all the items: */
         foreach (UIGChooserItem *pItem, items())
         {
             /* Show if hidden: */
-            if (!pItem->isVisible())
-                pItem->show();
+            pItem->show();
             /* Get item's height-hint: */
             int iMinimumHeight = pItem->minimumHeightHint();
             /* Set item's position: */
-            pItem->setPos(iX + iHorizontalMargin, iY + iPreviousVerticalIndent);
+            pItem->setPos(iX + iHorizontalIndent, iY + iPreviousVerticalIndent);
             /* Set item's size: */
-            pItem->resize(iWidth - 2 * iHorizontalMargin, iMinimumHeight);
+            pItem->resize(iWidth - 2 * iHorizontalIndent, iMinimumHeight);
             /* Relayout group: */
             pItem->updateLayout();
@@ -646 +742 @@
     if (!fClosedGroup)
     {
+        /* Prepare variables: */
+        int iHorizontalIndent = isRoot() ? 1 : iHorizontalMargin;
         /* We have to make sure that we had taken into account: */
         foreach (UIGChooserItem *pItem, items())
         {
-            int iItemWidth = 2 * iHorizontalMargin + pItem->minimumWidthHint();
+            int iItemWidth = 2 * iHorizontalIndent + pItem->minimumWidthHint();
             iProposedWidth = qMax(iProposedWidth, iItemWidth);
         }
@@ -677 +775 @@
     {
         /* We should take into account: */
-        for (int i = 0; i < m_groupItems.size(); ++i)
-        {
-            /* Every group item height: */
-            UIGChooserItem *pItem = m_groupItems[i];
-            iProposedHeight += pItem->minimumHeightHint();
-            /* And every spacing between sub-groups: */
-            if (i < m_groupItems.size() - 1)
-                iProposedHeight += iMinorSpacing;
-        }
-        /* Minor spacing between group and machine item: */
-        if (hasItems(UIGChooserItemType_Group) && hasItems(UIGChooserItemType_Machine))
-            iProposedHeight += iMinorSpacing;
-        for (int i = 0; i < m_machineItems.size(); ++i)
-        {
-            /* Every machine item height: */
-            UIGChooserItem *pItem = m_machineItems[i];
-            iProposedHeight += pItem->minimumHeightHint();
-            /* And every spacing between sub-machines: */
-            if (i < m_machineItems.size() - 1)
-                iProposedHeight += iMinorSpacing;
-        }
+        QList<UIGChooserItem*> allItems = items();
+        for (int i = 0; i < allItems.size(); ++i)
+        {
+            /* Every item height: */
+            UIGChooserItem *pItem = allItems[i];
+            iProposedHeight += (pItem->minimumHeightHint() + iMinorSpacing);
+        }
+        /* Minus last spacing: */
+        iProposedHeight -= iMinorSpacing;
         /* Bottom margin: */
         iProposedHeight += iHorizontalMargin;
     }
     /* Finally, additional height during animation: */
-    if (fClosedGroup && m_pButton && m_pButton->isAnimationRunning())
+    if (fClosedGroup && m_pToggleButton && m_pToggleButton->isAnimationRunning())
         iProposedHeight += m_iAdditionalHeight;
 
@@ -944 +1030 @@
 void UIGChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, bool fClosedGroup)
 {
-    /* Non-root item: */
-    if (!isRoot())
-    {
-        /* Configure painter shape: */
-        configurePainterShape(pPainter, pOption, m_iCornerRadius);
-    }
-
-    /* Any item: */
-    {
-        /* Paint decorations: */
-        paintDecorations(pPainter, pOption);
-    }
-
-    /* Non-root item: */
-    if (!isRoot())
+    /* Setup: */
+    pPainter->setRenderHint(QPainter::Antialiasing);
+
+    /* Paint decorations: */
+    paintDecorations(pPainter, pOption);
+
+    /* Non for main root: */
+    if (!isMainRoot())
     {
         /* Paint group info: */
@@ -967 +1046 @@
 void UIGChooserItemGroup::paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
 {
-    /* Prepare variables: */
-    QRect fullRect = pOption->rect;
-
-    /* Any item: */
-    {
-        /* Paint background: */
-        paintBackground(/* Painter: */
-                        pPainter,
-                        /* Rectangle to paint in: */
-                        fullRect);
-    }
-
-    /* Non-root item: */
-    if (!isRoot())
-    {
-        /* Paint frame: */
-        paintFrameRect(/* Painter: */
-                       pPainter,
-                       /* Rectangle to paint in: */
-                       fullRect,
-                       /* Is item selected? */
-                       model()->selectionList().contains(this),
-                       /* Rounded corner radius: */
-                       m_iCornerRadius);
-    }
+    /* Paint background: */
+    paintBackground(pPainter, pOption->rect);
 }
 
@@ -1007 +1063 @@
     if (isRoot())
     {
-        /* Simple and clear: */
-        pPainter->fillRect(rect, base.darker(100));
+        /* Main root item: */
+        if (isMainRoot())
+        {
+            /* Simple and clear: */
+            pPainter->fillRect(rect, base);
+        }
+        else
+        {
+            /* Prepare variables: */
+            int iMargin = data(GroupItemData_VerticalMargin).toInt();
+            int iHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
+            int iFullHeaderHeight = 2 * iMargin + iHeaderHeight;
+            QRect backgroundRect = QRect(0, 0, rect.width(), iFullHeaderHeight);
+
+            /* Add clipping: */
+            QPainterPath path;
+            path.moveTo(1, 0);
+            path.lineTo(path.currentPosition().x(), iFullHeaderHeight - 10);
+            path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(0, -10), 180, 90);
+            path.lineTo(rect.width() - 10 - 1, path.currentPosition().y());
+            path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, -20), 270, 90);
+            path.lineTo(path.currentPosition().x(), 0);
+            path.closeSubpath();
+            pPainter->setClipPath(path);
+
+            /* Fill background: */
+            QLinearGradient headerGradient(backgroundRect.bottomLeft(), backgroundRect.topLeft());
+            headerGradient.setColorAt(0, base.darker(gradient()));
+            headerGradient.setColorAt(1, base.darker(110));
+            pPainter->fillRect(backgroundRect, headerGradient);
+
+            /* Stroke path: */
+            pPainter->setClipping(false);
+            pPainter->strokePath(path, base.darker(130));
+        }
     }
     /* Non-root item: */
@@ -1017 +1106 @@
         int iHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
         int iFullHeaderHeight = 2 * iMargin + iHeaderHeight;
-
-        /* Fill rectangle with brush/color: */
-        pPainter->fillRect(rect, Qt::white);
-
-        /* Make even less rectangle: */
-        QRect backGroundRect = rect;
-        backGroundRect.setTopLeft(backGroundRect.topLeft() + QPoint(2, 2));
-        backGroundRect.setBottomRight(backGroundRect.bottomRight() - QPoint(2, 2));
-        /* Add even more clipping: */
-        QPainterPath roundedPath;
-        roundedPath.addRoundedRect(backGroundRect, m_iCornerRadius, m_iCornerRadius);
-        pPainter->setClipPath(roundedPath);
+        int iFullHeight = rect.height();
+
+        /* Add clipping: */
+        QPainterPath path;
+        path.moveTo(10, 0);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, 0), 90, 90);
+        path.lineTo(path.currentPosition().x(), iFullHeight - 10);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(0, -10), 180, 90);
+        path.lineTo(rect.width() - 10, path.currentPosition().y());
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, -20), 270, 90);
+        path.lineTo(path.currentPosition().x(), 10);
+        path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-20, -10), 0, 90);
+        path.closeSubpath();
+        pPainter->setClipPath(path);
 
         /* Calculate top rectangle: */
-        QRect tRect = backGroundRect;
+        QRect tRect = rect;
         tRect.setBottom(tRect.top() + iFullHeaderHeight);
         /* Prepare top gradient: */
@@ -1040 +1131 @@
         pPainter->fillRect(tRect, tGradient);
 
-        if (backGroundRect.height() > tRect.height())
+        if (rect.height() > tRect.height())
         {
             /* Calculate middle rectangle: */
-            QRect midRect = QRect(tRect.bottomLeft(), backGroundRect.bottomRight());
+            QRect midRect = QRect(tRect.bottomLeft(), rect.bottomRight());
             /* Paint all the stuff: */
             pPainter->fillRect(midRect, base.darker(110));
         }
 
+         /* Stroke path: */
+        pPainter->setClipping(false);
+        pPainter->strokePath(path, base.darker(130));
+        pPainter->setClipPath(path);
+
         /* Paint drag token UP? */
         if (dragTokenPlace() != DragToken_Off)
         {
             QLinearGradient dragTokenGradient;
-            QRect dragTokenRect = backGroundRect;
+            QRect dragTokenRect = rect;
             if (dragTokenPlace() == DragToken_Up)
             {
@@ -1078 +1174 @@
 {
     /* Prepare variables: */
-    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    QSize buttonSize = data(GroupItemData_ButtonSize).toSize();
+    int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+    QSize toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSize();
+    QSize exitButtonSize = data(GroupItemData_ExitButtonSize).toSize();
     QSize nameSize = data(GroupItemData_NameSize).toSize();
     int iFullHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
 
     /* Paint name: */
-    int iNameX = iHorizontalMargin + buttonSize.width() + iMinorSpacing +
-                 1 /* frame width from Qt sources */ +
-                 2 /* internal QLineEdit margin from Qt sources */ +
-                 1 /* internal QLineEdit align shifting from Qt sources */;
+    int iNameX = iHorizontalMargin + iMajorSpacing;
+    if (!isRoot())
+        iNameX += toggleButtonSize.width();
+    else if (!isMainRoot())
+        iNameX += exitButtonSize.width();
     int iNameY = nameSize.height() == iFullHeaderHeight ? iVerticalMargin :
                  iVerticalMargin + (iFullHeaderHeight - nameSize.height()) / 2;
@@ -1104 +1202 @@
     if (isHovered())
     {
+        /* Show enter-button: */
+        if (!isRoot() && m_pEnterButton)
+            m_pEnterButton->show();
+
         /* Prepare variables: */
         QRect fullRect = pOption->rect;
+        int iEnterButtonWidth = data(GroupItemData_EnterButtonSize).toSizeF().width();
         QSize groupPixmapSize = data(GroupItemData_GroupPixmapSize).toSize();
         QSize machinePixmapSize = data(GroupItemData_MachinePixmapSize).toSize();
@@ -1116 +1219 @@
         QPixmap machinePixmap = data(GroupItemData_MachinePixmap).value<QIcon>().pixmap(machinePixmapSize);
 
-        /* We should add machine count: */
-        int iMachineCountTextX = fullRect.right() -
-                                 iHorizontalMargin -
-                                 machineCountTextSize.width();
-        int iMachineCountTextY = machineCountTextSize.height() == iFullHeaderHeight ?
-                                 iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - machineCountTextSize.height()) / 2;
-        paintText(/* Painter: */
-                  pPainter,
-                  /* Rectangle to paint in: */
-                  QRect(QPoint(iMachineCountTextX, iMachineCountTextY), machineCountTextSize),
-                  /* Font to paint text: */
-                  infoFont,
-                  /* Text to paint: */
-                  strMachineCountText);
-
-        /* We should draw machine pixmap: */
-        int iMachinePixmapX = iMachineCountTextX -
-                              iMinorSpacing -
-                              machinePixmapSize.width();
-        int iMachinePixmapY = machinePixmapSize.height() == iFullHeaderHeight ?
-                              iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - machinePixmapSize.height()) / 2;
-        paintPixmap(/* Painter: */
-                    pPainter,
-                    /* Rectangle to paint in: */
-                    QRect(QPoint(iMachinePixmapX, iMachinePixmapY), machinePixmapSize),
-                    /* Pixmap to paint: */
-                    machinePixmap);
-
-        /* We should add group count: */
-        int iGroupCountTextX = iMachinePixmapX -
-                               iMinorSpacing -
-                               groupCountTextSize.width();
-        int iGroupCountTextY = groupCountTextSize.height() == iFullHeaderHeight ?
-                               iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - groupCountTextSize.height()) / 2;
-        paintText(/* Painter: */
-                  pPainter,
-                  /* Rectangle to paint in: */
-                  QRect(QPoint(iGroupCountTextX, iGroupCountTextY), groupCountTextSize),
-                  /* Font to paint text: */
-                  infoFont,
-                  /* Text to paint: */
-                  strGroupCountText);
-
-        /* We should draw group pixmap: */
-        int iGroupPixmapX = iGroupCountTextX -
-                            iMinorSpacing -
-                            groupPixmapSize.width();
-        int iGroupPixmapY = groupPixmapSize.height() == iFullHeaderHeight ?
-                            iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - groupPixmapSize.height()) / 2;
-        paintPixmap(/* Painter: */
-                    pPainter,
-                    /* Rectangle to paint in: */
-                    QRect(QPoint(iGroupPixmapX, iGroupPixmapY), groupPixmapSize),
-                    /* Pixmap to paint: */
-                    groupPixmap);
+        /* Indent: */
+        int iHorizontalIndent = fullRect.right() - iHorizontalMargin;
+        if (!isRoot())
+            iHorizontalIndent -= iEnterButtonWidth;
+
+        /* Should we draw machine count info? */
+        if (!strMachineCountText.isEmpty())
+        {
+            iHorizontalIndent -= machineCountTextSize.width();
+            int iMachineCountTextX = iHorizontalIndent;
+            int iMachineCountTextY = machineCountTextSize.height() == iFullHeaderHeight ?
+                                     iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - machineCountTextSize.height()) / 2;
+            paintText(/* Painter: */
+                      pPainter,
+                      /* Rectangle to paint in: */
+                      QRect(QPoint(iMachineCountTextX, iMachineCountTextY), machineCountTextSize),
+                      /* Font to paint text: */
+                      infoFont,
+                      /* Text to paint: */
+                      strMachineCountText);
+
+            iHorizontalIndent -= machinePixmapSize.width();
+            int iMachinePixmapX = iHorizontalIndent;
+            int iMachinePixmapY = machinePixmapSize.height() == iFullHeaderHeight ?
+                                  iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - machinePixmapSize.height()) / 2;
+            paintPixmap(/* Painter: */
+                        pPainter,
+                        /* Rectangle to paint in: */
+                        QRect(QPoint(iMachinePixmapX, iMachinePixmapY), machinePixmapSize),
+                        /* Pixmap to paint: */
+                        machinePixmap);
+        }
+
+        /* Should we draw group count info? */
+        if (!strGroupCountText.isEmpty())
+        {
+            iHorizontalIndent -= groupCountTextSize.width();
+            int iGroupCountTextX = iHorizontalIndent;
+            int iGroupCountTextY = groupCountTextSize.height() == iFullHeaderHeight ?
+                                   iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - groupCountTextSize.height()) / 2;
+            paintText(/* Painter: */
+                      pPainter,
+                      /* Rectangle to paint in: */
+                      QRect(QPoint(iGroupCountTextX, iGroupCountTextY), groupCountTextSize),
+                      /* Font to paint text: */
+                      infoFont,
+                      /* Text to paint: */
+                      strGroupCountText);
+
+            iHorizontalIndent -= groupPixmapSize.width();
+            int iGroupPixmapX = iHorizontalIndent;
+            int iGroupPixmapY = groupPixmapSize.height() == iFullHeaderHeight ?
+                                iVerticalMargin : iVerticalMargin + (iFullHeaderHeight - groupPixmapSize.height()) / 2;
+            paintPixmap(/* Painter: */
+                        pPainter,
+                        /* Rectangle to paint in: */
+                        QRect(QPoint(iGroupPixmapX, iGroupPixmapY), groupPixmapSize),
+                        /* Pixmap to paint: */
+                        groupPixmap);
+        }
+    }
+    else
+    {
+        /* Hide enter-button: */
+        if (m_pEnterButton)
+            m_pEnterButton->hide();
     }
 }
@@ -1177 +1291 @@
 {
     /* Only for item with button: */
-    if (!m_pButton)
+    if (!m_pToggleButton)
         return;
 
@@ -1184 +1298 @@
     QSizeF closedSize = minimumSizeHint(true);
     int iAdditionalHeight = openedSize.height() - closedSize.height();
-    m_pButton->setAnimationRange(0, iAdditionalHeight);
+    m_pToggleButton->setAnimationRange(0, iAdditionalHeight);
 }
 
@@ -1200 +1314 @@
 void UIGChooserItemGroup::prepare()
 {
-    /* Setup toggle-button: */
-    m_pButton = new UIGraphicsRotatorButton(this, "additionalHeight", opened());
-    m_pButton->setIcon(data(GroupItemData_ButtonPixmap).value<QIcon>());
-    connect(m_pButton, SIGNAL(sigRotationStart()), this, SLOT(sltGroupToggleStart()));
-    connect(m_pButton, SIGNAL(sigRotationFinish(bool)), this, SLOT(sltGroupToggleFinish(bool)));
-    m_pButton->hide();
-
-    /* Setup name-editor: */
-    m_pNameEditorWidget = new QLineEdit(m_strName);
-    m_pNameEditorWidget->setTextMargins(0, 0, 0, 0);
-    m_pNameEditorWidget->setFont(data(GroupItemData_NameFont).value<QFont>());
-    connect(m_pNameEditorWidget, SIGNAL(editingFinished()), this, SLOT(sltNameEditingFinished()));
-    m_pNameEditor = new QGraphicsProxyWidget(this);
-    m_pNameEditor->setWidget(m_pNameEditorWidget);
-    m_pNameEditor->hide();
+    /* Non root item only: */
+    if (!isRoot())
+    {
+        /* Setup toggle-button: */
+        m_pToggleButton = new UIGraphicsRotatorButton(this, "additionalHeight", opened());
+        m_pToggleButton->setIcon(data(GroupItemData_ToggleButtonPixmap).value<QIcon>());
+        connect(m_pToggleButton, SIGNAL(sigRotationStart()), this, SLOT(sltGroupToggleStart()));
+        connect(m_pToggleButton, SIGNAL(sigRotationFinish(bool)), this, SLOT(sltGroupToggleFinish(bool)));
+        m_pToggleButton->hide();
+
+        /* Setup enter-button: */
+        m_pEnterButton = new UIGraphicsButton(this);
+        m_pEnterButton->setIcon(data(GroupItemData_EnterButtonPixmap).value<QIcon>());
+        connect(m_pEnterButton, SIGNAL(sigButtonClicked()), this, SLOT(sltIndentRoot()));
+        m_pEnterButton->hide();
+
+        /* Setup name-editor: */
+        m_pNameEditorWidget = new QLineEdit(m_strName);
+        m_pNameEditorWidget->setTextMargins(0, 0, 0, 0);
+        m_pNameEditorWidget->setFont(data(GroupItemData_NameFont).value<QFont>());
+        connect(m_pNameEditorWidget, SIGNAL(editingFinished()), this, SLOT(sltNameEditingFinished()));
+        m_pNameEditor = new QGraphicsProxyWidget(this);
+        m_pNameEditor->setWidget(m_pNameEditorWidget);
+        m_pNameEditor->hide();
+    }
+    /* Root item but non main: */
+    if (!isMainRoot())
+    {
+        /* Setup exit-button: */
+        m_pExitButton = new UIGraphicsButton(this);
+        m_pExitButton->setIcon(data(GroupItemData_EnterButtonPixmap).value<QIcon>());
+        connect(m_pExitButton, SIGNAL(sigButtonClicked()), this, SLOT(sltUnindentRoot()));
+        QSizeF sh = m_pExitButton->minimumSizeHint();
+        m_pExitButton->setTransformOriginPoint(sh.width() / 2, sh.height() / 2);
+        m_pExitButton->setRotation(180);
+        m_pExitButton->hide();
+    }
 }
 

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

@@ -25 +25 @@
 /* Forward declarations: */
 class QGraphicsScene;
+class UIGraphicsButton;
 class UIGraphicsRotatorButton;
 class QLineEdit;
@@ -47 +48 @@
     /* Constructor/destructor: */
     UIGChooserItemGroup(QGraphicsScene *pScene);
-    UIGChooserItemGroup(QGraphicsScene *pScene, UIGChooserItemGroup *pCopyFrom);
+    UIGChooserItemGroup(QGraphicsScene *pScene, UIGChooserItemGroup *pCopyFrom,
+                        bool fMainRoot);
     UIGChooserItemGroup(UIGChooserItem *pParent, const QString &strName,
                         bool fOpened  = false , int iPosition  = -1 );
@@ -73 +75 @@
     void sltGroupToggleFinish(bool fToggled);
 
+    /* Handler: Indent root stuff: */
+    void sltIndentRoot();
+    void sltUnindentRoot();
+
 private:
 
@@ -84 +90 @@
         GroupItemData_MinorSpacing,
         /* Pixmaps: */
-        GroupItemData_ButtonPixmap,
+        GroupItemData_ToggleButtonPixmap,
+        GroupItemData_EnterButtonPixmap,
         GroupItemData_GroupPixmap,
         GroupItemData_MachinePixmap,
@@ -95 +102 @@
         GroupItemData_MachineCountText,
         /* Sizes: */
-        GroupItemData_ButtonSize,
+        GroupItemData_ToggleButtonSize,
+        GroupItemData_EnterButtonSize,
+        GroupItemData_ExitButtonSize,
         GroupItemData_MinimumNameSize,
         GroupItemData_NameSize,
@@ -113 +122 @@
     void hide();
     void startEditing();
+    bool isMainRoot() const { return m_fMainRoot; }
 
     /* Helpers: Children stuff: */
@@ -161 +171 @@
     QString m_strName;
     bool m_fClosed;
-    UIGraphicsRotatorButton *m_pButton;
+    UIGraphicsRotatorButton *m_pToggleButton;
+    UIGraphicsButton *m_pEnterButton;
+    UIGraphicsButton *m_pExitButton;
     QLineEdit *m_pNameEditorWidget;
     QGraphicsProxyWidget *m_pNameEditor;
@@ -168 +180 @@
     int m_iAdditionalHeight;
     int m_iCornerRadius;
+    bool m_fMainRoot;
 };
 

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

@@ -502 +502 @@
 void UIGChooserItemMachine::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget * /* pWidget = 0 */)
 {
+    /* Setup: */
+    pPainter->setRenderHint(QPainter::Antialiasing);
+
     /* Configure painter shape: */
     configurePainterShape(pPainter, pOption, m_iCornerRadius);

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

@@ -129 +129 @@
 
     /* Create left root: */
-    m_pLeftRoot = new UIGChooserItemGroup(scene(), root()->toGroupItem());
+    bool fLeftRootIsMain = root() == mainRoot();
+    m_pLeftRoot = new UIGChooserItemGroup(scene(), root()->toGroupItem(), fLeftRootIsMain);
     m_pLeftRoot->setPos(0, 0);
     m_pLeftRoot->resize(root()->geometry().size());
 
     /* Create right root: */
-    m_pRightRoot = new UIGChooserItemGroup(scene(), pNewRootItem->toGroupItem());
+    m_pRightRoot = new UIGChooserItemGroup(scene(), pNewRootItem->toGroupItem(), false);
     m_pRightRoot->setPos(root()->geometry().width(), 0);
     m_pRightRoot->resize(root()->geometry().size());
@@ -162 +163 @@
 
     /* Create left root: */
-    m_pLeftRoot = new UIGChooserItemGroup(scene(), m_rootStack.at(m_rootStack.size() - 2)->toGroupItem());
+    bool fLeftRootIsMain = m_rootStack.at(m_rootStack.size() - 2) == mainRoot();
+    m_pLeftRoot = new UIGChooserItemGroup(scene(), m_rootStack.at(m_rootStack.size() - 2)->toGroupItem(), fLeftRootIsMain);
     m_pLeftRoot->setPos(- root()->geometry().width(), 0);
     m_pLeftRoot->resize(root()->geometry().size());
 
     /* Create right root: */
-    m_pRightRoot = new UIGChooserItemGroup(scene(), root()->toGroupItem());
+    m_pRightRoot = new UIGChooserItemGroup(scene(), root()->toGroupItem(), false);
     m_pRightRoot->setPos(0, 0);
     m_pRightRoot->resize(root()->geometry().size());
@@ -1491 +1493 @@
                         /* Get group item: */
                         UIGChooserItem *pGroupItem = qgraphicsitem_cast<UIGChooserItemGroup*>(pItem);
+                        /* Make sure thats not root: */
+                        if (pGroupItem->isRoot())
+                            return false;
                         /* Is this group item only the one selected? */
                         if (selectionList().contains(pGroupItem) && selectionList().size() == 1)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -428 +428 @@
         /* Add text height: */
         if (!m_text.isEmpty())
-            iProposedHeight += iMargin + iTextHeight;
+            iProposedHeight += 2 * iMargin + iTextHeight;
     }
     else
@@ -471 +471 @@
 void UIGDetailsElement::paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
 {
-    /* Prepare variables: */
-    QRect fullRect = pOption->rect;
-
     /* Paint background: */
     paintBackground(/* Painter: */
                     pPainter,
                     /* Rectangle to paint in: */
-                    fullRect,
+                    pOption->rect,
                     /* Rounded corners radius: */
                     m_iCornerRadius,
                     /* Header height: */
-                    data(ElementData_Margin).toInt() +
-                    data(ElementData_HeaderSize).toSize().height() +
-                    1);
-
-    /* Paint frame: */
-    paintFrameRect(/* Painter: */
-                   pPainter,
-                   /* Rectangle to paint in: */
-                   fullRect,
-                   /* Rounded corner radius: */
-                   m_iCornerRadius);
+                    2 * data(ElementData_Margin).toInt() +
+                    data(ElementData_HeaderSize).toSize().height());
 }
 
@@ -565 +553 @@
         /* Where to paint? */
         int iMachineTextX = iMachinePixmapX;
-        int iMachineTextY = iMachinePixmapY + iHeaderHeight + iMargin;
+        int iMachineTextY = iMachinePixmapY + iHeaderHeight + 2 * iMargin;
 
         /* For each the line: */
@@ -604 +592 @@
     pPainter->save();
 
-    /* Fill rectangle with white color: */
+    /* Prepare variables: */
+    int iFullHeight = rect.height();
+
+    /* Prepare color: */
     QPalette pal = QApplication::palette();
-    pPainter->fillRect(rect, Qt::white);
-
-    /* Prepare color: */
     QColor windowColor = pal.color(QPalette::Active, QPalette::Window);
 
-    /* Make even less rectangle: */
-    QRect backGroundRect = rect;
-    backGroundRect.setTopLeft(backGroundRect.topLeft() + QPoint(2, 2));
-    backGroundRect.setBottomRight(backGroundRect.bottomRight() - QPoint(2, 2));
-    /* Add even more clipping: */
-    QPainterPath roundedPath;
-    roundedPath.addRoundedRect(backGroundRect, iRadius, iRadius);
-    pPainter->setClipPath(roundedPath);
+    /* Add clipping: */
+    QPainterPath path;
+    path.moveTo(iRadius, 0);
+    path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iRadius, 2 * iRadius)).translated(-iRadius, 0), 90, 90);
+    path.lineTo(path.currentPosition().x(), iFullHeight - iRadius);
+    path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iRadius, 2 * iRadius)).translated(0, -iRadius), 180, 90);
+    path.lineTo(rect.width() - iRadius, path.currentPosition().y());
+    path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iRadius, 2 * iRadius)).translated(-iRadius, -2 * iRadius), 270, 90);
+    path.lineTo(path.currentPosition().x(), iRadius);
+    path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iRadius, 2 * iRadius)).translated(-2 * iRadius, -iRadius), 0, 90);
+    path.closeSubpath();
+    pPainter->setClipPath(path);
 
     /* Calculate top rectangle: */
-    QRect tRect = backGroundRect;
+    QRect tRect = rect;
     tRect.setBottom(tRect.top() + iHeaderHeight);
     /* Calculate bottom rectangle: */
-    QRect bRect = backGroundRect;
+    QRect bRect = rect;
     bRect.setTop(tRect.bottom());
 
@@ -633 +625 @@
 
     /* Paint all the stuff: */
-    pPainter->fillRect(bRect, windowColor.darker(99));
     pPainter->fillRect(tRect, tGradient);
+    pPainter->fillRect(bRect, windowColor.darker(97));
+
+    /* Stroke path: */
+    pPainter->setClipping(false);
+    pPainter->strokePath(path, windowColor.darker(130));
 
     /* Restore painter: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp

@@ -122 +122 @@
     {
         /* Layout hints: */
-        case GroupData_Margin: return 1;
+        case GroupData_Margin: return 2;
         case GroupData_Spacing: return 10;
         /* Default: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -106 +106 @@
         /* Layout hints: */
         case SetData_Margin: return 0;
-        case SetData_Spacing: return 1;
+        case SetData_Spacing: return 3;
         /* Default: */
         default: break;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp

@@ -20 +20 @@
 /* Qt includes: */
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 
 /* GUI includes: */
@@ -43 +44 @@
     switch (iKey)
     {
-        case GraphicsButton_Margin: return 3;
+        case GraphicsButton_Margin: return 0;
         case GraphicsButton_IconSize: return m_icon.isNull() ? QSize(16, 16) : m_icon.availableSizes().first();
         case GraphicsButton_Icon: return m_icon;
@@ -84 +85 @@
 void UIGraphicsButton::mousePressEvent(QGraphicsSceneMouseEvent *pEvent)
 {
+    /* Accepting this event allows to get release-event: */
+    pEvent->accept();
+}
+
+void UIGraphicsButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *pEvent)
+{
+    /* Call to base-class: */
+    QIGraphicsWidget::mouseReleaseEvent(pEvent);
     /* Notify listeners about button click: */
     emit sigButtonClicked();
-    /* Propagate to parent: */
-    QIGraphicsWidget::mousePressEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h

@@ -66 +66 @@
     virtual void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget *pWidget = 0);
 
-    /* Mouse-press handler: */
+    /* Mouse handlers: */
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *pEvent);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *pEvent);
 
     /* Helpers: Update stuff: */