Changeset 83482 in vbox for trunk/src/VBox

Timestamp:

Mar 30, 2020 1:35:12 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686: VirtualBox Manager: Handle change for current tool and active tool-pane allowing global and machine tools to be aware whether they are not just currently chosen but active as well.

Location:

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

Files:

• UIToolPaneGlobal.cpp (modified) (5 diffs)
• UIToolPaneGlobal.h (modified) (3 diffs)
• UIToolPaneMachine.cpp (modified) (5 diffs)
• UIToolPaneMachine.h (modified) (3 diffs)
• UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)

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

@@ -45 +45 @@
     , m_pPaneCloud(0)
     , m_pPaneResourceMonitor(0)
+    , m_fActive(false)
 {
     /* Prepare: */
@@ -54 +55 @@
     /* Cleanup: */
     cleanup();
+}
+
+void UIToolPaneGlobal::setActive(bool fActive)
+{
+    /* Save activity: */
+    if (m_fActive != fActive)
+    {
+        m_fActive = fActive;
+
+        /* Handle token change: */
+        handleTokenChange();
+    }
 }
 
@@ -194 +207 @@
         }
     }
+
+    /* Handle token change: */
+    handleTokenChange();
 }
 
@@ -221 +237 @@
         delete pWidget;
     }
+
+    /* Handle token change: */
+    handleTokenChange();
 }
 
@@ -242 +261 @@
     }
 }
+
+void UIToolPaneGlobal::handleTokenChange()
+{
+    // printf("UIToolPaneGlobal::handleTokenChange: Active = %d, current tool = %d\n", m_fActive, currentTool());
+}

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

@@ -59 +59 @@
     virtual ~UIToolPaneGlobal() /* override */;
 
+    /** Defines whether this pane is @a fActive. */
+    void setActive(bool fActive);
+    /** Returns whether this pane is active. */
+    bool active() const { return m_fActive; }
+
     /** Returns type of tool currently opened. */
     UIToolType currentTool() const;
@@ -77 +82 @@
     void cleanup();
 
+    /** Handles token change. */
+    void handleTokenChange();
+
     /** Holds the action pool reference. */
     UIActionPool *m_pActionPool;
@@ -92 +100 @@
     /** Holds the VM Resource Monitor instance. */
     UIResourceMonitorWidget     *m_pPaneResourceMonitor;
+
+    /** Holds whether this pane is active. */
+    bool  m_fActive;
 };
 

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

@@ -46 +46 @@
     , m_pPaneSnapshots(0)
     , m_pPaneLogViewer(0)
+    , m_fActive(false)
 {
     /* Prepare: */
@@ -55 +56 @@
     /* Cleanup: */
     cleanup();
+}
+
+void UIToolPaneMachine::setActive(bool fActive)
+{
+    /* Save activity: */
+    if (m_fActive != fActive)
+    {
+        m_fActive = fActive;
+
+        /* Handle token change: */
+        handleTokenChange();
+    }
 }
 
@@ -175 +188 @@
         }
     }
+
+    /* Handle token change: */
+    handleTokenChange();
 }
 
@@ -202 +218 @@
         delete pWidget;
     }
+
+    /* Handle token change: */
+    handleTokenChange();
 }
 
@@ -278 +297 @@
     }
 }
+
+void UIToolPaneMachine::handleTokenChange()
+{
+    // printf("UIToolPaneMachine::handleTokenChange: Active = %d, current tool = %d\n", m_fActive, currentTool());
+}

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

@@ -68 +68 @@
     virtual ~UIToolPaneMachine() /* override */;
 
+    /** Defines whether this pane is @a fActive. */
+    void setActive(bool fActive);
+    /** Returns whether this pane is active. */
+    bool active() const { return m_fActive; }
+
     /** Returns type of tool currently opened. */
     UIToolType currentTool() const;
@@ -101 +106 @@
     void cleanup();
 
+    /** Handles token change. */
+    void handleTokenChange();
+
     /** Holds the action pool reference. */
     UIActionPool *m_pActionPool;
@@ -118 +126 @@
     UIVMLogViewerWidget *m_pPaneLogViewer;
 
+    /** Holds whether this pane is active. */
+    bool  m_fActive;
+
     /** Holds the cache of passed items. */
     QList<UIVirtualMachineItem*>  m_items;

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

@@ -270 +270 @@
             m_pPaneTools->setToolsClass(UIToolClass_Machine);
             m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
+            m_pPaneToolsGlobal->setActive(false);
+            m_pPaneToolsMachine->setActive(true);
             break;
         }
@@ -276 +278 @@
             m_pPaneTools->setToolsClass(UIToolClass_Global);
             m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal);
+            m_pPaneToolsMachine->setActive(false);
+            m_pPaneToolsGlobal->setActive(true);
             break;
         }
@@ -461 +465 @@
                         if (m_pPaneToolsGlobal)
                         {
+                            if (m_pPaneChooser->isGlobalItemSelected())
+                                m_pPaneToolsGlobal->setActive(true);
                             connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigCloudProfileManagerChange,
                                     this, &UIVirtualBoxManagerWidget::sigCloudProfileManagerChange);
@@ -472 +478 @@
                         if (m_pPaneToolsMachine)
                         {
+                            if (!m_pPaneChooser->isGlobalItemSelected())
+                                m_pPaneToolsMachine->setActive(true);
                             connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigCurrentSnapshotItemChange,
                                     this, &UIVirtualBoxManagerWidget::sigCurrentSnapshotItemChange);