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

Timestamp:

Oct 17, 2016 4:55:33 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111356

Message:

FE/Qt: bugref:6899: Accessibility support (step 97): Preferences: Extension page: Move tree-widget stuff onto QITreeWidget rails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsExtension.cpp (modified) (3 diffs)
• UIGlobalSettingsExtension.ui (modified) (2 diffs)

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

@@ -40 +40 @@
 
 /* Extension package item: */
-class UIExtensionPackageItem : public QTreeWidgetItem
+class UIExtensionPackageItem : public QITreeWidgetItem
 {
 public:
 
-    /* Extension package item type: */
-    enum { UIItemType = QTreeWidgetItem::UserType + 1 };
-
     /* Extension package item constructor: */
-    UIExtensionPackageItem(QTreeWidget *pParent, const UISettingsCacheGlobalExtensionItem &data)
-        : QTreeWidgetItem(pParent, UIItemType)
+    UIExtensionPackageItem(QITreeWidget *pParent, const UISettingsCacheGlobalExtensionItem &data)
+        : QITreeWidgetItem(pParent)
         , m_data(data)
     {
@@ -81 +78 @@
 
     QString name() const { return m_data.m_strName; }
+
+    /** Returns default text. */
+    virtual QString defaultText() const /* override */
+    {
+        /* Return 2nd cell text as default: */
+        return text(1);
+    }
 
 private:
@@ -402 +406 @@
     /* Get current item: */
     UIExtensionPackageItem *pItem = m_pPackagesTree &&
-                                    m_pPackagesTree->currentItem() &&
-                                    m_pPackagesTree->currentItem()->type() == UIExtensionPackageItem::UIItemType ?
+                                    m_pPackagesTree->currentItem() ?
                                     static_cast<UIExtensionPackageItem*>(m_pPackagesTree->currentItem()) : 0;
 

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

@@ -39 +39 @@
       </property>
       <item>
-       <widget class="QTreeWidget" name="m_pPackagesTree">
+       <widget class="QITreeWidget" name="m_pPackagesTree">
         <property name="sizePolicy">
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding">
@@ -94 +94 @@
    <header>UIToolBar.h</header>
   </customwidget>
+  <customwidget>
+   <class>QITreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>QITreeWidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>