Changeset 64780 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2016 2:56:31 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 147): Extending few more QITreeWidgetItem sub-classes with properly accessible text, s.a. r112131.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsSF.cpp (modified) (1 diff)
• UIMachineSettingsUSB.cpp (modified) (2 diffs)

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

@@ -97 +97 @@
     virtual QString defaultText() const /* override */
     {
-        return tr("%1, %2: %3, %4: %5, %6: %7",
+        return parentItem() ?
+               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));
+                 .arg(parentTree()->headerItem()->text(3)).arg(text(3)) :
+               text(0);
     }
 

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

@@ -149 +149 @@
     CConsole m_console;
 };
+
+
+/** QITreeWidgetItem extension representing USB filter item. */
+class UIUSBFilterItem : public QITreeWidgetItem
+{
+public:
+
+    /** Constructs USB filter item. */
+    UIUSBFilterItem() {}
+
+protected:
+
+    /** Returns default text. */
+    virtual QString defaultText() const /* override */
+    {
+        return checkState(0) == Qt::Checked ?
+               tr("%1, Active", "col.1 text, col.1 state").arg(text(0)) :
+               tr("%1",         "col.1 text")             .arg(text(0));
+    }
+};
+
 
 UIMachineSettingsUSB::UIMachineSettingsUSB()
@@ -849 +870 @@
 
     /* Append tree-widget with item: */
-    QITreeWidgetItem *pItem = new QITreeWidgetItem;
+    UIUSBFilterItem *pItem = new UIUSBFilterItem;
     pItem->setCheckState(0, usbFilterData.m_fActive ? Qt::Checked : Qt::Unchecked);
     pItem->setText(0, usbFilterData.m_strName);