Changeset 104463 in vbox

Timestamp:

Apr 30, 2024 12:37:49 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:9510. React on guest additions' state change in runtime UI. need to implement the same for manager UI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (1 diff)
• activity/vmactivity/UIVMActivityMonitor.h (modified) (1 diff)
• activity/vmactivity/UIVMActivityMonitorContainer.cpp (modified) (1 diff)
• activity/vmactivity/UIVMActivityMonitorContainer.h (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1435 +1435 @@
 }
 
-void UIVMActivityMonitorLocal::sltGuestAdditionsStateChange()
+void UIVMActivityMonitorLocal::guestAdditionsStateChange()
 {
     bool fGuestAdditionsAvailable = guestAdditionsAvailable("6.1");

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -257 +257 @@
     virtual QUuid machineId() const RT_OVERRIDE;
     virtual QString machineName() const RT_OVERRIDE;
-
-public slots:
-
-    /** @name These functions are connected to API events and implement necessary updates.
-     * @{ */
-        void sltGuestAdditionsStateChange();
-    /** @} */
+    void guestAdditionsStateChange();
 
 protected slots:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorContainer.cpp

@@ -348 +348 @@
     m_pPaneContainer->setVisible(fChecked);
 }
+
+void UIVMActivityMonitorContainer::guestAdditionsStateChange(const QUuid &machineId)
+{
+    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
+    {
+        UIVMActivityMonitorLocal *pMonitor = qobject_cast<UIVMActivityMonitorLocal*>(m_pTabWidget->widget(i));
+        if (!pMonitor)
+            continue;
+        if (pMonitor->machineId() == machineId)
+            pMonitor->guestAdditionsStateChange();
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorContainer.h

@@ -101 +101 @@
     void addLocalMachine(const CMachine &comMachine);
     void addCloudMachine(const CCloudMachine &comMachine);
+    void guestAdditionsStateChange(const QUuid &machineId);
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -150 +150 @@
 }
 
+void UIVMInformationDialog::sltAdditionsStateChange()
+{
+    if (!m_pTabWidget)
+        return;
+    UIVMActivityMonitorContainer *pVMActivityMonitorContainer =
+        qobject_cast<UIVMActivityMonitorContainer*>(m_pTabWidget->widget(Tabs_ActivityMonitor));
+    if (!pVMActivityMonitorContainer)
+        return;
+    pVMActivityMonitorContainer->guestAdditionsStateChange(uiCommon().managedVMUuid());
+}
+
 void UIVMInformationDialog::saveDialogGeometry()
 {
@@ -160 +171 @@
 void UIVMInformationDialog::prepare()
 {
+    connect(gpMachine, &UIMachine::sigAdditionsStateChange,
+            this, &UIVMInformationDialog::sltAdditionsStateChange);
 #ifndef VBOX_WS_MAC
     /* Assign window icon: */
@@ -228 +241 @@
         /* Create Activity Monitor tab: */
         UIVMActivityMonitorContainer *pVMActivityMonitorContainer = new UIVMActivityMonitorContainer(this, m_pActionPool, EmbedTo_Dialog);
-
-        // UIVMActivityMonitorLocal *pVMActivityMonitorWidget =
-        //     new UIVMActivityMonitorLocal(EmbedTo_Dialog, this, gpMachine->uisession()->machine());
         if (pVMActivityMonitorContainer)
         {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

@@ -80 +80 @@
     void sltHandlePageChanged(int iIndex);
     void sltMachineStateChange(const QUuid &uMachineId, const KMachineState state);
+    void sltAdditionsStateChange();
 
 private:
+
     enum Tabs
     {