Changeset 84461 in vbox for trunk/src

Timestamp:

May 22, 2020 1:31:42 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move group disband action trigger handling to proper place in UIVirtualBoxManager class; A bit of rework for corresponding functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• manager/chooser/UIChooser.cpp (modified) (1 diff)
• manager/chooser/UIChooser.h (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)
• manager/chooser/UIChooserModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -630 +630 @@
 {
     alert(0, MessageType_Error,
-          tr("<p>You are trying to move machine <nobr><b>%1</b></nobr> "
-             "to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p>"
-             "<p>Please resolve this name-conflict and try again.</p>")
+          tr("<p>You are trying to move machine <nobr><b>%1</b></nobr> to group "
+             "<nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
+             "<p>Please resolve this name conflict and try again.</p>")
              .arg(strCollisionName, strGroupName));
 }
@@ -639 +639 @@
 {
     return questionBinary(0, MessageType_Question,
-                          tr("<p>You are trying to move group <nobr><b>%1</b></nobr> "
-                             "to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
+                          tr("<p>You are trying to move group <nobr><b>%1</b></nobr> to group "
+                             "<nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
                              "<p>Would you like to automatically rename it?</p>")
                              .arg(strName, strGroupName),

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

@@ -605 +605 @@
 }
 
+void UIVirtualBoxManager::sltDisbandGroup()
+{
+    m_pWidget->disbandGroup();
+}
+
 void UIVirtualBoxManager::sltOpenMachineSettingsDialog(QString strCategory /* = QString() */,
                                                        QString strControl /* = QString() */,
@@ -1515 +1520 @@
     connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenGroupNameEditor);
+    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltDisbandGroup);
     connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);

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

@@ -190 +190 @@
         /** Handles call to open group name editor. */
         void sltOpenGroupNameEditor();
