Changeset 64388 in vbox for trunk

Timestamp:

Oct 24, 2016 2:12:14 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 100): Settings: Shared Fodlers page: Move tree-widget stuff onto QITreeWidget rails.

Location:

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

Files:

• UIMachineSettingsSF.cpp (modified) (11 diffs)
• UIMachineSettingsSF.ui (modified) (2 diffs)

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

@@ -35 +35 @@
 
 
-class SFTreeViewItem : public QTreeWidgetItem
+class SFTreeViewItem : public QITreeWidgetItem
 {
 public:
-
-    enum { SFTreeViewItemType = QTreeWidgetItem::UserType + 1 };
 
     enum FormatType
@@ -51 +49 @@
 
     /* Root Item */
-    SFTreeViewItem (QTreeWidget *aParent, const QStringList &aFields, FormatType aFormat)
-        : QTreeWidgetItem (aParent, aFields, SFTreeViewItemType), mFormat (aFormat)
+    SFTreeViewItem (QITreeWidget *aParent, const QStringList &aFields, FormatType aFormat)
+        : QITreeWidgetItem (aParent, aFields), mFormat (aFormat)
     {
         setFirstColumnSpanned (true);
@@ -60 +58 @@
     /* Child Item */
     SFTreeViewItem (SFTreeViewItem *aParent, const QStringList &aFields, FormatType aFormat)
-        : QTreeWidgetItem (aParent, aFields, SFTreeViewItemType), mFormat (aFormat)
+        : QITreeWidgetItem (aParent, aFields), mFormat (aFormat)
     {
         updateText (aFields);
@@ -68 +66 @@
     {
         /* Root items should always been sorted by id-field. */
-        return parent() ? text (0).toLower() < aOther.text (0).toLower() :
-                          text (1).toLower() < aOther.text (1).toLower();
+        return parentItem() ? text (0).toLower() < aOther.text (0).toLower() :
+                              text (1).toLower() < aOther.text (1).toLower();
     }
 
@@ -75 +73 @@
     {
         QTreeWidgetItem *item = QTreeWidgetItem::child (aIndex);
-        return item && item->type() == SFTreeViewItemType ? static_cast <SFTreeViewItem*> (item) : 0;
+        return item ? static_cast <SFTreeViewItem*> (item) : 0;
     }
 
@@ -106 +104 @@
         int oldSize = fm.width (oneString);
         int indentSize = fm.width (" ... ");
-        int itemIndent = parent() ? treeWidget()->indentation() * 2 : treeWidget()->indentation();
+        int itemIndent = parentItem() ? treeWidget()->indentation() * 2 : treeWidget()->indentation();
         if (aColumn == 0)
             indentSize += itemIndent;
@@ -463 +461 @@
     /* Check selected item */
     QTreeWidgetItem *selectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems() [0] : 0;
-    SFTreeViewItem *item = selectedItem && selectedItem->type() == SFTreeViewItem::SFTreeViewItemType ?
-                           static_cast <SFTreeViewItem*> (selectedItem) : 0;
+    SFTreeViewItem *item = selectedItem ? static_cast <SFTreeViewItem*> (selectedItem) : 0;
     Assert (item);
-    Assert (item->parent());
+    Assert (item->parentItem());
 
     /* Invoke Edit-Box Dialog */
@@ -472 +469 @@
     dlg.setPath (item->getText (1));
     dlg.setName (item->getText (0));
-    dlg.setPermanent ((UISharedFolderType)item->parent()->text (1).toInt() != ConsoleType);
+    dlg.setPermanent ((UISharedFolderType)item->parentItem()->text (1).toInt() != ConsoleType);
     dlg.setAutoMount (item->getText (2) == mTrYes);
     dlg.setWriteable (item->getText (3) == mTrFull);
@@ -491 +488 @@
         item->updateText (fields);
         mTwFolders->sortItems (0, Qt::AscendingOrder);
-        if (item->parent() != pRoot)
+        if (item->parentItem() != pRoot)
         {
             /* Move the selected item into new location */
-            item->parent()->takeChild (item->parent()->indexOfChild (item));
+            item->parentItem()->takeChild (item->parentItem()->indexOfChild (item));
             pRoot->insertChild (pRoot->childCount(), item);
             mTwFolders->scrollToItem (item);
@@ -589 +586 @@
         for (int j = 0; j < subRoot->childCount(); ++ j)
         {
-            SFTreeViewItem *item = subRoot->child (j) &&
-                                   subRoot->child (j)->type() == SFTreeViewItem::SFTreeViewItemType ?
-                                   static_cast <SFTreeViewItem*> (subRoot->child (j)) : 0;
+            SFTreeViewItem *item = subRoot->child (j) ? static_cast <SFTreeViewItem*> (subRoot->child (j)) : 0;
             if (item)
                 item->adjustText();
@@ -638 +633 @@
     while (*it)
     {
-        if ((*it)->parent() && (aIncludeSelected || !(*it)->isSelected()) &&
-            (*it)->type() == SFTreeViewItem::SFTreeViewItemType)
+        if ((*it)->parent() && (aIncludeSelected || !(*it)->isSelected()))
         {
             SFTreeViewItem *item = static_cast <SFTreeViewItem*> (*it);
-            UISharedFolderType type = (UISharedFolderType) item->parent()->text (1).toInt();
+            UISharedFolderType type = (UISharedFolderType) item->parentItem()->text (1).toInt();
             list << qMakePair (item->getText (0), type);
         }

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

@@ -56 +56 @@
       </property>
       <item>
-       <widget class="QTreeWidget" name="mTwFolders">
+       <widget class="QITreeWidget" name="mTwFolders">
         <property name="minimumSize">
          <size>
@@ -107 +107 @@
  <customwidgets>
   <customwidget>
+   <class>QITreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>QITreeWidget.h</header>
+  </customwidget>
+  <customwidget>
    <class>QILabelSeparator</class>
    <extends>QLabel</extends>