Changeset 65254 in vbox

Timestamp:

Jan 12, 2017 10:57:44 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 163): UIIndicatorsPool: Provide indicators with own type.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (14 diffs)

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

@@ -60 +60 @@
 
 
-
 /** QIStateStatusBarIndicator extension for Runtime UI. */
 class UISessionStateStatusBarIndicator : public QIWithRetranslateUI<QIStateStatusBarIndicator>
@@ -69 +68 @@
 
     /** Constructor which remembers passed @a session object. */
-    UISessionStateStatusBarIndicator(UISession *pSession) : m_pSession(pSession) {}
+    UISessionStateStatusBarIndicator(IndicatorType enmType, UISession *pSession)
+        : m_enmType(enmType)
+        , m_pSession(pSession)
+    {}
+
+    /** Returns the indicator type. */
+    IndicatorType type() const { return m_enmType; }
 
     /** Abstract update routine. */
@@ -75 +80 @@
 
 protected:
+
+    /** Holds the indicator type. */
+    const IndicatorType m_enmType;
 
     /** Holds the session UI reference. */
@@ -89 +97 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorHardDrive(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_HardDisks, pSession)
     {
         /* Assign state-icons: */
@@ -162 +170 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorOpticalDisks(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_OpticalDisks, pSession)
     {
         /* Assign state-icons: */
@@ -239 +247 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorFloppyDisks(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_FloppyDisks, pSession)
     {
         /* Assign state-icons: */
@@ -316 +324 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorNetwork(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_Network, pSession)
         , m_pTimerAutoUpdate(0)
         , m_cMaxNetworkAdapters(0)
@@ -466 +474 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorUSB(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_USB, pSession)
     {
         /* Assign state-icons: */
@@ -532 +540 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorSharedFolders(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_SharedFolders, pSession)
     {
         /* Assign state-icons: */
@@ -603 +611 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorDisplay(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_Display, pSession)
     {
         /* Assign state-icons: */
@@ -685 +693 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorVideoCapture(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_VideoCapture, pSession)
         , m_pAnimation(0)
         , m_dRotationAngle(0)
@@ -807 +815 @@
     /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */
     UIIndicatorFeatures(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_Features, pSession)
     {
         /* Assign state-icons: */
@@ -892 +900 @@
     /** Constructor, using @a pSession for state-update routine. */
     UIIndicatorMouse(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_Mouse, pSession)
     {
         /* Assign state-icons: */
@@ -952 +960 @@
     /** Constructor, using @a pSession for state-update routine. */
     UIIndicatorKeyboard(UISession *pSession)
-        : UISessionStateStatusBarIndicator(pSession)
+        : UISessionStateStatusBarIndicator(IndicatorType_Keyboard, pSession)
     {
         /* Assign state-icons: */