Changeset 64778 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 2, 2016 1:07:38 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 146): Extending QITreeWidgetItem sub-classes with properly accessible text.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsNetwork.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsSF.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -163 +163 @@
     /** Release UIMedium wrapped by <i>this</i> item from virtual @a machine. */
     virtual bool releaseFrom(CMachine machine) = 0;
+
+    /** Returns default text. */
+    virtual QString defaultText() const /* override */
+    {
+        return tr("%1, %2: %3, %4: %5", "col.1 text, col.2 name: col.2 text, col.3 name: col.3 text")
+                 .arg(text(0))
+                 .arg(parentTree()->headerItem()->text(1)).arg(text(1))
+                 .arg(parentTree()->headerItem()->text(2)).arg(text(2));
+    }
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -82 +82 @@
     virtual QString defaultText() const /* override */
     {
-        /* Return 2nd cell text as default: */
-        return text(1);
+        return m_data.m_fIsUsable ?
+               tr("%1, %2: %3, %4", "col.2 text, col.3 name: col.3 text, col.1 name")
+                 .arg(text(1))
+                 .arg(parentTree()->headerItem()->text(2)).arg(text(2))
+                 .arg(parentTree()->headerItem()->text(0)) :
+               tr("%1, %2: %3",     "col.2 text, col.3 name: col.3 text")
+                 .arg(text(1))
+                 .arg(parentTree()->headerItem()->text(2)).arg(text(2));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -219 +219 @@
 QString UIItemNetworkNAT::defaultText() const
 {
-    /* Return 2nd cell text as default: */
-    return text(1);
+    return m_data.m_fEnabled ?
+           tr("%1, %2", "col.2 text, col.1 name")
+             .arg(text(1))
+             .arg(parentTree()->headerItem()->text(0)) :
+           tr("%1",     "col.2 text")
+             .arg(text(1));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -92 +92 @@
         for (int i = 0; i < treeWidget()->columnCount(); ++ i)
             processColumn (i);
+    }
+
+    /** Returns default text. */
+    virtual QString defaultText() const /* override */
+    {
+        return tr("%1, %2: %3, %4: %5, %6: %7",
+                  "col.1 text, col.2 name: col.2 text, col.3 name: col.3 text, col.4 name: col.4 text")
+                 .arg(text(0))
+                 .arg(parentTree()->headerItem()->text(1)).arg(text(1))
+                 .arg(parentTree()->headerItem()->text(2)).arg(text(2))
+                 .arg(parentTree()->headerItem()->text(3)).arg(text(3));
     }