Changeset 73601 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 9, 2018 6:04:22 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: UIToolbarTools: Add possibility to switch tab-bar layout directly instead of internal hardcoded action toggle connection.

Location:

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

Files:

• UIToolbarTools.cpp (modified) (7 diffs)
• UIToolbarTools.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.cpp

@@ -47 +47 @@
 }
 
+void UIToolbarTools::switchToTabBar(TabBarType enmType)
+{
+    /* Handle known types: */
+    switch (enmType)
+    {
+        case TabBarType_Machine:
+        {
+            if (m_pTabBarGlobal)
+                m_pTabBarGlobal->setVisible(false);
+            if (m_pTabBarMachine)
+                m_pTabBarMachine->setVisible(true);
+            break;
+        }
+        case TabBarType_Global:
+        {
+            if (m_pTabBarMachine)
+                m_pTabBarMachine->setVisible(false);
+            if (m_pTabBarGlobal)
+                m_pTabBarGlobal->setVisible(true);
+            break;
+        }
+    }
+}
+
 void UIToolbarTools::setTabBarEnabledMachine(bool fEnabled)
 {
@@ -163 +187 @@
 }
 
-void UIToolbarTools::sltHandleActionToggle()
-{
-    /* Handle known actions: */
-    if (m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->isChecked())
-    {
-        if (m_pTabBarGlobal)
-            m_pTabBarGlobal->setVisible(false);
-        if (m_pTabBarMachine)
-            m_pTabBarMachine->setVisible(true);
-    }
-    else if (m_pActionPool->action(UIActionIndexST_M_Tools_T_Global)->isChecked())
-    {
-        if (m_pTabBarMachine)
-            m_pTabBarMachine->setVisible(false);
-        if (m_pTabBarGlobal)
-            m_pTabBarGlobal->setVisible(true);
-    }
-}
-
 void UIToolbarTools::prepare()
 {
@@ -188 +193 @@
     /* Prepare widgets: */
     prepareWidgets();
-
-    /* Make sure just one tab-bar shown initially: */
-    sltHandleActionToggle();
 }
 
@@ -223 +225 @@
     /* Configure 'Machine' toggle action: */
     m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->setMenu(pMenuMachine);
-    connect(m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine), &UIAction::toggled,
-            this, &UIToolbarTools::sltHandleActionToggle);
 
     /* Configure 'Global' menu: */
@@ -247 +247 @@
     /* Configure 'Global' toggle action: */
     m_pActionPool->action(UIActionIndexST_M_Tools_T_Global)->setMenu(pMenuGlobal);
-    connect(m_pActionPool->action(UIActionIndexST_M_Tools_T_Global), &UIAction::toggled,
-            this, &UIToolbarTools::sltHandleActionToggle);
-
-    /* By default 'Machine' toggle action is toggled: */
-    m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->setChecked(true);
 }
 
@@ -280 +275 @@
         if (m_pTabBarGlobal)
         {
-            /* Configure tab-bar connections: */
             connect(m_pTabBarGlobal, &UITabBar::sigTabRequestForClosing,
                     this, &UIToolbarTools::sltHandleCloseToolGlobal);
@@ -291 +285 @@
 
         /* Let the tab-bars know our opinion: */
-        sltHandleActionToggle();
-    }
-}
+        switchToTabBar(TabBarType_Machine);
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.h

@@ -57 +57 @@
 public:
 
+    /** Tab-bar types. */
+    enum TabBarType { TabBarType_Machine, TabBarType_Global };
+
     /** Constructs Tools toolbar passing @a pParent to the base-class.
       * @param  pActionPool  Brings the action-pool to take corresponding actions from. */
     UIToolbarTools(UIActionPool *pActionPool, QWidget *pParent = 0);
+
+    /** Switches to tab-bar of certain @a enmType. */
+    void switchToTabBar(TabBarType enmType);
 
     /** Defines whether Machine tab-bar is @a fEnabled. */
@@ -88 +94 @@
     void sltHandleToolChosenGlobal(const QUuid &uuid);
 
-    /** Handles action toggle. */
-    void sltHandleActionToggle();
-
 private: