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

Timestamp:

Aug 6, 2018 6:26:58 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: UITabBar: Support for left|right alignment types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/UISelectorWindow.cpp (modified) (2 diffs)
• widgets/UITabBar.cpp (modified) (4 diffs)
• widgets/UITabBar.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1957 +1957 @@
 
         /* Create Machine tab-bar: */
-        m_pTabBarMachine = new UITabBar;
+        m_pTabBarMachine = new UITabBar(UITabBar::Align_Right);
         AssertPtrReturnVoid(m_pTabBarMachine);
         {
@@ -1970 +1970 @@
 
         /* Create Global tab-bar: */
-        m_pTabBarGlobal = new UITabBar;
+        m_pTabBarGlobal = new UITabBar(UITabBar::Align_Right);
         AssertPtrReturnVoid(m_pTabBarGlobal);
         {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

@@ -720 +720 @@
 *********************************************************************************************************************************/
 
-UITabBar::UITabBar(QWidget *pParent /* = 0 */)
+UITabBar::UITabBar(Alignment enmAlignment, QWidget *pParent /* = 0 */)
     : QWidget(pParent)
+    , m_enmAlignment(enmAlignment)
     , m_pLayoutMain(0)
     , m_pLayoutTab(0)
@@ -745 +746 @@
         connect(pItem, &UITabBarItem::sigDragObjectDestroy, this, &UITabBar::sltHandleDragObjectDestroy);
         /* Add item into layout and list: */
-        m_pLayoutTab->insertWidget(0, pItem);
-        m_aItems.prepend(pItem);
+        switch (m_enmAlignment)
+        {
+            case Align_Left:
+                m_pLayoutTab->addWidget(pItem);
+                m_aItems.append(pItem);
+                break;
+            case Align_Right:
+                m_pLayoutTab->insertWidget(0, pItem);
+                m_aItems.prepend(pItem);
+                break;
+        }
         /* Update children styles: */
         updateChildrenStyles();
@@ -1021 +1031 @@
         m_pLayoutMain->setContentsMargins(0, 0, 0, 0);
 
-        /// @todo Workout stretch at the and as well,
-        //       depending on which alignment is set.
-        /* Add strech into beginning: */
-        m_pLayoutMain->addStretch();
+        /* Add strech to beginning: */
+        if (m_enmAlignment == Align_Right)
+            m_pLayoutMain->addStretch();
 
         /* Create tab layout: */
@@ -1033 +1042 @@
             m_pLayoutMain->addLayout(m_pLayoutTab);
         }
+
+        /* Add strech to end: */
+        if (m_enmAlignment == Align_Left)
+            m_pLayoutMain->addStretch();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.h

@@ -56 +56 @@
 public:
 
+    /** Alignment types. */
+    enum Alignment { Align_Left, Align_Right };
+
     /** Constructs tab-bar passing @a pParent to the base-class. */
-    UITabBar(QWidget *pParent = 0);
+    UITabBar(Alignment enmAlignment, QWidget *pParent = 0);
 
     /** Adds new tab for passed @a pAction. @returns unique tab ID. */
@@ -104 +107 @@
     void updateChildrenStyles();
 
+    /** @name Contents: Common
+      * @{ */
+        /** Holds the alignment. */
+        Alignment m_enmAlignment;
+    /** @} */
+
     /** @name Contents: Widgets
       * @{ */