Changeset 74002 in vbox for trunk/src

Timestamp:

Aug 31, 2018 11:19:49 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Group and Machine items: Proper children indentation.

Location:

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

Files:

• UIChooserItem.cpp (modified) (1 diff)
• UIChooserItem.h (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (7 diffs)
• UIChooserItemGroup.h (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (5 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

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

@@ -296 +296 @@
 }
 
+int UIChooserItem::level() const
+{
+    int iLevel = 0;
+    UIChooserItem *pParentItem = parentItem();
+    while (pParentItem && !pParentItem->isRoot())
+    {
+        pParentItem = pParentItem->parentItem();
+        ++iLevel;
+    }
+    return iLevel;
+}
+
 void UIChooserItem::show()
 {

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

@@ -122 +122 @@
         /** Returns action-pool reference. */
         UIActionPool *actionPool() const;
+
+        /** Returns a level of item. */
+        int level() const;
 
         /** Shows item. */

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

@@ -749 +749 @@
 {
     /* Prepare variables: */
-    int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    int iFullHeaderHeight = m_minimumHeaderSize.height();
+    const int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
+    const int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
+    const int iParentIndent = data(GroupItemData_ParentIndent).toInt();
+    const int iFullHeaderHeight = m_minimumHeaderSize.height();
     int iPreviousVerticalIndent = 0;
 
@@ -797 +798 @@
             int iToggleButtonHeight = m_toggleButtonSize.height();
             /* Layout toggle-button: */
-            int iToggleButtonX = iHorizontalMargin;
+            int iToggleButtonX = iHorizontalMargin + iParentIndent * level();
             int iToggleButtonY = iToggleButtonHeight == iFullHeaderHeight ? iVerticalMargin :
                                  iVerticalMargin + (iFullHeaderHeight - iToggleButtonHeight) / 2;
@@ -1289 +1290 @@
         case GroupItemData_VerticalMargin:  return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         case GroupItemData_Spacing:         return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_ParentIndent:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 3;
 
         /* Default: */
@@ -1419 +1421 @@
     {
         /* Prepare variables: */
-        int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
+        const int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
+        const int iParentIndent = data(GroupItemData_ParentIndent).toInt();
 
         /* Basically we have to take header width into account: */
@@ -1435 +1438 @@
 
         /* And 2 margins at last - left and right: */
-        iProposedWidth += 2 * iHorizontalMargin;
+        iProposedWidth += 2 * iHorizontalMargin + iParentIndent * level();
     }
 
@@ -1744 +1747 @@
 
     /* Prepare variables: */
-    int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    int iSpacing = data(GroupItemData_Spacing).toInt();
-    int iFullHeaderHeight = m_minimumHeaderSize.height();
+    const int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
+    const int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
+    const int iSpacing = data(GroupItemData_Spacing).toInt();
+    const int iParentIndent = data(GroupItemData_ParentIndent).toInt();
+    const int iFullHeaderHeight = m_minimumHeaderSize.height();
 
     /* Configure painter color: */
@@ -1763 +1767 @@
 
     /* Paint name: */
-    int iNameX = iHorizontalMargin;
+    int iNameX = iHorizontalMargin + iParentIndent * level();
     if (isRoot())
         iNameX += m_exitButtonSize.width();

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

@@ -243 +243 @@
         GroupItemData_VerticalMargin,
         GroupItemData_Spacing,
+        GroupItemData_ParentIndent,
     };
 

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

@@ -399 +399 @@
 {
     /* Prepare variables: */
-    int iMargin = data(MachineItemData_Margin).toInt();
-    int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
-    int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
+    const int iMargin = data(MachineItemData_Margin).toInt();
+    const int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
+    const int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
+    const int iParentIndent = data(MachineItemData_ParentIndent).toInt();
 
     /* Calculating proposed width: */
@@ -407 +408 @@
 
     /* Two margins: */
-    iProposedWidth += 2 * iMargin;
+    iProposedWidth += 2 * iMargin + iParentIndent * level();
     /* And machine-item content to take into account: */
     int iTopLineWidth = m_iMinimumNameWidth;
@@ -622 +623 @@
         case MachineItemData_MinorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
         case MachineItemData_TextSpacing:  return 0;
+        case MachineItemData_ParentIndent: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 3;
 
         /* Pixmaps: */
@@ -993 +995 @@
     /* Prepare variables: */
     QRect fullRect = pOption->rect;
-    int iFullHeight = fullRect.height();
-    int iMargin = data(MachineItemData_Margin).toInt();
-    int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
-    int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
-    int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
+    const int iFullHeight = fullRect.height();
+    const int iMargin = data(MachineItemData_Margin).toInt();
+    const int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
+    const int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
+    const int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
+    const int iParentIndent = data(MachineItemData_ParentIndent).toInt();
 
     /* Selected item foreground: */
@@ -1019 +1022 @@
 
     /* Calculate indents: */
-    int iLeftColumnIndent = iMargin;
+    int iLeftColumnIndent = iMargin + iParentIndent * level();
 
     /* Paint left column: */

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

@@ -195 +195 @@
         MachineItemData_MinorSpacing,
         MachineItemData_TextSpacing,
+        MachineItemData_ParentIndent,
         /* Pixmaps: */
         MachineItemData_SettingsButtonPixmap,