Changeset 43444 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 27, 2012 7:18:12 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature: Make sure grouping is disabled if all the chosen items are full children list of one group already.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (4 diffs)
• graphics/chooser/UIGChooser.cpp (modified) (1 diff)
• graphics/chooser/UIGChooser.h (modified) (1 diff)
• graphics/chooser/UIGChooserModel.cpp (modified) (4 diffs)
• graphics/chooser/UIGChooserModel.h (modified) (1 diff)

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

@@ -796 +796 @@
 
     /* Determine which menu to show: */
-    m_pGroupMenuAction->setVisible(m_pChooser->singleGroupSelected());
-    m_pMachineMenuAction->setVisible(!m_pChooser->singleGroupSelected());
+    m_pGroupMenuAction->setVisible(m_pChooser->isSingleGroupSelected());
+    m_pMachineMenuAction->setVisible(!m_pChooser->isSingleGroupSelected());
     if (m_pGroupMenuAction->isVisible())
     {
@@ -832 +832 @@
             /* Always hide snapshots-view if
              * single group or more than one machine is selected: */
-            if (currentItems().size() > 1 || m_pChooser->singleGroupSelected())
+            if (currentItems().size() > 1 || m_pChooser->isSingleGroupSelected())
                 m_pVMDesktop->lockSnapshots();
         }
@@ -1678 +1678 @@
         {
             return !m_pChooser->isGroupSavingInProgress() &&
-                   m_pChooser->singleGroupSelected();
+                   m_pChooser->isSingleGroupSelected();
         }
         case UIActionIndexSelector_Simple_Machine_Settings:
@@ -1701 +1701 @@
         {
             return !m_pChooser->isGroupSavingInProgress() &&
+                   !m_pChooser->isAllItemsOfOneGroupSelected() &&
                    isItemsPoweredOff(items);
         }

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

@@ -95 +95 @@
 }
 
-bool UIGChooser::singleGroupSelected() const
+bool UIGChooser::isSingleGroupSelected() const
 {
-    return m_pChooserModel->singleGroupSelected();
+    return m_pChooserModel->isSingleGroupSelected();
+}
+
+bool UIGChooser::isAllItemsOfOneGroupSelected() const
+{
+    return m_pChooserModel->isAllItemsOfOneGroupSelected();
 }
 

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

@@ -63 +63 @@
     UIVMItem* currentItem() const;
     QList<UIVMItem*> currentItems() const;
-    bool singleGroupSelected() const;
+    bool isSingleGroupSelected() const;
+    bool isAllItemsOfOneGroupSelected() const;
 
     /* API: Status bar stuff: */

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

@@ -346 +346 @@
 }
 
-bool UIGChooserModel::singleGroupSelected() const
+bool UIGChooserModel::isSingleGroupSelected() const
 {
     return selectionList().size() == 1 &&
            selectionList().first()->type() == UIGChooserItemType_Group;
+}
+
+bool UIGChooserModel::isAllItemsOfOneGroupSelected() const
+{
+    /* Make sure at least on item selected: */
+    if (selectionList().isEmpty())
+        return false;
+
+    /* Determine the parent group of the first item: */
+    UIGChooserItem *pFirstParent = selectionList().first()->parentItem();
+
+    /* Make sure this parent is not main root item: */
+    if (pFirstParent == mainRoot())
+        return false;
+
+    /* Enumerate selected set: */
+    QSet<UIGChooserItem*> selectedSet;
+    foreach (UIGChooserItem *pSelectedItem, selectionList())
+        selectedSet << pSelectedItem;
+
+    /* Enumerate first parent children set: */
+    QSet<UIGChooserItem*> firstParentSet;
+    foreach (UIGChooserItem *pSelectedItem, pFirstParent->items())
+        firstParentSet << pSelectedItem;
+
+    /* Check if both sets contains the same: */
+    return selectedSet == firstParentSet;
 }
 
@@ -885 +912 @@
 
     /* Only for single selected group: */
-    if (!singleGroupSelected())
+    if (!isSingleGroupSelected())
         return;
 
@@ -895 +922 @@
 {
     UIGChooserItem *pGroup = 0;
-    if (singleGroupSelected())
+    if (isSingleGroupSelected())
         pGroup = selectionList().first();
     else if (!selectionList().isEmpty())
@@ -1003 +1030 @@
 void UIGChooserModel::sltSortGroup()
 {
-    if (singleGroupSelected())
+    if (isSingleGroupSelected())
         sortItems(selectionList().first());
 }

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

@@ -118 +118 @@
     void setCurrentItemDefinition(const QString &strDefinition);
     QString currentItemDefinition() const;
-    bool singleGroupSelected() const;
+    bool isSingleGroupSelected() const;
+    bool isAllItemsOfOneGroupSelected() const;
 
     /* API: Focus item stuff: */