Changeset 77460 in vbox

Timestamp:

Feb 25, 2019 3:19:47 PM (6 years ago)

Author:

vboxsync

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

129034

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: A bit of refactoring for Chooser pane items.

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (8 diffs)
• UIChooserItemGroup.h (modified) (1 diff)

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

@@ -29 +29 @@
 
 /* GUI includes: */
+#include "UIChooserItemGlobal.h"
 #include "UIChooserItemGroup.h"
-#include "UIChooserItemGlobal.h"
 #include "UIChooserItemMachine.h"
 #include "UIChooserModel.h"
@@ -510 +510 @@
     switch (pItem->type())
     {
-        case UIChooserItemType_Group:
-        {
-            AssertMsg(!m_groupItems.contains(pItem), ("Group-item already added!"));
-            if (iPosition < 0 || iPosition >= m_groupItems.size())
-            {
-                m_pLayoutGroup->addItem(pItem);
-                m_groupItems.append(pItem);
-            }
-            else
-            {
-                m_pLayoutGroup->insertItem(iPosition, pItem);
-                m_groupItems.insert(iPosition, pItem);
-            }
-            break;
-        }
         case UIChooserItemType_Global:
         {
@@ -546 +531 @@
             break;
         }
+        case UIChooserItemType_Group:
+        {
+            AssertMsg(!m_groupItems.contains(pItem), ("Group-item already added!"));
+            if (iPosition < 0 || iPosition >= m_groupItems.size())
+            {
+                m_pLayoutGroup->addItem(pItem);
+                m_groupItems.append(pItem);
+            }
+            else
+            {
+                m_pLayoutGroup->insertItem(iPosition, pItem);
+                m_groupItems.insert(iPosition, pItem);
+            }
+            break;
+        }
         case UIChooserItemType_Machine:
         {
@@ -580 +580 @@
     switch (pItem->type())
     {
+        case UIChooserItemType_Global:
+        {
+            AssertMsg(m_globalItems.contains(pItem), ("Global-item was not found!"));
+            m_globalItems.removeAt(m_globalItems.indexOf(pItem));
+            break;
+        }
         case UIChooserItemType_Group:
         {
             AssertMsg(m_groupItems.contains(pItem), ("Group-item was not found!"));
             m_groupItems.removeAt(m_groupItems.indexOf(pItem));
-            break;
-        }
-        case UIChooserItemType_Global:
-        {
-            AssertMsg(m_globalItems.contains(pItem), ("Global-item was not found!"));
-            m_globalItems.removeAt(m_globalItems.indexOf(pItem));
             break;
         }
@@ -617 +617 @@
     switch (type)
     {
+        case UIChooserItemType_Global: m_globalItems = items; break;
         case UIChooserItemType_Group: m_groupItems = items; break;
-        case UIChooserItemType_Global: m_globalItems = items; break;
         case UIChooserItemType_Machine: m_machineItems = items; break;
         default: AssertMsgFailed(("Invalid item type!")); break;
@@ -635 +635 @@
     {
         case UIChooserItemType_Any: return items(UIChooserItemType_Global) + items(UIChooserItemType_Group) + items(UIChooserItemType_Machine);
+        case UIChooserItemType_Global: return m_globalItems;
         case UIChooserItemType_Group: return m_groupItems;
-        case UIChooserItemType_Global: return m_globalItems;
         case UIChooserItemType_Machine: return m_machineItems;
         default: break;
@@ -649 +649 @@
         case UIChooserItemType_Any:
             return hasItems(UIChooserItemType_Global) || hasItems(UIChooserItemType_Group) || hasItems(UIChooserItemType_Machine);
+        case UIChooserItemType_Global:
+            return !m_globalItems.isEmpty();
         case UIChooserItemType_Group:
             return !m_groupItems.isEmpty();
-        case UIChooserItemType_Global:
-            return !m_globalItems.isEmpty();
         case UIChooserItemType_Machine:
             return !m_machineItems.isEmpty();
@@ -665 +665 @@
         case UIChooserItemType_Any:
         {
+            clearItems(UIChooserItemType_Global);
             clearItems(UIChooserItemType_Group);
-            clearItems(UIChooserItemType_Global);
             clearItems(UIChooserItemType_Machine);
             break;
         }
+        case UIChooserItemType_Global:
+        {
+            while (!m_globalItems.isEmpty()) { delete m_globalItems.last(); }
+            AssertMsg(m_globalItems.isEmpty(), ("Global items cleanup failed!"));
+            break;
+        }
         case UIChooserItemType_Group:
         {
             while (!m_groupItems.isEmpty()) { delete m_groupItems.last(); }
             AssertMsg(m_groupItems.isEmpty(), ("Group items cleanup failed!"));
-            break;
-        }
-        case UIChooserItemType_Global:
-        {
-            while (!m_globalItems.isEmpty()) { delete m_globalItems.last(); }
-            AssertMsg(m_globalItems.isEmpty(), ("Global items cleanup failed!"));
             break;
         }

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

@@ -376 +376 @@
         QGraphicsLinearLayout *m_pLayoutMachine;
 
+        /** Holds the global children list. */
+        QList<UIChooserItem*>  m_globalItems;
         /** Holds the group children list. */
         QList<UIChooserItem*>  m_groupItems;
-        /** Holds the global children list. */
-        QList<UIChooserItem*>  m_globalItems;
         /** Holds the machine children list. */
         QList<UIChooserItem*>  m_machineItems;