+        /** Handles call to disband group. */
+        void sltDisbandGroup();
 
         /** Handles call to open Machine Settings dialog.

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

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

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

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

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

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

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

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

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

@@ -565 +565 @@
 }
 
+void UIChooserModel::disbandSelectedGroupItem()
+{
+    /* Only for single selected group: */
+    if (!isSingleGroupSelected())
+        return;
+
+    /* Check if we have collisions with our potential siblings: */
+    UIChooserItem *pCurrentItem = currentItem();
+    UIChooserNode *pCurrentNode = pCurrentItem->node();
+    UIChooserItem *pParentItem = pCurrentItem->parentItem();
+    UIChooserNode *pParentNode = pParentItem->node();
+    QList<UIChooserNode*> childrenToBeRenamed;
+    foreach (UIChooserNode *pChildNode, pCurrentNode->nodes())
+    {
+        const QString strChildName = pChildNode->name();
+        UIChooserNode *pCollisionSibling = 0;
+        foreach (UIChooserNode *pSiblingNode, pParentNode->nodes())
+            if (pSiblingNode != pCurrentNode && pSiblingNode->name() == strChildName)
+            {
+                pCollisionSibling = pSiblingNode;
+                break;
+            }
+        if (pCollisionSibling)
+        {
+            switch (pChildNode->type())
+            {
+                case UIChooserNodeType_Machine:
+                {
+                    msgCenter().cannotResolveCollisionAutomatically(strChildName, pParentNode->name());
+                    return;
+                }
+                case UIChooserNodeType_Group:
+                {
+                    if (!msgCenter().confirmAutomaticCollisionResolve(strChildName, pParentNode->name()))
+                        return;
+                    childrenToBeRenamed << pChildNode;
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+
+    /* Copy all the children into our parent: */
+    QList<UIChooserItem*> ungroupedItems;
+    foreach (UIChooserNode *pNode, pCurrentNode->nodes())
+    {
+        switch (pNode->type())
+        {
+            case UIChooserNodeType_Group:
+            {
+                UIChooserNodeGroup *pGroupNode = new UIChooserNodeGroup(pParentNode,
+                                                                        pNode->toGroupNode(),
+                                                                        pParentNode->nodes().size());
+                UIChooserItemGroup *pGroupItem = new UIChooserItemGroup(pParentItem, pGroupNode);
+                if (childrenToBeRenamed.contains(pNode))
+                    pGroupNode->setName(uniqueGroupName(pParentNode));
+                ungroupedItems << pGroupItem;
+                break;
+            }
+            case UIChooserNodeType_Machine:
+            {
+                UIChooserNodeMachine *pMachineNode = new UIChooserNodeMachine(pParentNode,
+                                                                              pNode->toMachineNode(),
+                                                                              pParentNode->nodes().size());
+                UIChooserItemMachine *pMachineItem = new UIChooserItemMachine(pParentItem, pMachineNode);
+                ungroupedItems << pMachineItem;
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    /* Delete current group: */
+    delete pCurrentNode;
+
+    /* And update model: */
+    updateTreeForMainRoot();
+    if (!ungroupedItems.isEmpty())
+    {
+        setSelectedItems(ungroupedItems);
+        setCurrentItem(firstSelectedItem());
+    }
+    else
+    {
+        setSelectedItem(navigationItems().first());
+        emit sigSelectionInvalidated();
+    }
+    saveGroups();
+}
+
 void UIChooserModel::startOrShowSelectedItems()
 {
@@ -819 +912 @@
 }
 
-void UIChooserModel::sltUngroupSelectedGroup()
-{
-    /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Group_S_Remove)->isEnabled())
-        return;
-
-    /* Make sure current-item is of group type! */
-    AssertMsg(currentItem()->type() == UIChooserNodeType_Group, ("This is not group-item!"));
-
-    /* Check if we have collisions with our siblings: */
-    UIChooserItem *pCurrentItem = currentItem();
-    UIChooserNode *pCurrentNode = pCurrentItem->node();
-    UIChooserItem *pParentItem = pCurrentItem->parentItem();
-    UIChooserNode *pParentNode = pParentItem->node();
-    QList<UIChooserNode*> siblings = pParentNode->nodes();
-    QList<UIChooserNode*> toBeRenamed;
-    QList<UIChooserNode*> toBeRemoved;
-    foreach (UIChooserNode *pNode, pCurrentNode->nodes())
-    {
-        QString strItemName = pNode->name();
-        UIChooserNode *pCollisionSibling = 0;
-        foreach (UIChooserNode *pSibling, siblings)
-            if (pSibling != pCurrentNode && pSibling->name() == strItemName)
-                pCollisionSibling = pSibling;
-        if (pCollisionSibling)
-        {
-            if (pNode->type() == UIChooserNodeType_Machine)
-            {
-                if (pCollisionSibling->type() == UIChooserNodeType_Machine)
-                    toBeRemoved << pNode;
-                else if (pCollisionSibling->type() == UIChooserNodeType_Group)
-                {
-                    msgCenter().cannotResolveCollisionAutomatically(strItemName, pParentNode->name());
-                    return;
-                }
-            }
-            else if (pNode->type() == UIChooserNodeType_Group)
-            {
-                if (msgCenter().confirmAutomaticCollisionResolve(strItemName, pParentNode->name()))
-                    toBeRenamed << pNode;
-                else
-                    return;
-            }
-        }
-    }
-
-    /* Copy all the children into our parent: */
-    QList<UIChooserItem*> copiedItems;
-    foreach (UIChooserNode *pNode, pCurrentNode->nodes())
-    {
-        if (toBeRemoved.contains(pNode))
-            continue;
-        switch (pNode->type())
-        {
-            case UIChooserNodeType_Group:
-            {
-                UIChooserNodeGroup *pGroupNode = new UIChooserNodeGroup(pParentNode,
-                                                                        pNode->toGroupNode(),
-                                                                        pParentNode->nodes().size());
-                UIChooserItemGroup *pGroupItem = new UIChooserItemGroup(pParentItem, pGroupNode);
-                if (toBeRenamed.contains(pNode))
-                    pGroupNode->setName(uniqueGroupName(pParentNode));
-                copiedItems << pGroupItem;
-                break;
-            }
-            case UIChooserNodeType_Machine:
-            {
-                UIChooserNodeMachine *pMachineNode = new UIChooserNodeMachine(pParentNode,
-                                                                              pNode->toMachineNode(),
-                                                                              pParentNode->nodes().size());
-                UIChooserItemMachine *pMachineItem = new UIChooserItemMachine(pParentItem, pMachineNode);
-                copiedItems << pMachineItem;
-                break;
-            }
-            default:
-                break;
-        }
-    }
-
-    /* Delete current group: */
-    delete pCurrentNode;
-
-    /* And update model: */
-    updateTreeForMainRoot();
-    if (!copiedItems.isEmpty())
-    {
-        setSelectedItems(copiedItems);
-        setCurrentItem(firstSelectedItem());
-    }
-    else
-    {
-        setSelectedItem(navigationItems().first());
-        emit sigSelectionInvalidated();
-    }
-    saveGroups();
-}
-
 void UIChooserModel::sltCreateNewMachine()
 {
@@ -1372 +1368 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
             this, &UIChooserModel::sltCreateNewMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), &UIAction::triggered,
-            this, &UIChooserModel::sltUngroupSelectedGroup);
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
             this, &UIChooserModel::sltRemoveSelectedMachine);

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

@@ -215 +215 @@
         /** Starts editing selected group item name. */
         void startEditingSelectedGroupItemName();
+        /** Disbands selected group item. */
+        void disbandSelectedGroupItem();
         /** Starts or shows selected items. */
         void startOrShowSelectedItems();
@@ -290 +292 @@
     /** @name Children stuff.
       * @{ */
-        /** Handles group destroy request. */
-        void sltUngroupSelectedGroup();
-
         /** Handles create new machine request. */
         void sltCreateNewMachine();