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

Timestamp:

Oct 26, 2018 2:34:21 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Tools pane: Sane default values in case if items restored from extra-data are missing.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsModel.cpp (modified) (3 diffs)
• UIToolsModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -317 +317 @@
 }
 
+UIToolsItem *UIToolsModel::item(UIToolType enmType) const
+{
+    foreach (UIToolsItem *pItem, items())
+        if (pItem->itemType() == enmType)
+            return pItem;
+    return 0;
+}
+
 void UIToolsModel::updateLayout()
 {
@@ -509 +517 @@
         if (pItem->itemType() == enmTypeGlobal)
             m_pLastItemGlobal = pItem;
-    AssertPtr(m_pLastItemGlobal.data());
+    if (m_pLastItemGlobal.isNull())
+        m_pLastItemGlobal = item(UIToolType_Welcome);
 
     /* Second of them is current machine class item definition: */
@@ -518 +527 @@
         if (pItem->itemType() == enmTypeMachine)
             m_pLastItemMachine = pItem;
-    AssertPtr(m_pLastItemMachine.data());
+    if (m_pLastItemMachine.isNull())
+        m_pLastItemMachine = item(UIToolType_Details);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -123 +123 @@
     /** @name Children stuff.
       * @{ */
-        /** Holds the item list. */
+        /** Returns the item list. */
         QList<UIToolsItem*> items() const;
+
+        /** Returns the item of passed @a enmType. */
+        UIToolsItem *item(UIToolType enmType) const;
     /** @} */