Changeset 107943 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 27, 2025 3:59:36 PM (3 months ago)

Author:

vboxsync

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

167190

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Merging mouse handler code to model as it's too small.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/manager/tools/UIToolsHandlerMouse.cpp (deleted)
• src/manager/tools/UIToolsHandlerMouse.h (deleted)
• src/manager/tools/UIToolsModel.cpp (modified) (7 diffs)
• src/manager/tools/UIToolsModel.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -636 +636 @@
         src/manager/tools/UIToolsModel.h \
         src/manager/tools/UIToolsView.h \
-        src/manager/tools/UIToolsHandlerMouse.h \
         src/manager/tools/UIToolsItem.h \
         src/medium/UIMediumDetailsWidget.h \
@@ -1169 +1168 @@
         src/manager/tools/UIToolsModel.cpp \
         src/manager/tools/UIToolsView.cpp \
-        src/manager/tools/UIToolsHandlerMouse.cpp \
         src/manager/tools/UIToolsItem.cpp \
         src/medium/UIMediumDetailsWidget.cpp \

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

@@ -40 +40 @@
 #include "UILoggingDefs.h"
 #include "UITools.h"
-#include "UIToolsHandlerMouse.h"
 #include "UIToolsModel.h"
 #include "UITranslationEventListener.h"
@@ -66 +65 @@
     , m_pTools(pParent)
     , m_pScene(0)
-    , m_pMouseHandler(0)
     , m_fItemsEnabled(true)
 {
@@ -400 +398 @@
         /* Mouse handler: */
         case QEvent::GraphicsSceneMousePress:
-            return m_pMouseHandler->handle(static_cast<QGraphicsSceneMouseEvent*>(pEvent), UIMouseEventType_Press);
-        case QEvent::GraphicsSceneMouseRelease:
-            return m_pMouseHandler->handle(static_cast<QGraphicsSceneMouseEvent*>(pEvent), UIMouseEventType_Release);
-        /* Shut up MSC: */
-        default: break;
+        {
+            /* Acquire event: */
+            QGraphicsSceneMouseEvent *pMouseEvent = static_cast<QGraphicsSceneMouseEvent*>(pEvent);
+            /* Get item under mouse cursor: */
+            QPointF scenePos = pMouseEvent->scenePos();
+            if (QGraphicsItem *pItemUnderMouse = itemAt(scenePos))
+            {
+                /* Which button it was? */
+                switch (pMouseEvent->button())
+                {
+                    /* Both buttons: */
+                    case Qt::LeftButton:
+                    case Qt::RightButton:
+                    {
+                        /* Which item we just clicked? */
+                        UIToolsItem *pClickedItem = qgraphicsitem_cast<UIToolsItem*>(pItemUnderMouse);
+                        /* Make clicked item the current one: */
+                        if (pClickedItem && pClickedItem->isEnabled())
+                        {
+                            setCurrentItem(pClickedItem);
+                            close();
+                            return true;
+                        }
+                        break;
+                    }
+                    default:
+                        break;
+                }
+            }
+            break;
+        }
+        default:
+            break;
     }
 
@@ -447 +473 @@
     /* Prepare items: */
     prepareItems();
-    /* Prepare handlers: */
-    prepareHandlers();
     /* Apply language settings: */
     sltRetranslateUI();
@@ -540 +564 @@
             break;
     }
-}
-
-void UIToolsModel::prepareHandlers()
-{
-    m_pMouseHandler = new UIToolsHandlerMouse(this);
 }
 
@@ -596 +615 @@
 }
 
-void UIToolsModel::cleanupHandlers()
-{
-    delete m_pMouseHandler;
-    m_pMouseHandler = 0;
-}
-
 void UIToolsModel::cleanupItems()
 {
@@ -617 +630 @@
 void UIToolsModel::cleanup()
 {
-    /* Cleanup handlers: */
-    cleanupHandlers();
     /* Cleanup items: */
     cleanupItems();

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

@@ -53 +53 @@
 class UIActionPool;
 class UITools;
-class UIToolsHandlerMouse;
 
 /** QObject extension used as VM Tools-pane model: */
@@ -228 +227 @@
         /** Prepares items. */
         void prepareItems();
-        /** Prepares handlers. */
-        void prepareHandlers();
         /** Loads settings. */
         void loadSettings();
@@ -236 +233 @@
         static void loadLastToolTypes(UIToolType &enmTypeGlobal, UIToolType &enmTypeMachine);
 
-        /** Cleanups handlers. */
-        void cleanupHandlers();
         /** Cleanups items. */
         void cleanupItems();
@@ -263 +258 @@
         QGraphicsScene *m_pScene;
 
-        /** Holds the mouse handler instance. */
-        UIToolsHandlerMouse *m_pMouseHandler;
-
         /** Holds whether items enabled. */
         bool  m_fItemsEnabled;