Changeset 102111 in vbox

Timestamp:

Nov 15, 2023 4:01:07 PM (17 months ago)

Author:

vboxsync

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

160232

Message:

FE/Qt: bugref:10513: VBox Manager: Make sure Chooser pane let Tool menu know which machine item (if any) caused popup-menu to be shown; That is useful as a hint to determine machine status while updating machine Tool popup-menu.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• UIVirtualBoxManagerWidget.h (modified) (2 diffs)
• chooser/UIChooser.cpp (modified) (2 diffs)
• chooser/UIChooser.h (modified) (2 diffs)
• chooser/UIChooserModel.cpp (modified) (1 diff)
• chooser/UIChooserModel.h (modified) (1 diff)

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

@@ -535 +535 @@
 }
 
-void UIVirtualBoxManagerWidget::sltHandleToolMenuRequested(UIToolClass enmClass, const QPoint &position)
-{
-    /* Determine tools menu: */
-    UITools *pMenu = 0;
-    switch (enmClass)
-    {
-        case UIToolClass_Global: pMenu = m_pMenuToolsGlobal; break;
-        case UIToolClass_Machine: pMenu = m_pMenuToolsMachine; updateToolsMenuMachine(); break;
-        default: break;
-    }
+void UIVirtualBoxManagerWidget::sltHandleToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem)
+{
+    /* Update tools menu beforehand: */
+    UITools *pMenu = pItem ? m_pMenuToolsMachine : m_pMenuToolsGlobal;
     AssertPtrReturnVoid(pMenu);
+    if (pItem)
+        updateToolsMenuMachine(pItem);
 
     /* Compose popup-menu geometry first of all: */
@@ -1117 +1113 @@
 }
 
-void UIVirtualBoxManagerWidget::updateToolsMenuMachine()
-{
-    /* Get current item: */
-    UIVirtualMachineItem *pItem = currentItem();
+void UIVirtualBoxManagerWidget::updateToolsMenuMachine(UIVirtualMachineItem *pItem)
+{
+    /* Get current item state: */
     const bool fCurrentItemIsOk = pItem && pItem->accessible();
 

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

@@ -303 +303 @@
     /** @name Tools pane stuff.
       * @{ */
-        /** Handles tool menu request. */
-        void sltHandleToolMenuRequested(UIToolClass enmClass, const QPoint &position);
+        /** Handles tool popup-menu request. */
+        void sltHandleToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem);
 
         /** Handles signal about Tools-pane index change. */
@@ -341 +341 @@
     /** @name Tools / Common stuff.
       * @{ */
-        /** Updates Machine tools menu. */
-        void updateToolsMenuMachine();
+        /** Updates Machine tools menu for @a pItem specified. */
+        void updateToolsMenuMachine(UIVirtualMachineItem *pItem);
 
         /** Recaches current item information.

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

@@ -34 +34 @@
 #include "UIChooserModel.h"
 #include "UIChooserView.h"
+#include "UIVirtualMachineItem.h"
 
 
@@ -212 +213 @@
 }
 
-void UIChooser::sltToolMenuRequested(UIToolClass enmClass, const QPoint &position)
+void UIChooser::sltToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem)
 {
     /* Translate scene coordinates to global one: */
     AssertPtrReturnVoid(view());
-    emit sigToolMenuRequested(enmClass, mapToGlobal(view()->mapFromScene(position)));
+    emit sigToolMenuRequested(mapToGlobal(view()->mapFromScene(position)), pItem);
 }
 

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

@@ -71 +71 @@
     /** @name Tool stuff.
       * @{ */
-        /** Notifies listeners about tool popup-menu request for certain @a enmClass and @a position. */
-        void sigToolMenuRequested(UIToolClass enmClass, const QPoint &position);
+        /** Notifies listeners about tool popup-menu request for certain @a position and optionally machine @a pItem. */
+        void sigToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem);
     /** @} */
 
@@ -198 +198 @@
     /** @name General stuff.
       * @{ */
-        /** Handles signal about tool popup-menu request for certain tool @a enmClass and in specified @a position. */
-        void sltToolMenuRequested(UIToolClass enmClass, const QPoint &position);
+        /** Handles signal about tool popup-menu request for certain @a position and optionally machine @a pItem. */
+        void sltToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem);
     /** @} */
 

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

@@ -126 +126 @@
 void UIChooserModel::handleToolButtonClick(UIChooserItem *pItem)
 {
-    switch (pItem->type())
-    {
-        case UIChooserNodeType_Global:
-            emit sigToolMenuRequested(UIToolClass_Global, pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint());
-            break;
-        case UIChooserNodeType_Machine:
-            emit sigToolMenuRequested(UIToolClass_Machine, pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint());
-            break;
-        default:
-            break;
-    }
+    emit sigToolMenuRequested(pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint(),
+                              pItem->type() == UIChooserNodeType_Machine ? pItem->toMachineItem()->cache() : 0);
 }
 

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

@@ -67 +67 @@
     /** @name Tool stuff.
       * @{ */
-        /** Notifies listeners about tool popup-menu request for certain @a enmClass and @a position. */
-        void sigToolMenuRequested(UIToolClass enmClass, const QPoint &position);
+        /** Notifies listeners about tool popup-menu request for certain @a position and optionally machine @a pItem. */
+        void sigToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem);
     /** @} */