Changeset 99093 in vbox

Timestamp:

Mar 21, 2023 3:45:23 PM (2 years ago)

Author:

vboxsync

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

156458

Message:

FE/Qt: bugref:10322: Runtime UI: Audio status-bar indicator should be updated directly by audio-change event; Display status-bar indicator is already updated by machine-state-change event.

Location:

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

Files:

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

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

@@ -346 +346 @@
         /* Configure connection: */
         connect(pMachine, &UIMachine::sigMachineStateChange,
+                this, &UIIndicatorAudio::updateAppearance);
+        connect(pMachine, &UIMachine::sigAudioAdapterChange,
                 this, &UIIndicatorAudio::updateAppearance);
         /* Translate finally: */

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

@@ -49 +49 @@
     UIVisualElement_MouseIntegrationStuff = RT_BIT(1),
     UIVisualElement_IndicatorPoolStuff    = RT_BIT(2),
-    UIVisualElement_AudioStuff            = RT_BIT(6),
     UIVisualElement_USBStuff              = RT_BIT(8),
     UIVisualElement_SharedFolderStuff     = RT_BIT(9),
-    UIVisualElement_Display               = RT_BIT(10),
     UIVisualElement_Recording             = RT_BIT(11),
     UIVisualElement_FeaturesStuff         = RT_BIT(12),

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

@@ -95 +95 @@
 }
 
-void UIMachineWindowNormal::sltAudioAdapterChange()
-{
-    /* Update audio stuff: */
-    updateAppearanceOf(UIVisualElement_AudioStuff);
-}
-
 void UIMachineWindowNormal::sltSharedFolderChange()
 {
@@ -238 +232 @@
     connect(machineLogic()->uimachine(), &UIMachine::sigUSBDeviceStateChange,
             this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
-    connect(machineLogic()->uimachine(), &UIMachine::sigAudioAdapterChange,
-            this, &UIMachineWindowNormal::sltAudioAdapterChange);
     connect(machineLogic()->uimachine(), &UIMachine::sigSharedFolderChange,
             this, &UIMachineWindowNormal::sltSharedFolderChange);
@@ -438 +430 @@
     disconnect(machineLogic()->uimachine(), &UIMachine::sigUSBDeviceStateChange,
                this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
-    disconnect(machineLogic()->uimachine(), &UIMachine::sigAudioAdapterChange,
-               this, &UIMachineWindowNormal::sltAudioAdapterChange);
     disconnect(machineLogic()->uimachine(), &UIMachine::sigSharedFolderChange,
                this, &UIMachineWindowNormal::sltSharedFolderChange);
@@ -706 +696 @@
         if (uimachine()->isRunning())
         {
-            if (iElement & UIVisualElement_AudioStuff)
-                m_pIndicatorsPool->updateAppearance(IndicatorType_Audio);
             if (iElement & UIVisualElement_USBStuff)
                 m_pIndicatorsPool->updateAppearance(IndicatorType_USB);
             if (iElement & UIVisualElement_SharedFolderStuff)
                 m_pIndicatorsPool->updateAppearance(IndicatorType_SharedFolders);
-            if (iElement & UIVisualElement_Display)
-                m_pIndicatorsPool->updateAppearance(IndicatorType_Display);
             if (iElement & UIVisualElement_FeaturesStuff)
                 m_pIndicatorsPool->updateAppearance(IndicatorType_Features);

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

@@ -63 +63 @@
     /** Handles USB device state change event. */
     void sltUSBDeviceStateChange();
-    /** Handles audio adapter change event. */
-    void sltAudioAdapterChange();
     /** Handles shared folder change event. */
     void sltSharedFolderChange();