Changeset 99097 in vbox

Timestamp:

Mar 21, 2023 4:04:12 PM (2 years ago)

Author:

vboxsync

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

156462

Message:

FE/Qt: bugref:10322: Runtime UI: Features status-bar indicator should be updated directly by machine-state-change and cpu-execution-cap-change events.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIMachineDefs.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (4 diffs)
• normal/UIMachineWindowNormal.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -744 +744 @@
         setStateIcon(KVMExecutionEngine_HwVirt, UIIconPool::iconSet(":/vtx_amdv_16px.png"));
         setStateIcon(KVMExecutionEngine_NativeApi, UIIconPool::iconSet(":/vm_execution_engine_native_api_16px.png"));
-        /* Configure machine state-change listener: */
+        /* Configure connection: */
         connect(m_pMachine, &UIMachine::sigMachineStateChange,
                 this, &UIIndicatorFeatures::sltHandleMachineStateChange);
+        connect(m_pMachine, &UIMachine::sigCPUExecutionCapChange,
+                this, &UIIndicatorFeatures::updateAppearance);
+        /* Configure CPU load update timer: */
         m_pTimerAutoUpdate = new QTimer(this);
         if (m_pTimerAutoUpdate)
@@ -812 +815 @@
     void sltHandleMachineStateChange()
     {
+        /* Update appearance first of all: */
+        updateAppearance();
+
+        /* Start or stop CPU load update timer: */
         if (m_pMachine->machineState() == KMachineState_Running)
-        {
-            /* Start auto-update timer otherwise: */
             m_pTimerAutoUpdate->start(1000);
-            return;
-        }
-        /* Stop auto-update timer otherwise: */
-        m_pTimerAutoUpdate->stop();
+        else
+            m_pTimerAutoUpdate->stop();
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h

@@ -49 +49 @@
     UIVisualElement_MouseIntegrationStuff = RT_BIT(1),
     UIVisualElement_IndicatorPoolStuff    = RT_BIT(2),
-    UIVisualElement_FeaturesStuff         = RT_BIT(12),
 #ifndef VBOX_WS_MAC
     UIVisualElement_MiniToolBar           = RT_BIT(13),

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -80 +80 @@
 
     /* Update indicator-pool and virtualization stuff: */
-    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_FeaturesStuff);
-}
-
-void UIMachineWindowNormal::sltCPUExecutionCapChange()
-{
-    /* Update virtualization stuff: */
-    updateAppearanceOf(UIVisualElement_FeaturesStuff);
-}
-
-void UIMachineWindowNormal::sltHandleMachineInitialized()
-{
-    /* Update virtualization stuff: */
-    updateAppearanceOf(UIVisualElement_FeaturesStuff);
+    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff);
 }
 
@@ -198 +186 @@
 #endif /* VBOX_WS_MAC */
 
-void UIMachineWindowNormal::prepareSessionConnections()
-{
-    /* Call to base-class: */
-    UIMachineWindow::prepareSessionConnections();
-
-    /* Start watching for console events: */
-    connect(machineLogic()->uimachine(), &UIMachine::sigCPUExecutionCapChange,
-            this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
-
-    /* Watch for machine UI signals: */
-    connect(machineLogic()->uimachine(), &UIMachine::sigInitialized,
-            this, &UIMachineWindowNormal::sltHandleMachineInitialized);
-}
-
 #ifndef VBOX_WS_MAC
 void UIMachineWindowNormal::prepareMenu()
@@ -389 +363 @@
     delete m_pIndicatorsPool;
     m_pIndicatorsPool = 0;
-}
-
-void UIMachineWindowNormal::cleanupSessionConnections()
-{
-    /* Stop watching for console events: */
-    disconnect(machineLogic()->uimachine(), &UIMachine::sigCPUExecutionCapChange,
-               this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
-
-    /* Call to base-class: */
-    UIMachineWindow::cleanupSessionConnections();
 }
 
@@ -649 +613 @@
         && iElement & UIVisualElement_IndicatorPoolStuff)
         m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uimachine()->isRunning());
-    /* Update status-bar indicator-pool appearance only when status-bar is visible: */
-    if (   m_pIndicatorsPool
-        && statusBar()->isVisible())
-    {
-        /* If VM is running: */
-        if (uimachine()->isRunning())
-        {
-            if (iElement & UIVisualElement_FeaturesStuff)
-                m_pIndicatorsPool->updateAppearance(IndicatorType_Features);
-        }
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -59 +59 @@
     /** Handles machine state change event. */
     void sltMachineStateChanged();
-    /** Handles CPU execution cap change event. */
-    void sltCPUExecutionCapChange();
-    /** Handles Machine UI initialized event. */
-    void sltHandleMachineInitialized();
 
 #ifndef RT_OS_DARWIN
@@ -85 +81 @@
 private:
 
-    /** Prepare session connections routine. */
-    void prepareSessionConnections();
 #ifndef VBOX_WS_MAC
     /** Prepare menu routine. */
@@ -106 +100 @@
     /** Cleanup status-bar routine. */
     void cleanupStatusBar();
-    /** Cleanup session connections routine. */
-    void cleanupSessionConnections();
 
     /** Updates visibility according to visual-state. */