Changeset 105263 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 10, 2024 4:34:58 PM (7 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (3 diffs)
• globals/UIDetailsGenerator.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (5 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

@@ -1405 +1405 @@
 
 void UIDetailsGenerator::acquireSharedFoldersStatusInfo(CMachine &comMachine, CConsole &comConsole, CGuest &comGuest,
-                                                        QString &strInfo, bool &fFoldersPresent)
+                                                        QString &strInfo, uint &cFoldersCount)
 {
     /* Enumerate all the folders: */
@@ -1413 +1413 @@
     foreach (const CSharedFolder &comTemporaryFolder, comConsole.GetSharedFolders())
         folders.insert(comTemporaryFolder.GetName(), comTemporaryFolder.GetHostPath());
-    fFoldersPresent = !folders.isEmpty();
+    cFoldersCount = folders.size();
 
     /* Append attachment data: */
@@ -1426 +1426 @@
 
     /* Handle 'no-folders' case: */
-    if (!fFoldersPresent)
+    if (!cFoldersCount)
         strInfo = e_strTableRow1
             .arg(QApplication::translate("UIIndicatorSharedFolders", "No shared folders"));

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

@@ -108 +108 @@
 
     SHARED_LIBRARY_STUFF void acquireSharedFoldersStatusInfo(CMachine &comMachine, CConsole &comConsole, CGuest &comGuest,
-                                                             QString &strInfo, bool &fFoldersPresent);
+                                                             QString &strInfo, uint &cFoldersCount);
 
     SHARED_LIBRARY_STUFF void acquireDisplayStatusInfo(CMachine &comMachine, QString &strInfo,

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

@@ -622 +622 @@
         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");
+                                                         : tr("No USB devices attached");
         m_strDescription = QString("%1, %2, %3").arg(m_strDescription, strUsbStatus, strFilterCount);
     }
@@ -632 +632 @@
     /** Holds USB device filter count. */
     uint  m_cUsbFilterCount;
-
 };
 
@@ -646 +645 @@
     UIIndicatorSharedFolders(UIMachine *pMachine)
         : UISessionStateStatusBarIndicator(IndicatorType_SharedFolders, pMachine)
+        , m_cFoldersCount(0)
     {
         /* Assign state-icons: */
@@ -667 +667 @@
     {
         QString strFullData;
-        bool fFoldersPresent = false;
-        m_pMachine->acquireSharedFoldersStatusInfo(strFullData, fFoldersPresent);
+        m_cFoldersCount = 0;
+        m_pMachine->acquireSharedFoldersStatusInfo(strFullData, m_cFoldersCount);
 
         /* Update tool-tip: */
@@ -674 +674 @@
             setToolTip(s_strTable.arg(strFullData));
         /* Update indicator state: */
-        setState(fFoldersPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        setState(m_cFoldersCount ? 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 strFoldersCount = m_cFoldersCount ? tr("%1 shared folders").arg(m_cFoldersCount)
+                                                         : tr("No shared folders");
+        m_strDescription = QString("%1, %2").arg(m_strDescription, strFoldersCount);
+    }
+
+private:
+
+    /** Holds the amount of folders. */
+    uint  m_cFoldersCount;
 };
 

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

@@ -932 +932 @@
 }
 
-void UIMachine::acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent)
-{
-    uisession()->acquireSharedFoldersStatusInfo(strInfo, fFoldersPresent);
+void UIMachine::acquireSharedFoldersStatusInfo(QString &strInfo, uint &cFoldersCount)
+{
+    uisession()->acquireSharedFoldersStatusInfo(strInfo, cFoldersCount);
 }
 

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

@@ -637 +637 @@
         void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount);
         /** Acquires status info for Shared Folders indicator. */
-        void acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent);
+        void acquireSharedFoldersStatusInfo(QString &strInfo, uint &cFoldersCount);
         /** Acquires status info for Display indicator. */
         void acquireDisplayStatusInfo(QString &strInfo, bool &fAcceleration3D);

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

@@ -2029 +2029 @@
 }
 
-void UISession::acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent)
+void UISession::acquireSharedFoldersStatusInfo(QString &strInfo, uint &cFoldersCount)
 {
     CMachine comMachine = machine();
@@ -2040 +2040 @@
     if (comGuest.isNull())
         return;
-    UIDetailsGenerator::acquireSharedFoldersStatusInfo(comMachine, comConsole, comGuest, strInfo, fFoldersPresent);
+    UIDetailsGenerator::acquireSharedFoldersStatusInfo(comMachine, comConsole, comGuest, strInfo, cFoldersCount);
 }
 

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

@@ -519 +519 @@
         void acquireUsbStatusInfo(QString &strInfo, bool &fUsbEnabled, uint &cUsbFilterCount);
         /** Acquires status info for Shared Folders indicator. */
-        void acquireSharedFoldersStatusInfo(QString &strInfo, bool &fFoldersPresent);
+        void acquireSharedFoldersStatusInfo(QString &strInfo, uint &cFoldersCount);
         /** Acquires status info for Display indicator. */
         void acquireDisplayStatusInfo(QString &strInfo, bool &fAcceleration3D);