Changeset 86671 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 22, 2020 2:55:41 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Cloud Profile Manager: Restore current item by definition while loading cloud stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager

Files:

• UICloudProfileManager.cpp (modified) (4 diffs)
• UICloudProfileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -25 +25 @@
 #include "QIInputDialog.h"
 #include "QIMessageBox.h"
+#include "QIToolBar.h"
 #include "QITreeWidget.h"
-#include "UICommon.h"
 #include "UIActionPoolManager.h"
 #include "UICloudNetworkingStuff.h"
+#include "UICloudProfileDetailsWidget.h"
+#include "UICloudProfileManager.h"
+#include "UICommon.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
-#include "UICloudProfileDetailsWidget.h"
-#include "UICloudProfileManager.h"
 #include "UIMessageCenter.h"
-#include "QIToolBar.h"
+#include "UIVirtualBoxEventHandler.h"
 
 /* COM includes: */
@@ -814 +815 @@
 void UICloudProfileManagerWidget::loadCloudStuff()
 {
+    /* Save current item definition: */
+    QITreeWidgetItem *pCurrentItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
+    const QString strDefinition = pCurrentItem ? pCurrentItem->data(Column_Name, Data_Definition).toString() : QString();
+
     /* Clear tree first of all: */
     m_pTreeWidget->clear();
@@ -852 +857 @@
     }
 
-    /* Choose the 1st item as current initially: */
-    m_pTreeWidget->setCurrentItem(m_pTreeWidget->topLevelItem(0));
+    /* Try to restore current item by definition: */
+    if (!strDefinition.isEmpty())
+        m_pTreeWidget->setCurrentItem(searchItem(strDefinition));
+    /* Choose the 1st item as current if nothing chosen: */
+    if (!m_pTreeWidget->currentItem())
+        m_pTreeWidget->setCurrentItem(m_pTreeWidget->topLevelItem(0));
+    /* Handle current item change in any case: */
     sltHandleCurrentItemChange();
 }
@@ -915 +925 @@
     if (!comProfile.isOk())
         msgCenter().cannotAcquireCloudProfileParameter(comProfile, this);
+}
+
+QTreeWidgetItem *UICloudProfileManagerWidget::searchItem(const QString &strDefinition,
+                                                         QTreeWidgetItem *pParentItem /* = 0 */) const
+{
+    /* If no parent-item passed => we will start from the invisible-root-item: */
+    if (!pParentItem)
+        pParentItem = m_pTreeWidget->invisibleRootItem();
+
+    /* Check whether parent-item is of required type: */
+    QITreeWidgetItem *pParentItemOfType = QITreeWidgetItem::toItem(pParentItem);
+    if (pParentItemOfType)
+    {
+        /* Check if parent-item has required definition: */
+        if (pParentItemOfType->data(Column_Name, Data_Definition).toString() == strDefinition)
+            return pParentItem;
+    }
+
+    /* Iterate through parent-item children: */
+    for (int i = 0; i < pParentItem->childCount(); ++i)
+        if (QTreeWidgetItem *pChildItem = searchItem(strDefinition, pParentItem->child(i)))
+            return pChildItem;
+
+    /* Null by default: */
+    return 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.h

@@ -168 +168 @@
     /** @name Tree-widget stuff.
       * @{ */
-        /** Seearches a provider item with specified @a uId. */
+        /** Recursively searches for an item with specified @a strDefinition,
+          * using @a pParentItem as an item to start search from. */
+        QTreeWidgetItem *searchItem(const QString &strDefinition,
+                                    QTreeWidgetItem *pParentItem = 0) const;
+        /** Searches for a provider item with specified @a uId. */
         UIItemCloudProvider *searchItem(const QUuid &uId) const;