Changeset 85508 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 29, 2020 10:11:07 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510: Cleanup for an idea introduced in r139549.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIToolPaneGlobal.cpp (modified) (1 diff)
• manager/UIToolPaneGlobal.h (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• manager/chooser/UIChooser.cpp (modified) (1 diff)
• manager/chooser/UIChooser.h (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.h (modified) (1 diff)
• monitor/resource/UIResourceMonitor.cpp (modified) (1 diff)
• monitor/resource/UIResourceMonitor.h (modified) (1 diff)

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

@@ -195 +195 @@
                     /* Configure pane: */
                     m_pPaneResourceMonitor->setProperty("ToolType", QVariant::fromValue(UIToolType_Resources));
+                    connect(m_pPaneResourceMonitor, &UIResourceMonitorWidget::sigSwitchToMachinePerformancePane,
+                            this, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane);
 
                     /* Add into layout: */
                     m_pLayout->addWidget(m_pPaneResourceMonitor);
                     m_pLayout->setCurrentWidget(m_pPaneResourceMonitor);
-                    connect(m_pPaneResourceMonitor, &UIResourceMonitorWidget::sigSwitchMachinePerformancePane,
-                            this, &UIToolPaneGlobal::sigSwitchMachinePerformancePane);
                 }
 

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

@@ -51 +51 @@
     /** Notifies listeners about Cloud Profile Manager change. */
     void sigCloudProfileManagerChange();
-    void sigSwitchMachinePerformancePane(const QUuid &machineUid);
+
+    /** Notifies listeners about request to switch to Performance pane of machine with @a uMachineId. */
+    void sigSwitchToMachinePerformancePane(const QUuid &uMachineId);
 
 public:

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

@@ -28 +28 @@
 #include "UIExtraDataManager.h"
 #include "UIChooser.h"
-#include "UICommon.h"
 #include "UIVirtualBoxManager.h"
 #include "UIVirtualBoxManagerWidget.h"
@@ -460 +459 @@
 }
 
-void UIVirtualBoxManagerWidget::sltSwitchMachinePerformancePane(const QUuid &machineUid)
-{
-    if (!m_pPaneToolsMachine)
-        return;
-    CVirtualBox comVBox = uiCommon().virtualBox();
-
-    CMachine comMachine = comVBox.FindMachine(machineUid.toString());
-    if (comMachine.isNull())
-        return;
-    m_pPaneToolsMachine->setActive(true);
-    m_pPaneToolsGlobal->setActive(false);
-    m_pPaneToolsMachine->setMachine(comMachine);
-    switchToMachineTool(UIToolType_Performance);
+void UIVirtualBoxManagerWidget::sltSwitchToMachinePerformancePane(const QUuid &uMachineId)
+{
+    AssertPtrReturnVoid(m_pPaneChooser);
+    AssertPtrReturnVoid(m_pPaneTools);
+    m_pPaneChooser->setCurrentMachine(uMachineId);
+    m_pPaneTools->setToolsType(UIToolType_Performance);
 }
 
@@ -572 +564 @@
                             connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigCloudProfileManagerChange,
                                     this, &UIVirtualBoxManagerWidget::sigCloudProfileManagerChange);
-                            connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigSwitchMachinePerformancePane,
-                                    this, &UIVirtualBoxManagerWidget::sltSwitchMachinePerformancePane);
+                            connect(m_pPaneToolsGlobal, &UIToolPaneGlobal::sigSwitchToMachinePerformancePane,
+                                    this, &UIVirtualBoxManagerWidget::sltSwitchToMachinePerformancePane);
 
                             /* Add into stack: */

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

@@ -251 +251 @@
         void sltHandleToolsPaneIndexChange();
 
-        /** Handles signal requesting performance pane switch. */
-        void sltSwitchMachinePerformancePane(const QUuid &machineUid);
+        /** Handles signal requesting switch to Performance pane of machine with @a uMachineId. */
+        void sltSwitchToMachinePerformancePane(const QUuid &uMachineId);
     /** @} */
 

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

@@ -158 +158 @@
     AssertPtrReturnVoid(view());
     view()->setSearchWidgetVisible(fVisible);
+}
+
+void UIChooser::setCurrentMachine(const QUuid &uId)
+{
+    AssertPtrReturnVoid(model());
+    model()->setCurrentMachineItem(uId);
 }
 

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

@@ -152 +152 @@
         /** Toggle machine search widget to be @a fVisible. */
         void setMachineSearchWidgetVisibility(bool fVisible);
+        /** Changes current machine to the one with certain @a uId. */
+        void setCurrentMachine(const QUuid &uId);
     /** @} */
 

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

@@ -959 +959 @@
     /* Rebuild tree for main root: */
     buildTreeForMainRoot(true /* preserve selection */);
+}
+
+void UIChooserModel::setCurrentMachineItem(const QUuid &uId)
+{
+    /* Look whether we have such item at all: */
+    UIChooserItem *pItem = root()->searchForItem(uId.toString(),
+                                                 UIChooserItemSearchFlag_Machine |
+                                                 UIChooserItemSearchFlag_ExactId);
+
+    /* Select item if exists: */
+    if (pItem)
+        setSelectedItem(pItem);
 }
 

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

@@ -222 +222 @@
         /** Sorts selected [parent] group item. */
         void sortSelectedGroupItem();
+        /** Changes current machine item to the one with certain @a uId. */
+        void setCurrentMachineItem(const QUuid &uId);
 
         /** Defines current @a pDragObject. */

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -1478 +1478 @@
     if (!m_pTableView || !m_pModel)
         return;
-    QUuid machineId = m_pModel->itemUid(m_pTableView->selectedItemIndex());
-    if (machineId.isNull())
+    const QUuid uMachineId = m_pModel->itemUid(m_pTableView->selectedItemIndex());
+    if (uMachineId.isNull())
         return;
-    emit sigSwitchMachinePerformancePane(machineId);
+    emit sigSwitchToMachinePerformancePane(uMachineId);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h

@@ -51 +51 @@
 signals:
 
-    void sigSwitchMachinePerformancePane(const QUuid &machineId);
+    void sigSwitchToMachinePerformancePane(const QUuid &uMachineId);
 
 public: