Changeset 42879 in vbox

Timestamp:

Aug 20, 2012 11:34:13 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Rework 'Ungroup' action to be less destructive.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (1 diff)
• selector/UISelectorShortcuts.cpp (modified) (1 diff)
• selector/UISelectorShortcuts.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserItemGroup.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserItemGroup.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)

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

@@ -1245 +1245 @@
 }
 
+void UIMessageCenter::notifyAboutCollisionOnGroupRemovingCantBeResolved(const QString &strName, const QString &strGroupName)
+{
+    message(&vboxGlobal().selectorWnd(),
+            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>")
+               .arg(strName, strGroupName),
+            0, /* auto-confirm id */
+            QIMessageBox::Ok | QIMessageBox::Default);
+}
+
+int UIMessageCenter::askAboutCollisionOnGroupRemoving(const QString &strName, const QString &strGroupName)
+{
+    return message(&vboxGlobal().selectorWnd(),
+                   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>"
+                      "<p>Would you like to automatically rename it?</p>")
+                      .arg(strName, strGroupName),
+                   0, /* auto-confirm id */
+                   QIMessageBox::Ok,
+                   QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default,
+                   0,
+                   tr("Rename"));
+}
+
 int UIMessageCenter::confirmMachineItemRemoval(const QStringList &names)
 {

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

@@ -255 +255 @@
     int cannotEnterSeamlessMode();
 
+    void notifyAboutCollisionOnGroupRemovingCantBeResolved(const QString &strName, const QString &strGroupName);
+    int askAboutCollisionOnGroupRemoving(const QString &strName, const QString &strGroupName);
     int confirmMachineItemRemoval(const QStringList &names);
     int confirmMachineDeletion(const QList<CMachine> &machines);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -258 +258 @@
                          ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png")
     {
-        setShortcut(gSS->keySequence(UISelectorShortcuts::BreakVMGroupShortcut));
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Break Group..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Break the selected virtual machine group"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::AddVMGroupShortcut));
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "&Ungroup..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Ungroup items of the selected virtual machine group"));
     }
 };

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp

@@ -36 +36 @@
     m_Shortcuts[SettingsVMShortcut]          = UIKeySequence("SettingsVM",          "Ctrl+S");
     m_Shortcuts[CloneVMShortcut]             = UIKeySequence("CloneVM",             "Ctrl+O");
-    m_Shortcuts[BreakVMGroupShortcut]        = UIKeySequence("BreakVMGroup",        "Ctrl+B");
     m_Shortcuts[RemoveVMShortcut]            = UIKeySequence("RemoveVM",            "Ctrl+R");
     m_Shortcuts[RenameVMGroupShortcut]       = UIKeySequence("RenameVMGroup",       "Ctrl+M");

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.h

@@ -38 +38 @@
         SettingsVMShortcut,
         CloneVMShortcut,
-        BreakVMGroupShortcut,
         RemoveVMShortcut,
         RenameVMGroupShortcut,

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -166 +166 @@
 {
     return m_strName;
+}
+
+void UIGChooserItemGroup::setName(const QString &strName)
+{
+    m_strName = strName;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h

@@ -64 +64 @@
     /* API: Basic stuff: */
     QString name() const;
+    void setName(const QString &strName);
     bool closed() const;
     bool opened() const;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -689 +689 @@
     AssertMsg(focusItem()->type() == UIGChooserItemType_Group, ("This is not group item!"));
 
-    /* Compose focus group name: */
-    QString strFocusGroupName = fullName(focusItem());
-    /* Enumerate all the unique sub-machine-items recursively: */
-    QList<UIVMItem*> items;
-    enumerateCurrentItems(focusItem()->items(), items);
-    /* Enumerate all the machine groups recursively: */
-    QMap<QString, QStringList> groupMap;
-    gatherGroupTree(groupMap, mainRoot());
-
-    /* For each the sub-machine-item: */
-    foreach (UIVMItem *pItem, items)
-    {
-        /* Get machine groups: */
-        QStringList groups = groupMap.value(pItem->id());
-        /* For each the machine group: */
-        bool fUniqueMachine = true;
-        foreach (const QString &strGroupName, groups)
-        {
-            /* Check if this item is unique: */
-            if (strGroupName != strFocusGroupName &&
-                !strGroupName.startsWith(strFocusGroupName + "/"))
+    /* Check if we have collisions with our siblings: */
+    UIGChooserItem *pFocusItem = focusItem();
+    UIGChooserItem *pParentItem = pFocusItem->parentItem();
+    QList<UIGChooserItem*> siblings = pParentItem->items();
+    QList<UIGChooserItem*> toBeRenamed;
+    QList<UIGChooserItem*> toBeRemoved;
+    foreach (UIGChooserItem *pItem, pFocusItem->items())
+    {
+        QString strItemName = pItem->name();
+        UIGChooserItem *pCollisionSibling = 0;
+        foreach (UIGChooserItem *pSibling, siblings)
+            if (pSibling != pFocusItem && pSibling->name() == strItemName)
+                pCollisionSibling = pSibling;
+        if (pCollisionSibling)
+        {
+            if (pItem->type() == UIGChooserItemType_Machine)
             {
-                fUniqueMachine = false;
+                if (pCollisionSibling->type() == UIGChooserItemType_Machine)
+                    toBeRemoved << pItem;
+                else if (pCollisionSibling->type() == UIGChooserItemType_Group)
+                {
+                    msgCenter().notifyAboutCollisionOnGroupRemovingCantBeResolved(strItemName, pParentItem->name());
+                    return;
+                }
+            }
+            else if (pItem->type() == UIGChooserItemType_Group)
+            {
+                if (msgCenter().askAboutCollisionOnGroupRemoving(strItemName, pParentItem->name()) == QIMessageBox::Ok)
+                    toBeRenamed << pItem;
+                else
+                    return;
+            }
+        }
+    }
+
+    /* Copy all the children into our parent: */
+    foreach (UIGChooserItem *pItem, pFocusItem->items())
+    {
+        if (toBeRemoved.contains(pItem))
+            continue;
+        switch (pItem->type())
+        {
+            case UIGChooserItemType_Group:
+            {
+                UIGChooserItemGroup *pGroupItem = new UIGChooserItemGroup(pParentItem, pItem->toGroupItem());
+                if (toBeRenamed.contains(pItem))
+                    pGroupItem->setName(uniqueGroupName(pParentItem));
                 break;
             }
-        }
-        /* Add unique item into root: */
-        if (fUniqueMachine)
-            createMachineItem(pItem->machine(), mainRoot());
+            case UIGChooserItemType_Machine:
+            {
+                new UIGChooserItemMachine(pParentItem, pItem->toMachineItem());
+                break;
+            }
+        }
     }