Changeset 107386 in vbox for trunk

Timestamp:

Dec 19, 2024 2:49:30 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166429

Message:

FE/Qt: bugref:10814: VBox Manager: Swap priorities for horizontal and vertical tool-bar layouts in advanced widget architecture.

Location:

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

Files:

• UIGlobalToolsManagerWidget.cpp (modified) (5 diffs)
• UIGlobalToolsManagerWidget.h (modified) (3 diffs)
• UIVirtualBoxManagerAdvancedWidget.cpp (modified) (2 diffs)

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

@@ -27 +27 @@
 
 /* Qt includes: */
-#include <QHBoxLayout>
+#include <QGridLayout>
 
 /* GUI includes: */
+#include "QIToolBar.h"
 #include "UIChooser.h"
 #include "UICommon.h"
@@ -48 +49 @@
     : QWidget(pParent)
     , m_pActionPool(pActionPool)
+    , m_pLayout(0)
     , m_pMenu(0)
     , m_pPane(0)
 {
     prepare();
+}
+
+void UIGlobalToolsManagerWidget::addToolBar(QIToolBar *pToolBar)
+{
+    AssertPtrReturnVoid(m_pLayout);
+    m_pLayout->addWidget(pToolBar, 0, 1);
 }
 
@@ -207 +215 @@
 {
     /* Create layout: */
-    QHBoxLayout *pLayout = new QHBoxLayout(this);
-    if (pLayout)
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
     {
         /* Configure layout: */
-        pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create tool-menu: */
@@ -218 +226 @@
         {
             /* Add into layout: */
-            pLayout->addWidget(toolMenu());
+            m_pLayout->addWidget(toolMenu(), 0, 0, 2, 1);
         }
 
@@ -229 +237 @@
 
             /* Add into layout: */
-            pLayout->addWidget(toolPane());
+            m_pLayout->addWidget(toolPane(), 1, 1);
         }
     }

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

@@ -39 +39 @@
 
 /* Forward declarations: */
+class QGridLayout;
+class QIToolBar;
 class UIActionPool;
 class UIChooser;
@@ -70 +72 @@
         /** Returns the action-pool reference. */
         UIActionPool *actionPool() const { return m_pActionPool; }
+    /** @} */
+
+    /** @name Tool-bar stuff.
+      * @{ */
+        /** Adds tool-bar into grid layout. */
+        void addToolBar(QIToolBar *pToolBar);
     /** @} */
 
@@ -164 +172 @@
     UIActionPool *m_pActionPool;
 
+    /** Holds the grid-layout instance. */
+    QGridLayout *m_pLayout;
+
     /** Holds the Tools-menu instance. */
     UITools          *m_pMenu;

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

@@ -361 +361 @@
         pLayout->setContentsMargins(0, 0, 0, 0);
 
+        /* Create Global Tool Manager: */
+        m_pGlobalToolManager = new UIGlobalToolsManagerWidget(this, actionPool());
+        if (globalToolManager())
+        {
+            /* Add into layout: */
+            pLayout->addWidget(globalToolManager());
+        }
+
         /* Create Main toolbar: */
         m_pToolBar = new QIToolBar(this);
@@ -395 +403 @@
 
             /* Add toolbar into layout: */
-            pLayout->addWidget(m_pToolBar);
-        }
-
-        /* Create Global Tool Manager: */
-        m_pGlobalToolManager = new UIGlobalToolsManagerWidget(this, actionPool());
-        if (globalToolManager())
-        {
-            /* Add into layout: */
-            pLayout->addWidget(globalToolManager());
+            m_pGlobalToolManager->addToolBar(m_pToolBar);
         }
     }