Changeset 99094 in vbox for trunk/src/VBox

Timestamp:

Mar 21, 2023 3:50:28 PM (23 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: USB status-bar indicator should be updated directly by controller-change and device-state-change event; Shared Folder status-bar indicator should be updated directly by shared-folder-change event.

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) (1 diff)

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

@@ -453 +453 @@
         connect(pMachine, &UIMachine::sigMachineStateChange,
                 this, &UIIndicatorUSB::updateAppearance);
+        connect(pMachine, &UIMachine::sigUSBControllerChange,
+                this, &UIIndicatorUSB::updateAppearance);
+        connect(pMachine, &UIMachine::sigUSBDeviceStateChange,
+                this, &UIIndicatorUSB::updateAppearance);
         /* Translate finally: */
         retranslateUi();
@@ -499 +503 @@
         /* Configure connection: */
         connect(pMachine, &UIMachine::sigMachineStateChange,
+                this, &UIIndicatorSharedFolders::updateAppearance);
+        connect(pMachine, &UIMachine::sigSharedFolderChange,
                 this, &UIIndicatorSharedFolders::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_USBStuff              = RT_BIT(8),
-    UIVisualElement_SharedFolderStuff     = RT_BIT(9),
     UIVisualElement_Recording             = RT_BIT(11),
     UIVisualElement_FeaturesStuff         = RT_BIT(12),

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

@@ -83 +83 @@
 }
 
-void UIMachineWindowNormal::sltUSBControllerChange()
-{
-    /* Update USB stuff: */
-    updateAppearanceOf(UIVisualElement_USBStuff);
-}
-
-void UIMachineWindowNormal::sltUSBDeviceStateChange()
-{
-    /* Update USB stuff: */
-    updateAppearanceOf(UIVisualElement_USBStuff);
-}
-
-void UIMachineWindowNormal::sltSharedFolderChange()
-{
-    /* Update shared-folders stuff: */
-    updateAppearanceOf(UIVisualElement_SharedFolderStuff);
-}
-
 void UIMachineWindowNormal::sltRecordingChange()
 {
@@ -228 +210 @@
 
     /* Start watching for console events: */
-    connect(machineLogic()->uimachine(), &UIMachine::sigUSBControllerChange,
-            this, &UIMachineWindowNormal::sltUSBControllerChange);
-    connect(machineLogic()->uimachine(), &UIMachine::sigUSBDeviceStateChange,
-            this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
-    connect(machineLogic()->uimachine(), &UIMachine::sigSharedFolderChange,
-            this, &UIMachineWindowNormal::sltSharedFolderChange);
     connect(machineLogic()->uimachine(), &UIMachine::sigRecordingChange,
             this, &UIMachineWindowNormal::sltRecordingChange);
@@ -426 +402 @@
 {
     /* Stop watching for console events: */
-    disconnect(machineLogic()->uimachine(), &UIMachine::sigUSBControllerChange,
-               this, &UIMachineWindowNormal::sltUSBControllerChange);
-    disconnect(machineLogic()->uimachine(), &UIMachine::sigUSBDeviceStateChange,
-               this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
-    disconnect(machineLogic()->uimachine(), &UIMachine::sigSharedFolderChange,
-               this, &UIMachineWindowNormal::sltSharedFolderChange);
     disconnect(machineLogic()->uimachine(), &UIMachine::sigRecordingChange,
                this, &UIMachineWindowNormal::sltRecordingChange);
@@ -696 +666 @@
         if (uimachine()->isRunning())
         {
-            if (iElement & UIVisualElement_USBStuff)
-                m_pIndicatorsPool->updateAppearance(IndicatorType_USB);
-            if (iElement & UIVisualElement_SharedFolderStuff)
-                m_pIndicatorsPool->updateAppearance(IndicatorType_SharedFolders);
             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 USB controller change event. */
-    void sltUSBControllerChange();
-    /** Handles USB device state change event. */
-    void sltUSBDeviceStateChange();
-    /** Handles shared folder change event. */
-    void sltSharedFolderChange();
     /** Handles recording change event. */
     void sltRecordingChange();