Changeset 84456 in vbox for trunk/src

Timestamp:

May 22, 2020 12:43:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move group sorting action trigger handling to proper place in UIVirtualBoxManager class.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (4 diffs)
• chooser/UIChooserModel.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1303 +1303 @@
 }
 
+void UIVirtualBoxManager::sltPerformGroupSorting()
+{
+    m_pWidget->performGroupSorting();
+}
+
 void UIVirtualBoxManager::sltGroupCloseMenuAboutToShow()
 {
@@ -1524 +1529 @@
     connect(actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateMachineShortcut);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Sort), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformGroupSorting);
 
     /* 'Machine' menu connections: */
@@ -1550 +1557 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateMachineShortcut);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformGroupSorting);
 
     /* 'Group/Start or Show' menu connections: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -247 +247 @@
         /** Handles call to create machine shortcut. */
         void sltPerformCreateMachineShortcut();
+
+        /** Handles call to sort group. */
+        void sltPerformGroupSorting();
 
         /** Handles call to show group Close menu. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -114 +114 @@
 {
     m_pPaneChooser->openGroupNameEditor();
+}
+
+void UIVirtualBoxManagerWidget::performGroupSorting()
+{
+    m_pPaneChooser->performGroupSorting();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -137 +137 @@
         /** Opens group name editor. */
         void openGroupNameEditor();
+        /** Performs group sorting. */
+        void performGroupSorting();
     /** @} */
 

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

@@ -111 +111 @@
     AssertPtrReturnVoid(model());
     model()->startEditingSelectedGroupItemName();
+}
+
+void UIChooser::performGroupSorting()
+{
+    AssertPtrReturnVoid(model());
+    model()->sortSelectedGroupItem();
 }
 

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

@@ -131 +131 @@
         /** Opens group name editor. */
         void openGroupNameEditor();
+        /** Performs group sorting. */
+        void performGroupSorting();
     /** @} */
 

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

@@ -570 +570 @@
 }
 
+void UIChooserModel::sortSelectedGroupItem()
+{
+    /* For single selected group, sort first selected item children: */
+    if (isSingleGroupSelected())
+        firstSelectedItem()->node()->sortNodes();
+    /* Otherwise, sort first selected item neighbors: */
+    else
+        firstSelectedItem()->parentItem()->node()->sortNodes();
+
+    /* Remember first selected item definition: */
+    const QString strDefinition = firstSelectedItem() ? firstSelectedItem()->definition() : QString();
+
+    /* Rebuild tree for main root: */
+    buildTreeForMainRoot();
+
+    /* Restore selection if there was some item before: */
+    if (!strDefinition.isNull())
+        setSelectedItem(strDefinition);
+    /* Else make sure at least one item selected: */
+    else
+        makeSureAtLeastOneItemSelected();
+}
+
 void UIChooserModel::setCurrentDragObject(QDrag *pDragObject)
 {
@@ -796 +819 @@
 }
 
-void UIChooserModel::sltSortGroup()
-{
-    /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Group_S_Sort)->isEnabled())
-        return;
-    /* Only for single selected group: */
-    if (!isSingleGroupSelected())
-        return;
-
-    /* Sort nodes: */
-    firstSelectedItem()->node()->sortNodes();
-
-    /* Rebuild tree for main root: */
-    buildTreeForMainRoot();
-}
-
 void UIChooserModel::sltUngroupSelectedGroup()
 {
@@ -1026 +1033 @@
     setSelectedItem(pNewGroupItem);
     saveGroups();
-}
-
-void UIChooserModel::sltSortParentGroup()
-{
-    /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Machine_S_SortParent)->isEnabled())
-        return;
-    /* Only if some item selected: */
-    if (!firstSelectedItem())
-        return;
-
-    /* Sort nodes: */
-    firstSelectedItem()->parentItem()->node()->sortNodes();
-
-    /* Rebuild tree for main root: */
-    buildTreeForMainRoot();
 }
 
@@ -1391 +1382 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh), &UIAction::triggered,
             this, &UIChooserModel::sltPerformRefreshAction);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent), &UIAction::triggered,
-            this, &UIChooserModel::sltSortParentGroup);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Sort), &UIAction::triggered,
-            this, &UIChooserModel::sltSortGroup);
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Search), &UIAction::triggered,
             this, &UIChooserModel::sltShowHideSearchWidget);

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

@@ -215 +215 @@
         /** Starts editing selected group item name. */
         void startEditingSelectedGroupItemName();
-
         /** Starts or shows selected items. */
         void startOrShowSelectedItems();
+        /** Sorts selected [parent] group item. */
+        void sortSelectedGroupItem();
 
         /** Defines current @a pDragObject. */
@@ -289 +290 @@
     /** @name Children stuff.
       * @{ */
-        /** Handles group sort request. */
-        void sltSortGroup();
         /** Handles group destroy request. */
         void sltUngroupSelectedGroup();
@@ -298 +297 @@
         /** Handles group selected machines request. */
         void sltGroupSelectedMachines();
-        /** Handles sort parent group request. */
-        void sltSortParentGroup();
         /** Handles refresh request. */
         void sltPerformRefreshAction();