Changeset 77627 in vbox

Timestamp:

Mar 9, 2019 2:45:05 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Chooser pane: Group item: Proper prepare/cleanup cascade.

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (7 diffs)
• UIChooserItemGroup.h (modified) (2 diffs)

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

@@ -44 +44 @@
 UIChooserItemGroup::UIChooserItemGroup(QGraphicsScene *pScene)
     : UIChooserItem(0, false /* favorite? */)
+    , m_pScene(pScene)
+    , m_pItemToCopy(0)
+    , m_iPosition(0)
     , m_fClosed(false)
     , m_iAdditionalHeight(0)
@@ -60 +63 @@
     , m_pLayoutMachine(0)
 {
-    /* Prepare: */
     prepare();
-
-    /* Add item to the scene: */
-    AssertMsg(pScene, ("Incorrect scene passed!"));
-    pScene->addItem(this);
-
-    /* Apply language settings: */
-    retranslateUi();
-
-    /* Prepare connections: */
-    connect(this, &UIChooserItemGroup::sigMinimumWidthHintChanged,
-            model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged);
 }
 
@@ -80 +71 @@
                                        int iPosition /* = -1 */)
     : UIChooserItem(pParent, pParent->isFavorite())
+    , m_pScene(0)
+    , m_pItemToCopy(0)
+    , m_iPosition(iPosition)
     , m_strName(strName)
     , m_fClosed(!fOpened)
@@ -97 +91 @@
     , m_pLayoutMachine(0)
 {
-    /* Prepare: */
     prepare();
-
-    /* Add item to the parent: */
-    AssertMsg(parentItem(), ("Incorrect parent passed!"));
-    parentItem()->addItem(this, false, iPosition);
-    connect(this, &UIChooserItemGroup::sigToggleStarted,
-            model(), &UIChooserModel::sigToggleStarted);
-    connect(this, &UIChooserItemGroup::sigToggleFinished,
-            model(), &UIChooserModel::sigToggleFinished,
-            Qt::QueuedConnection);
-    connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
-            this, &UIChooserItemGroup::sltHandleWindowRemapped);
-
-    /* Apply language settings: */
-    retranslateUi();
-
-    /* Init: */
-    updatePixmaps();
-    updateItemCountInfo();
-    updateVisibleName();
-    updateToolTip();
-
-    /* Prepare connections: */
-    connect(this, &UIChooserItemGroup::sigMinimumWidthHintChanged,
-            model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged);
 }
 
@@ -129 +98 @@
                                        int iPosition /* = -1 */)
     : UIChooserItem(pParent, pParent->isFavorite())
+    , m_pScene(0)
+    , m_pItemToCopy(pCopiedItem)
+    , m_iPosition(iPosition)
     , m_strName(pCopiedItem->name())
     , m_fClosed(pCopiedItem->isClosed())
@@ -146 +118 @@
     , m_pLayoutMachine(0)
 {
-    /* Prepare: */
     prepare();
-
-    /* Add item to the parent: */
-    AssertMsg(parentItem(), ("Incorrect parent passed!"));
-    parentItem()->addItem(this, false, iPosition);
-    connect(this, &UIChooserItemGroup::sigToggleStarted,
-            model(), &UIChooserModel::sigToggleStarted);
-    connect(this, &UIChooserItemGroup::sigToggleFinished,
-            model(), &UIChooserModel::sigToggleFinished);
-    connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
-            this, &UIChooserItemGroup::sltHandleWindowRemapped);
-
-    /* Copy content to 'this': */
-    copyContent(pCopiedItem, this);
-
-    /* Apply language settings: */
-    retranslateUi();
-
-    /* Init: */
-    updatePixmaps();
-    updateItemCountInfo();
-    updateVisibleName();
-    updateToolTip();
 }
 
 UIChooserItemGroup::~UIChooserItemGroup()
 {
-    /* Delete group name editor: */
-    delete m_pNameEditorWidget;
-    m_pNameEditorWidget = 0;
-
-    /* Delete all the items: */
-    clearItems();
-
-    /* If that item is focused: */
-    if (model()->focusItem() == this)
-    {
-        /* Unset the focus: */
-        model()->setFocusItem(0);
-    }
-    /* If that item is in selection list: */
-    if (model()->currentItems().contains(this))
-    {
-        /* Remove item from the selection list: */
-        model()->removeFromCurrentItems(this);
-    }
-    /* If that item is in navigation list: */
-    if (model()->navigationList().contains(this))
-    {
-        /* Remove item from the navigation list: */
-        model()->removeFromNavigationList(this);
-    }
-
-    /* Remove item from the parent: */
-    if (parentItem())
-        parentItem()->removeItem(this);
+    cleanup();
 }
 
