Changeset 108122 in vbox

Timestamp:

Feb 9, 2025 5:34:28 PM (12 days ago)

Author:

vboxsync

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

167421

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Introduce Aux item class and Toggle item type; Handle Toggle item click to show/hide tool item names; This stuff will replace extra-button stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• manager/tools/UIToolsModel.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -286 +286 @@
     switch (enmClass)
     {
+        case UIToolClass_Aux:
+        {
+            switch (enmType)
+            {
+                case UIToolType_Toggle:
+                    return true;
+                default:
+                    break;
+            }
+            break;
+        }
         case UIToolClass_Global:
         {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -939 +939 @@
 {
     UIToolClass_Invalid,
+    UIToolClass_Aux,
     UIToolClass_Global,
     UIToolClass_Machine
@@ -948 +949 @@
 {
     UIToolType_Invalid,
+    /* Aux types: */
+    UIToolType_Toggle,
     /* Global types: */
     UIToolType_Home,

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

@@ -340 +340 @@
     const QSize viewportSize = scene()->views()[0]->viewport()->size();
     const int iViewportWidth = viewportSize.width();
+    const int iViewportHeight = viewportSize.height();
+
+    /* Start from above: */
     int iVerticalIndent = iMargin;
 
-    /* Layout the children: */
+    /* Layout normal children: */
     foreach (UIToolsItem *pItem, items())
     {
+        /* Skip aux children: */
+        if (pItem->itemClass() == UIToolClass_Aux)
+            continue;
+
         /* Make sure item visible: */
         if (!pItem->isVisible())
@@ -357 +364 @@
         /* Advance vertical indent: */
         iVerticalIndent += (pItem->minimumHeightHint() + iSpacing);
+    }
+
+    /* Start from bottom: */
+    iVerticalIndent = iViewportHeight - iMargin;
+
+    /* Layout aux children: */
+    foreach (UIToolsItem *pItem, items())
+    {
+        /* Skip normal children: */
+        if (pItem->itemClass() != UIToolClass_Aux)
+            continue;
+
+        /* Set item position: */
+        pItem->setPos(iMargin, iVerticalIndent - pItem->minimumHeightHint());
+        /* Set root-item size: */
+        pItem->resize(iViewportWidth, pItem->minimumHeightHint());
+        /* Make sure item is shown: */
+        pItem->show();
+        /* Decrease vertical indent: */
+        iVerticalIndent -= (pItem->minimumHeightHint() + iSpacing);
     }
 }
@@ -423 +450 @@
                 if (pClickedItem)
                 {
-                    /* Do we have extra-button? */
-                    if (pClickedItem->hasExtraButton())
+                    /* Handle known item classes: */
+                    switch (pClickedItem->itemClass())
                     {
-                        /* Check if clicked place is within extra-button geometry: */
-                        const QPointF itemPos = pClickedItem->mapFromParent(scenePos);
-                        if (pClickedItem->extraButtonRect().contains(itemPos.toPoint()))
+                        case UIToolClass_Aux:
                         {
-                            /* Handle known button types: */
+                            /* Handle known item types: */
                             switch (pClickedItem->itemType())
                             {
-                                case UIToolType_Home:
+                                case UIToolType_Toggle:
                                 {
                                     /* Toggle the button: */
@@ -442 +467 @@
                                     /* Recalculate layout: */
                                     updateLayout();
-                                    break;
+                                    return true;
                                 }
                                 default:
                                     break;
                             }
+                            break;
                         }
-                    }
-
-                    /* Make clicked item the current one: */
-                    if (pClickedItem->isEnabled())
-                    {
-                        setCurrentItem(pClickedItem);
-                        /* Close the widget in popup mode only: */
-                        if (tools()->isPopup())
-                            close();
-                        return true;
+                        case UIToolClass_Global:
+                        case UIToolClass_Machine:
+                        {
+                            /* Make clicked item the current one: */
+                            if (pClickedItem->isEnabled())
+                            {
+                                setCurrentItem(pClickedItem);
+                                /* Close the widget in popup mode only: */
+                                if (tools()->isPopup())
+                                    close();
+                                return true;
+                            }
+                            break;
+                        }
+                        default:
+                            break;
                     }
                 }
@@ -490 +522 @@
         {
             case UIToolType_Home:        pItem->setName(tr("Home")); break;
+            case UIToolType_Toggle:      pItem->setName(QString()); break;
             case UIToolType_Extensions:  pItem->setName(tr("Extensions")); break;
             case UIToolType_Media:       pItem->setName(tr("Media")); break;
@@ -536 +569 @@
             m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/welcome_screen_24px.png",
                                                                     ":/welcome_screen_24px.png"),
-                                       UIToolClass_Global, UIToolType_Home,
-                                       !tools()->isPopup() /* extra-button */);
+                                       UIToolClass_Global, UIToolType_Home);
 
 #ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
@@ -570 +602 @@
                                                                     ":/resources_monitor_disabled_24px.png"),
                                        UIToolClass_Global, UIToolType_Activities);
+
+#ifdef VBOX_GUI_WITH_ADVANCED_WIDGETS
+            /* Toggle: */
+            m_items << new UIToolsItem(scene(), UIIconPool::iconSet(":/tools_menu_24px.png",
+                                                                    ":/tools_menu_24px.png"),
+                                       UIToolClass_Aux, UIToolType_Toggle);
+#endif
 
             break;