Changeset 79964 in vbox for trunk/src

Timestamp:

Jul 24, 2019 6:36:34 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VM settings / System page: Move load/save boot items logic to UIBootTable where it belongs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsSystem.cpp (modified) (4 diffs)
• widgets/UIBootTable.cpp (modified) (1 diff)
• widgets/UIBootTable.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -272 +272 @@
     /* Load old 'Motherboard' data from the cache: */
     m_pSliderMemorySize->setValue(oldSystemData.m_iMemorySize);
+    mTwBootOrder->setBootItems(oldSystemData.m_bootItems);
     const int iChipsetTypePosition = m_pComboChipsetType->findData(oldSystemData.m_chipsetType);
     m_pComboChipsetType->setCurrentIndex(iChipsetTypePosition == -1 ? 0 : iChipsetTypePosition);
@@ -279 +280 @@
     m_pCheckBoxEFI->setChecked(oldSystemData.m_fEnabledEFI);
     m_pCheckBoxUseUTC->setChecked(oldSystemData.m_fEnabledUTC);
-    /* Remove any old data in the boot view: */
-    QAbstractItemView *pItemView = qobject_cast<QAbstractItemView*>(mTwBootOrder);
-    pItemView->model()->removeRows(0, pItemView->model()->rowCount());
-    /* Apply internal variables data to QWidget(s): */
-    for (int i = 0; i < oldSystemData.m_bootItems.size(); ++i)
-    {
-        const UIBootItemData data = oldSystemData.m_bootItems[i];
-        QListWidgetItem *pItem = new UIBootTableItem(data.m_enmType);
-        pItem->setCheckState(data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
-        mTwBootOrder->addItem(pItem);
-    }
 
     /* Load old 'Processor' data from the cache: */
@@ -323 +313 @@
     /* Gather 'Motherboard' data: */
     newSystemData.m_iMemorySize = m_pSliderMemorySize->value();
+    newSystemData.m_bootItems = mTwBootOrder->bootItems();
     newSystemData.m_chipsetType = (KChipsetType)m_pComboChipsetType->itemData(m_pComboChipsetType->currentIndex()).toInt();
     newSystemData.m_pointingHIDType = (KPointingHIDType)m_pComboPointingHIDType->itemData(m_pComboPointingHIDType->currentIndex()).toInt();
@@ -329 +320 @@
     newSystemData.m_fEnabledEFI = m_pCheckBoxEFI->isChecked();
     newSystemData.m_fEnabledUTC = m_pCheckBoxUseUTC->isChecked();
-    /* Gather boot-table data: */
-    newSystemData.m_bootItems.clear();
-    for (int i = 0; i < mTwBootOrder->count(); ++i)
-    {
-        QListWidgetItem *pItem = mTwBootOrder->item(i);
-        UIBootItemData bootData;
-        bootData.m_enmType = static_cast<UIBootTableItem*>(pItem)->type();
-        bootData.m_fEnabled = pItem->checkState() == Qt::Checked;
-        newSystemData.m_bootItems << bootData;
-    }
 
     /* Gather 'Processor' data: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp

@@ -65 +65 @@
 }
 
+void UIBootTable::setBootItems(const UIBootItemDataList &bootItems)
+{
+    /* Clear initially: */
+    clear();
+
+    /* Apply internal variables data to QWidget(s): */
+    foreach (const UIBootItemData &data, bootItems)
+    {
+        UIBootTableItem *pItem = new UIBootTableItem(data.m_enmType);
+        pItem->setCheckState(data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
+        addItem(pItem);
+    }
+}
+
+UIBootItemDataList UIBootTable::bootItems() const
+{
+    /* Prepare boot items: */
+    UIBootItemDataList bootItems;
+
+    /* Enumerate all the items we have: */
+    for (int i = 0; i < count(); ++i)
+    {
+        QListWidgetItem *pItem = item(i);
+        UIBootItemData bootData;
+        bootData.m_enmType = static_cast<UIBootTableItem*>(pItem)->type();
+        bootData.m_fEnabled = pItem->checkState() == Qt::Checked;
+        bootItems << bootData;
+    }
+
+    /* Return boot items: */
+    return bootItems;
+}
+
 void UIBootTable::adjustSizeToFitContent()
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h

@@ -77 +77 @@
     /** Holds the item type. */
     KDeviceType m_enmType;
-
 };
 
@@ -96 +95 @@
     /** Constructs boot-table passing @a pParent to the base-class. */
     UIBootTable(QWidget *pParent = 0);
+
+    /** Defines @a bootItems list. */
+    void setBootItems(const UIBootItemDataList &bootItems);
+    /** Returns boot item list. */
+    UIBootItemDataList bootItems() const;
 
     /** Adjusts table size to fit contents. */