Changeset 73881 in vbox for trunk

Timestamp:

Aug 24, 2018 4:20:03 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: UIToolbarTools: Temporary buttons for add-new-tool action.

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

@@ -26 +26 @@
 # include <QLabel>
 # include <QStyle>
-# include <QToolButton>
 
 /* GUI includes: */
+# include "QIToolButton.h"
 # include "UIActionPoolSelector.h"
+# include "UIIconPool.h"
 # include "UITabBar.h"
 # include "UIToolBar.h"
@@ -40 +41 @@
     : QWidget(pParent)
     , m_pActionPool(pActionPool)
+    , m_pLayoutMain(0)
     , m_pTabBarMachine(0)
     , m_pTabBarGlobal(0)
-    , m_pLayoutMain(0)
+    , m_pButtonMachine(0)
+    , m_pButtonGlobal(0)
 {
     prepare();
@@ -56 +59 @@
             if (m_pTabBarGlobal)
                 m_pTabBarGlobal->setVisible(false);
+            if (m_pButtonGlobal)
+                m_pButtonGlobal->setVisible(false);
             if (m_pTabBarMachine)
                 m_pTabBarMachine->setVisible(true);
+            if (m_pButtonMachine)
+                m_pButtonMachine->setVisible(true);
             break;
         }
@@ -64 +71 @@
             if (m_pTabBarMachine)
                 m_pTabBarMachine->setVisible(false);
+            if (m_pButtonMachine)
+                m_pButtonMachine->setVisible(false);
             if (m_pTabBarGlobal)
                 m_pTabBarGlobal->setVisible(true);
+            if (m_pButtonGlobal)
+                m_pButtonGlobal->setVisible(true);
             break;
         }
@@ -75 +86 @@
     /* Update Machine tab-bar availability: */
     m_pTabBarMachine->setEnabled(fEnabled);
+    m_pButtonMachine->setEnabled(fEnabled);
 }
 
@@ -81 +93 @@
     /* Update Global tab-bar availability: */
     m_pTabBarGlobal->setEnabled(fEnabled);
+    m_pButtonGlobal->setEnabled(fEnabled);
 }
 
@@ -287 +300 @@
         }
 
+        /* Let's use the simple button for now: */
+        m_pButtonMachine = new QIToolButton;
+        if (m_pButtonMachine)
+        {
+
+            const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+            m_pButtonMachine->setIconSize(QSize(iMetric, iMetric));
+            m_pButtonMachine->setIcon(UIIconPool::iconSet(":/edata_add_16px.png"));
+            m_pButtonMachine->setMenu(m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->menu());
+            m_pButtonMachine->setPopupMode(QToolButton::InstantPopup);
+
+            /* Add into layout: */
+            m_pLayoutMain->addWidget(m_pButtonMachine);
+        }
+
+        /* Let's use the simple button for now: */
+        m_pButtonGlobal = new QIToolButton;
+        if (m_pButtonGlobal)
+        {
+
+            const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+            m_pButtonGlobal->setIconSize(QSize(iMetric, iMetric));
+            m_pButtonGlobal->setIcon(UIIconPool::iconSet(":/edata_add_16px.png"));
+            m_pButtonGlobal->setMenu(m_pActionPool->action(UIActionIndexST_M_Tools_T_Global)->menu());
+            m_pButtonGlobal->setPopupMode(QToolButton::InstantPopup);
+
+            /* Add into layout: */
+            m_pLayoutMain->addWidget(m_pButtonGlobal);
+        }
+
         /* Let the tab-bars know our opinion: */
         switchToTabBar(TabBarType_Machine);

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

@@ -33 +33 @@
 class QUuid;
 class QWidget;
+class QIToolButton;
 class UIActionPool;
 class UITabBar;
@@ -107 +108 @@
 
     /** Holds the main layout instance. */
-    QHBoxLayout *m_pLayoutMain;
+    QHBoxLayout  *m_pLayoutMain;
     /** Holds the Machine tab-bar instance. */
-    UITabBar    *m_pTabBarMachine;
+    UITabBar     *m_pTabBarMachine;
     /** Holds the Global tab-bar instance. */
-    UITabBar    *m_pTabBarGlobal;
+    UITabBar     *m_pTabBarGlobal;
+    /** Holds the Machine tab-bar button. */
+    QIToolButton *m_pButtonMachine;
+    /** Holds the Global tab-bar button. */
+    QIToolButton *m_pButtonGlobal;
 
     /** Holds the map of opened Machine tool IDs. */