Changeset 108967 in vbox

Timestamp:

Apr 14, 2025 6:06:29 PM (6 days ago)

Author:

vboxsync

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

168487

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane model: Support for horizontal layout; This still have to be handled on layout side.

Location:

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

Files:

• UITools.cpp (modified) (1 diff)
• UIToolsModel.cpp (modified) (3 diffs)
• UIToolsModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp

@@ -125 +125 @@
 {
     /* Prepare model: */
-    m_pToolsModel = new UIToolsModel(this, m_pActionPool);
+    m_pToolsModel = new UIToolsModel(this, m_enmClass, m_pActionPool);
     if (m_pToolsModel)
         prepareView();

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -363 +363 @@
 *********************************************************************************************************************************/
 
-UIToolsModel::UIToolsModel(QObject *pParent, UIActionPool *pActionPool)
+UIToolsModel::UIToolsModel(QObject *pParent, UIToolClass enmClass, UIActionPool *pActionPool)
     : QObject(pParent)
+    , m_enmClass(enmClass)
     , m_pActionPool(pActionPool)
+    , m_enmAlignment(m_enmClass == UIToolClass_Machine ? Qt::Horizontal : Qt::Vertical)
     , m_pView(0)
     , m_pScene(0)
@@ -754 +756 @@
     /* Prepare variables: */
     const int iMargin = data(ToolsModelData_Margin).toInt();
+    const int iSpacing = data(ToolsModelData_Spacing).toInt();
 
     /* Calculate maximum horizontal width: */
     int iMinimumWidthHint = 0;
     iMinimumWidthHint += 2 * iMargin;
-    foreach (UIToolsItem *pItem, items())
-        iMinimumWidthHint = qMax(iMinimumWidthHint, pItem->minimumWidthHint());
+
+    switch (m_enmAlignment)
+    {
+        case Qt::Vertical:
+            foreach (UIToolsItem *pItem, items())
+                iMinimumWidthHint = qMax(iMinimumWidthHint, pItem->minimumWidthHint());
+            break;
+        case Qt::Horizontal:
+            foreach (UIToolsItem *pItem, items())
+                if (pItem->isVisible())
+                    iMinimumWidthHint += (pItem->minimumWidthHint() + iSpacing);
+            iMinimumWidthHint -= iSpacing;
+            break;
+    }
 
     /* Notify listeners: */
@@ -774 +789 @@
     int iMinimumHeightHint = 0;
     iMinimumHeightHint += 2 * iMargin;
-    foreach (UIToolsItem *pItem, items())
-        if (pItem->isVisible())
-            iMinimumHeightHint += (pItem->minimumHeightHint() + iSpacing);
-    iMinimumHeightHint -= iSpacing;
+
+    switch (m_enmAlignment)
+    {
+        case Qt::Vertical:
+            foreach (UIToolsItem *pItem, items())
+                if (pItem->isVisible())
+                    iMinimumHeightHint += (pItem->minimumHeightHint() + iSpacing);
+            iMinimumHeightHint -= iSpacing;
+            break;
+        case Qt::Horizontal:
+            foreach (UIToolsItem *pItem, items())
+                iMinimumHeightHint = qMax(iMinimumHeightHint, pItem->minimumHeightHint());
+            break;
+    }
 
     /* Notify listeners: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -84 +84 @@
 
     /** Constructs Tools-model passing @a pParent to the base-class.
+      * @param  enmClass     Brings the tool class.
       * @param  pActionPool  Brings the action-pool reference. */
-    UIToolsModel(QObject *pParent, UIActionPool *pActionPool);
+    UIToolsModel(QObject *pParent,
+                 UIToolClass enmClass,
+                 UIActionPool *pActionPool);
     /** Destructs Tools-model. */
     virtual ~UIToolsModel() RT_OVERRIDE;
@@ -237 +240 @@
     /** @name General stuff.
       * @{ */
+        /** Holds the tool class. */
+        UIToolClass  m_enmClass;
+
         /** Holds the action-pool reference. */
         UIActionPool *m_pActionPool;
+
+        /** Holds the layout alignment. */
+        Qt::Alignment  m_enmAlignment;
 
         /** Holds the view reference. */