@@ -1361 +1282 @@
         }
     }
+
+    /* Add item directly to the scene (if passed): */
+    if (m_pScene)
+        m_pScene->addItem(this);
+    /* Add item to the parent instead (if passed),
+     * it will be added to the scene indirectly: */
+    else if (parentItem())
+        parentItem()->addItem(this, isFavorite(), m_iPosition);
+    /* Otherwise sombody forgot to pass scene or parent. */
+    else
+        AssertFailedReturnVoid();
+
+    /* Copy item contents if any: */
+    if (m_pItemToCopy)
+        copyContent(m_pItemToCopy, this);
+
+    /* Apply language settings: */
+    retranslateUi();
+
+    /* Initialize non-root items: */
+    if (!isRoot())
+    {
+        updatePixmaps();
+        updateItemCountInfo();
+        updateVisibleName();
+        updateToolTip();
+    }
+
+    /* Configure connections: */
+    connect(this, &UIChooserItemGroup::sigMinimumWidthHintChanged,
+            model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged);
+    if (!isRoot())
+    {
+        /* Non-root items can be toggled: */
+        connect(this, &UIChooserItemGroup::sigToggleStarted,
+                model(), &UIChooserModel::sigToggleStarted);
+        connect(this, &UIChooserItemGroup::sigToggleFinished,
+                model(), &UIChooserModel::sigToggleFinished,
+                Qt::QueuedConnection);
+        /* Non-root items requires pixmap updates: */
+        connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
+                this, &UIChooserItemGroup::sltHandleWindowRemapped);
+    }
+}
+
+void UIChooserItemGroup::cleanup()
+{
+    /* Delete group name editor: */
+    delete m_pNameEditorWidget;
+    m_pNameEditorWidget = 0;
+
+    /* Delete all the items: */
+    clearItems();
+
+    /* If that item is focused: */
+    if (model()->focusItem() == this)
+    {
+        /* Unset the focus: */
+        model()->setFocusItem(0);
+    }
+    /* If that item is in selection list: */
+    if (model()->currentItems().contains(this))
+    {
+        /* Remove item from the selection list: */
+        model()->removeFromCurrentItems(this);
+    }
+    /* If that item is in navigation list: */
+    if (model()->navigationList().contains(this))
+    {
+        /* Remove item from the navigation list: */
+        model()->removeFromNavigationList(this);
+    }
+
+    /* Remove item from the parent: */
+    if (parentItem())
+        parentItem()->removeItem(this);
 }
 

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

@@ -251 +251 @@
         /** Prepares all. */
         void prepare();
+        /** Cleanups all. */
+        void cleanup();
     /** @} */
 
@@ -317 +319 @@
     /** @name Item stuff.
       * @{ */
+        /** Holds the graphics scene reference. */
+        QGraphicsScene      *m_pScene;
+        /** Holds the copied chooser item reference. */
+        UIChooserItemGroup  *m_pItemToCopy;
+        /** Holds the item position. */
+        const int            m_iPosition;
+
         /** Holds the cached name. */
         QString  m_strName;