Changeset 85439 in vbox for trunk/src

Timestamp:

Jul 23, 2020 4:11:33 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510: Make sure Performance Monitor tool being properly hidden/shown when current VM item state changes.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)

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

@@ -32 +32 @@
 #include "UITabBar.h"
 #include "UIToolBar.h"
+#include "UIVirtualBoxEventHandler.h"
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
@@ -277 +278 @@
     m_pToolBar->updateLayout();
 #endif
+}
+
+void UIVirtualBoxManagerWidget::sltHandleStateChange(const QUuid &)
+{
+    /* Recache current item info if machine or group item selected: */
+    if (isMachineItemSelected() || isGroupItemSelected())
+        recacheCurrentItemInformation();
 }
 
@@ -627 +635 @@
 void UIVirtualBoxManagerWidget::prepareConnections()
 {
+    /* Global VBox event handlers: */
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
+            this, &UIVirtualBoxManagerWidget::sltHandleStateChange);
+
     /* Tool-bar connections: */
     connect(m_pToolBar, &UIToolBar::customContextMenuRequested,
@@ -947 +959 @@
     QList<UIToolType> retrictedTypes;
     if (pItem && pItem->itemType() != UIVirtualMachineItemType_Local)
-    {
         retrictedTypes << UIToolType_Snapshots << UIToolType_Logs << UIToolType_Performance;
-        if (retrictedTypes.contains(m_pPaneTools->toolsType()))
-            m_pPaneTools->setToolsType(UIToolType_Details);
-    }
-    else if (pItem && !pItem->isItemRunning())
-    {
+    else if (pItem && !pItem->isItemStarted())
         retrictedTypes << UIToolType_Performance;
-    }
+    if (retrictedTypes.contains(m_pPaneTools->toolsType()))
+        m_pPaneTools->setToolsType(UIToolType_Details);
     m_pPaneTools->setRestrictedToolTypes(retrictedTypes);
     /* Update machine tools availability: */

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

@@ -215 +215 @@
 private slots:
 
+    /** @name CVirtualBox event handling stuff.
+      * @{ */
+        /** Handles CVirtualBox event about state change for machine with @a uId. */
+        void sltHandleStateChange(const QUuid &uId);
+    /** @} */
+
     /** @name Tool-bar stuff.
       * @{ */