Changeset 83897 in vbox for trunk

Timestamp:

Apr 21, 2020 3:30:16 PM (5 years ago)

Author:

vboxsync

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

137429

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A bit of cleanup/rework for update stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserModel.cpp (modified) (14 diffs)
• UIChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -86 +86 @@
     /* Build tree for main root: */
     buildTreeForMainRoot();
-    updateNavigationItemList();
-    updateLayout();
 
     /* Load last selected-item: */
@@ -660 +658 @@
     {
         /* Update tree for main root: */
-        updateNavigationItemList();
-        updateLayout();
+        updateTreeForMainRoot();
 
         /* Make sure selected-item present, if possible: */
@@ -683 +680 @@
             /* Rebuild tree for main root: */
             buildTreeForMainRoot();
-            updateNavigationItemList();
-            updateLayout();
 
             /* Select newly added item: */
@@ -704 +699 @@
     {
         /* Update tree for main root: */
-        updateNavigationItemList();
-        updateLayout();
+        updateTreeForMainRoot();
 
         /* Make sure selected-item present, if possible: */
@@ -724 +718 @@
         /* Rebuild tree for main root: */
         buildTreeForMainRoot();
-        updateNavigationItemList();
-        updateLayout();
 
         /* Select newly added item: */
@@ -744 +736 @@
         /* Rebuild tree for main root: */
         buildTreeForMainRoot();
-        updateNavigationItemList();
-        updateLayout();
 
         /* Select newly added item: */
@@ -782 +772 @@
     /* Rebuild tree for main root: */
     buildTreeForMainRoot();
-    updateNavigationItemList();
-    updateLayout();
 
     /* Restore selection if there was some item before: */
@@ -842 +830 @@
     /* Rebuild tree for main root: */
     buildTreeForMainRoot();
-    updateNavigationItemList();
-    updateLayout();
 }
 
@@ -929 +915 @@
 
     /* And update model: */
-    updateNavigationItemList();
-    updateLayout();
+    updateTreeForMainRoot();
     if (!copiedItems.isEmpty())
     {
@@ -1058 +1043 @@
     /* Update model: */
     wipeOutEmptyGroups();
-    updateNavigationItemList();
-    updateLayout();
+    updateTreeForMainRoot();
     setSelectedItem(pNewGroupItem);
     saveGroupSettings();
@@ -1069 +1053 @@
     if (!actionPool()->action(UIActionIndexST_M_Machine_S_SortParent)->isEnabled())
         return;
-
     /* Only if some item selected: */
     if (!firstSelectedItem())
@@ -1079 +1062 @@
     /* Rebuild tree for main root: */
     buildTreeForMainRoot();
-    updateNavigationItemList();
-    updateLayout();
 }
 
@@ -1648 +1629 @@
      * we need QEvent::Scroll events from it: */
     root()->installEventFilterHelper(view());
+
+    /* Update tree for main root: */
+    updateTreeForMainRoot();
+}
+
+void UIChooserModel::updateTreeForMainRoot()
+{
+    updateNavigationItemList();
+    updateLayout();
 }
 
@@ -1665 +1655 @@
     /* And update model: */
     wipeOutEmptyGroups();
-    updateNavigationItemList();
-    updateLayout();
+    updateTreeForMainRoot();
     if (!navigationItems().isEmpty())
     {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -363 +363 @@
         /** Build tree for main root. */
         void buildTreeForMainRoot();
+        /** Update tree for main root. */
+        void updateTreeForMainRoot();
 
         /** Removes machine @a items. */