Changeset 105233 in vbox

Timestamp:

Jul 9, 2024 11:04:57 AM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10672: Runtime UI: Improve accessibility for USB indicator; Had to adjust details generation stuff for that as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• globals/UIDetailsGenerator.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (4 diffs)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -1376 +1376 @@
 
 void UIDetailsGenerator::acquireUsbStatusInfo(CMachine &comMachine, CConsole &comConsole,
-                                              QString &strInfo, bool &fUsbEnabled)
+                                              QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount)
 {
     /* Check whether there is at least one USB controller with an available proxy: */
@@ -1386 +1386 @@
         /* Enumerate all the USB devices: */
         foreach (const CUSBDevice &comUsbDevice, comConsole.GetUSBDevices())
+        {
+            ++cUsbFilterCount;
             strInfo += e_strTableRow1.arg(usbDetails(comUsbDevice));
+        }
         /* Handle 'no-usb-devices' case: */
         if (strInfo.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.h

@@ -105 +105 @@
 
     SHARED_LIBRARY_STUFF void acquireUsbStatusInfo(CMachine &comMachine, CConsole &comConsole,
-                                                   QString &strInfo, bool &fUsbEnableds);
+                                                   QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount);
 
     SHARED_LIBRARY_STUFF void acquireSharedFoldersStatusInfo(CMachine &comMachine, CConsole &comConsole, CGuest &comGuest,

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

@@ -568 +568 @@
     UIIndicatorUSB(UIMachine *pMachine)
         : UISessionStateStatusBarIndicator(IndicatorType_USB, pMachine)
+        , m_fUsbEnabled(false)
+        , m_cUsbFilterCount(0)
     {
         /* Assign state-icons: */
@@ -591 +593 @@
     {
         QString strFullData;
-        bool fUsbEnabled = false;
-        m_pMachine->acquireUsbStatusInfo(strFullData, fUsbEnabled);
+        m_fUsbEnabled = false;
+        m_cUsbFilterCount = 0;
+        m_pMachine->acquireUsbStatusInfo(strFullData, m_fUsbEnabled, m_cUsbFilterCount);
 
         /* Show/hide indicator if there are no attachments
@@ -598 +601 @@
         if (   parentWidget()
             && parentWidget()->isVisible())
-            setVisible(fUsbEnabled);
+            setVisible(m_fUsbEnabled);
 
         /* Update tool-tip: */
@@ -604 +607 @@
             setToolTip(s_strTable.arg(strFullData));
         /* Update indicator state: */
-        setState(fUsbEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        setState(m_fUsbEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null);
 
         /* Retranslate finally: */
         sltRetranslateUI();
     }
+
+    /** Handles translation event. */
+    virtual void sltRetranslateUI() RT_OVERRIDE
+    {
+        /* Call to base-class: */
+        UISessionStateStatusBarIndicator::sltRetranslateUI();
+
+        /* Append description with more info: */
+        const QString strUsbStatus = m_fUsbEnabled ? tr("USB enabled") : tr("USB disabled");
+        const QString strFilterCount = m_cUsbFilterCount ? tr("%1 USB devices attached").arg(m_cUsbFilterCount)
+                                                         : tr("No USB devices attached", "USB tooltip");
+        m_strDescription = QString("%1, %2, %3").arg(m_strDescription, strUsbStatus, strFilterCount);
+    }
+
+private:
+
+    /** Holds whether USB subsystem is enabled. */
+    bool  m_fUsbEnabled;
+    /** Holds USB device filter count. */
+    uint  m_cUsbFilterCount;
+
 };
 

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

@@ -927 +927 @@
 }
 
-void UIMachine::acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnableds)
-{
-    uisession()->acquireUsbStatusInfo(strInfo, fUsbEnableds);
+void UIMachine::acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount)
+{
+    uisession()->acquireUsbStatusInfo(strInfo, fUsbEnabled, cUsbFilterCount);
 }
 

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

@@ -635 +635 @@
         void acquireNetworkStatusInfo(QString &strInfo, bool &fAdaptersPresent, bool &fCablesDisconnected);
         /** Acquires status info for USB indicator. */
-        void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnableds);
+        void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount);
         /** Acquires status info for Shared Folders indicator. */
         void acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent);

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

@@ -2018 +2018 @@
 }
 
-void UISession::acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnableds)
+void UISession::acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount)
 {
     CMachine comMachine = machine();
@@ -2026 +2026 @@
     if (comConsole.isNull())
         return;
-    UIDetailsGenerator::acquireUsbStatusInfo(comMachine, comConsole, strInfo, fUsbEnableds);
+    UIDetailsGenerator::acquireUsbStatusInfo(comMachine, comConsole, strInfo, fUsbEnabled, cUsbFilterCount);
 }
 

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

@@ -517 +517 @@
         void acquireNetworkStatusInfo(QString &strInfo, bool &fAdaptersPresent, bool &fCablesDisconnected);
         /** Acquires status info for USB indicator. */
-        void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnableds);
+        void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount);
         /** Acquires status info for Shared Folders indicator. */
         void acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent);