Changeset 74483 in vbox for trunk

Timestamp:

Sep 26, 2018 4:27:10 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Chooser and Tools panes: Handle tools button click for machine/global items; rework Tools pane to be popup widget.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (2 diffs)
• chooser/UIChooserHandlerMouse.cpp (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (1 diff)
• chooser/UIChooserModel.h (modified) (3 diffs)
• tools/UITools.cpp (modified) (2 diffs)
• tools/UIToolsItem.cpp (modified) (1 diff)
• tools/UIToolsView.cpp (modified) (1 diff)

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

@@ -308 +308 @@
     /* Then handle current item change (again!): */
     sltHandleChooserPaneIndexChangeDefault();
+}
+
+void UIVirtualBoxManagerWidget::sltHandleToolMenuRequested(UIToolsClass enmClass, const QPoint &position)
+{
+    m_pPaneTools->setToolsClass(enmClass);
+    if (m_pPaneTools->minimumSize().isValid())
+        m_pPaneTools->resize(m_pPaneTools->minimumSize());
+    m_pPaneTools->move(m_pPaneChooser->mapToGlobal(position));
+    m_pPaneTools->show();
 }
 
@@ -507 +516 @@
             else
                 m_pPaneTools->setToolsClass(UIToolsClass_Machine);
-
-            /* Add into layout: */
-            pLayoutMain->addWidget(m_pPaneTools);
         }
     }
@@ -536 +542 @@
     connect(m_pPaneChooser, &UIChooser::sigGroupSavingStateChanged,
             this, &UIVirtualBoxManagerWidget::sigGroupSavingStateChanged);
+    connect(m_pPaneChooser, &UIChooser::sigToolMenuRequested,
+            this, &UIVirtualBoxManagerWidget::sltHandleToolMenuRequested);
 
     /* Details-pane connections: */

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

@@ -138 +138 @@
     /** @name Tools stuff.
       * @{ */
+        /** Handles tool menu request. */
+        void sltHandleToolMenuRequested(UIToolsClass enmClass, const QPoint &position);
+
         /** Handles signal abour Tools-pane index change. */
         void sltHandleToolsPaneIndexChange();

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -171 +171 @@
     connect(m_pChooserModel, &UIChooserModel::sigFocusChanged,
             m_pChooserView, &UIChooserView::sltFocusChanged);
+    connect(m_pChooserModel, &UIChooserModel::sigToolMenuRequested,
+            this, &UIChooser::sigToolMenuRequested);
 
     /* Setup chooser-view connections: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -21 +21 @@
 /* Qt includes: */
 #include <QWidget>
+
+/* GUI includes: */
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
@@ -49 +52 @@
         /** Notifies listeners about toggling finished. */
         void sigToggleFinished();
+
+        /** Notifies listeners about tool popup-menu request for certain tool @a enmClass and in specified @a position. */
+        void sigToolMenuRequested(UIToolsClass enmClass, const QPoint &position);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp

@@ -76 +76 @@
                 /* Or a global one? */
                 else if (UIChooserItemGlobal *pGlobalItem = qgraphicsitem_cast<UIChooserItemGlobal*>(pItemUnderMouse))
-                    pClickedItem = pGlobalItem;
+                {
+                    const QPoint itemCursorPos = pGlobalItem->mapFromScene(scenePos).toPoint();
+                    if (model()->currentItem() == pGlobalItem && pGlobalItem->isToolsButtonArea(itemCursorPos))
+                        model()->handleToolButtonClick(pGlobalItem);
+                    else
+                        pClickedItem = pGlobalItem;
+                }
                 /* Or a machine one? */
                 else if (UIChooserItemMachine *pMachineItem = qgraphicsitem_cast<UIChooserItemMachine*>(pItemUnderMouse))
-                    pClickedItem = pMachineItem;
+                {
+                    const QPoint itemCursorPos = pMachineItem->mapFromScene(scenePos).toPoint();
+                    if (model()->currentItem() == pMachineItem && pMachineItem->isToolsButtonArea(itemCursorPos))
+                        model()->handleToolButtonClick(pMachineItem);
+                    else
+                        pClickedItem = pMachineItem;
+                }
                 /* If we had clicked one of required item types: */
                 if (pClickedItem && !pClickedItem->isRoot())

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -150 +150 @@
 {
     return scene()->itemAt(position, deviceTransform);
+}
+
+void UIChooserModel::handleToolButtonClick(UIChooserItem *pItem)
+{
+    switch (pItem->type())
+    {
+        case UIChooserItemType_Global:
+            emit sigToolMenuRequested(UIToolsClass_Global, pItem->geometry().topRight().toPoint());
+            break;
+        case UIChooserItemType_Group:
+        case UIChooserItemType_Machine:
+            emit sigToolMenuRequested(UIToolsClass_Machine, pItem->geometry().topRight().toPoint());
+            break;
+        default:
+            break;
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -28 +28 @@
 /* GUI includes: */
 #include "UIChooserItem.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
@@ -63 +64 @@
 signals:
 
+    /** @name General stuff.
+      * @{ */
+        /** Notify listeners about tool menu popup request for certain @a enmClass and @a position. */
+        void sigToolMenuRequested(UIToolsClass enmClass, const QPoint &position);
+    /** @} */
+
     /** @name Selection stuff.
       * @{ */
@@ -120 +127 @@
         /** Returns item at @a position, taking into account possible @a deviceTransform. */
         QGraphicsItem *itemAt(const QPointF &position, const QTransform &deviceTransform = QTransform()) const;
+
+        /** Handles tool button click for certain @a pItem. */
+        void handleToolButtonClick(UIChooserItem *pItem);
     /** @} */
 

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

@@ -34 +34 @@
 
 UITools::UITools(UIVirtualBoxManagerWidget *pParent)
-    : QWidget(pParent)
+    : QWidget(pParent, Qt::Popup)
     , m_pManagerWidget(pParent)
     , m_pMainLayout(0)
@@ -122 +122 @@
     {
         /* Configure main-layout: */
-        m_pMainLayout->setContentsMargins(1, 0, 0, 0);
+        m_pMainLayout->setContentsMargins(1, 1, 1, 1);
         m_pMainLayout->setSpacing(0);
     }

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

@@ -764 +764 @@
 
     /* Draw frame: */
-    pPainter->drawLine(rectangle.topLeft(), rectangle.topRight() + QPoint(1, 0));
-    pPainter->drawLine(rectangle.bottomLeft() + QPoint(0, 1), rectangle.bottomRight() + QPoint(1, 1));
+    pPainter->drawRect(rectangle);
 
     /* Restore painter: */

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

@@ -147 +147 @@
     m_iMinimumHeightHint = iHint;
 
+    /* Set minimum view height according passed height-hint: */
+    setMinimumHeight(2 * frameWidth() + m_iMinimumHeightHint);
+
     /* Update scene-rect: */
     updateSceneRect();