Changeset 79981 in vbox

Timestamp:

Jul 25, 2019 2:59:57 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VM settings / System page: Move excessively distributed boot order loading/saving logic to UIBootOrderEditor files where it belongs; This logic is now represented by UIBootDataTools namespace.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsSystem.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsSystem.h (modified) (2 diffs)
• widgets/UIBootOrderEditor.cpp (modified) (2 diffs)
• widgets/UIBootOrderEditor.h (modified) (2 diffs)

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

@@ -771 +771 @@
             m_pLayoutBootOrder->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3);
 #endif
-
-            /* Boot-order tree-widget created in the .ui file. */
-            AssertPtrReturnVoid(m_pBootOrderEditor);
-            {
-                /* Populate possible boot items list.
-                 * Currently, it seems, we are supporting only 4 possible boot device types:
-                 * 1. Floppy, 2. DVD-ROM, 3. Hard Disk, 4. Network.
-                 * But maximum boot devices count supported by machine
-                 * should be retrieved through the ISystemProperties getter.
-                 * Moreover, possible boot device types are not listed in some separate Main vector,
-                 * so we should get them (randomely?) from the list of all device types.
-                 * Until there will be separate Main getter for list of supported boot device types,
-                 * this list will be hard-coded here... */
-                const CSystemProperties properties = uiCommon().virtualBox().GetSystemProperties();
-                const int iPossibleBootListSize = qMin((ULONG)4, properties.GetMaxBootPosition());
-                for (int iBootPosition = 1; iBootPosition <= iPossibleBootListSize; ++iBootPosition)
-                {
-                    switch (iBootPosition)
-                    {
-                        case 1: m_possibleBootItems << KDeviceType_Floppy; break;
-                        case 2: m_possibleBootItems << KDeviceType_DVD; break;
-                        case 3: m_possibleBootItems << KDeviceType_HardDisk; break;
-                        case 4: m_possibleBootItems << KDeviceType_Network; break;
-                        default: break;
-                    }
-                }
-            }
         }
 
@@ -1026 +999 @@
 }
 
-UIBootItemDataList UIMachineSettingsSystem::loadBootItems(const CMachine &comMachine)
-{
-    /* Prepare boot items: */
-    UIBootItemDataList bootItems;
-
-    /* Gather boot-items of current VM: */
-    QList<KDeviceType> usedBootItems;
-    for (int i = 1; i <= m_possibleBootItems.size(); ++i)
-    {
-        const KDeviceType enmType = comMachine.GetBootOrder(i);
-        if (enmType != KDeviceType_Null)
-        {
-            usedBootItems << enmType;
-            UIBootItemData data;
-            data.m_enmType = enmType;
-            data.m_fEnabled = true;
-            bootItems << data;
-        }
-    }
-    /* Gather other unique boot-items: */
-    for (int i = 0; i < m_possibleBootItems.size(); ++i)
-    {
-        const KDeviceType enmType = m_possibleBootItems[i];
-        if (!usedBootItems.contains(enmType))
-        {
-            UIBootItemData data;
-            data.m_enmType = enmType;
-            data.m_fEnabled = false;
-            bootItems << data;
-        }
-    }
-
-    /* Return boot items: */
-    return bootItems;
-}
-
-void UIMachineSettingsSystem::saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine)
-{
-    bool fSuccess = true;
-    int iBootIndex = 0;
-    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
-    {
-        if (bootItems.at(i).m_fEnabled)
-        {
-            comMachine.SetBootOrder(++iBootIndex, bootItems.at(i).m_enmType);
-            fSuccess = comMachine.isOk();
-        }
-    }
-    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
-    {
-        if (!bootItems.at(i).m_fEnabled)
-        {
-            comMachine.SetBootOrder(++iBootIndex, KDeviceType_Null);
-            fSuccess = comMachine.isOk();
-        }
-    }
-}
-
 bool UIMachineSettingsSystem::saveSystemData()
 {

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

@@ -143 +143 @@
     void retranslateComboParavirtProvider();
 
-    /** Loads boot item list for passed @a comMachine. */
-    UIBootItemDataList loadBootItems(const CMachine &comMachine);
-    /** Saves @a bootItems list to passed @a comMachine. */
-    void saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine);
-
     /** Saves existing system data from the cache. */
     bool saveSystemData();
@@ -156 +151 @@
     /** Saves existing 'Acceleration' data from the cache. */
     bool saveAccelerationData();
-
-    /** Holds the list of all possible boot items. */
-    QList<KDeviceType>  m_possibleBootItems;
 
     /** Holds the minimum guest CPU count. */

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

@@ -23 +23 @@
 /* GUI includes: */
 #include "UIBootOrderEditor.h"
+#include "UICommon.h"
 #include "UIConverter.h"
 #include "UIIconPool.h"
 #include "UIToolBar.h"
+
+/* COM includes: */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CSystemProperties.h"
 
 
@@ -283 +289 @@
 
 /*********************************************************************************************************************************
+*   Class UIBootDataTools implementation.                                                                                        *
+*********************************************************************************************************************************/
+
+UIBootItemDataList UIBootDataTools::loadBootItems(const CMachine &comMachine)
+{
+    /* Gather a list of all possible boot items.
+     * Currently, it seems, we are supporting only 4 possible boot device types:
+     * 1. Floppy, 2. DVD-ROM, 3. Hard Disk, 4. Network.
+     * But maximum boot devices count supported by machine should be retrieved
+     * through the ISystemProperties getter.  Moreover, possible boot device
+     * types are not listed in some separate Main vector, so we should get them
+     * (randomely?) from the list of all device types.  Until there will be a
+     * separate Main getter for list of supported boot device types, this list
+     * will be hard-coded here... */
+    QVector<KDeviceType> possibleBootItems = QVector<KDeviceType>() << KDeviceType_Floppy
+                                                                    << KDeviceType_DVD
+                                                                    << KDeviceType_HardDisk
+                                                                    << KDeviceType_Network;
+    const CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    const int iPossibleBootListSize = qMin((ULONG)4, comProperties.GetMaxBootPosition());
+    possibleBootItems.resize(iPossibleBootListSize);
+
+    /* Prepare boot items: */
+    UIBootItemDataList bootItems;
+
+    /* Gather boot-items of current VM: */
+    QList<KDeviceType> usedBootItems;
+    for (int i = 1; i <= possibleBootItems.size(); ++i)
+    {
+        const KDeviceType enmType = comMachine.GetBootOrder(i);
+        if (enmType != KDeviceType_Null)
+        {
+            usedBootItems << enmType;
+            UIBootItemData data;
+            data.m_enmType = enmType;
+            data.m_fEnabled = true;
+            bootItems << data;
+        }
+    }
+    /* Gather other unique boot-items: */
+    for (int i = 0; i < possibleBootItems.size(); ++i)
+    {
+        const KDeviceType enmType = possibleBootItems.at(i);
+        if (!usedBootItems.contains(enmType))
+        {
+            UIBootItemData data;
+            data.m_enmType = enmType;
+            data.m_fEnabled = false;
+            bootItems << data;
+        }
+    }
+
+    /* Return boot items: */
+    return bootItems;
+}
+
+void UIBootDataTools::saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine)
+{
+    bool fSuccess = true;
+    int iBootIndex = 0;
+    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
+    {
+        if (bootItems.at(i).m_fEnabled)
+        {
+            comMachine.SetBootOrder(++iBootIndex, bootItems.at(i).m_enmType);
+            fSuccess = comMachine.isOk();
+        }
+    }
+    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
+    {
+        if (!bootItems.at(i).m_fEnabled)
+        {
+            comMachine.SetBootOrder(++iBootIndex, KDeviceType_Null);
+            fSuccess = comMachine.isOk();
+        }
+    }
+}
+
+
+/*********************************************************************************************************************************
 *   Class UIBootOrderEditor implementation.                                                                                      *
 *********************************************************************************************************************************/

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

@@ -36 +36 @@
 class UIToolBar;
 class UIBootListWidget;
+class CMachine;
 
 
@@ -62 +63 @@
 };
 typedef QList<UIBootItemData> UIBootItemDataList;
+
+
+/** Boot data tools namespace. */
+namespace UIBootDataTools
+{
+    /** Loads boot item list for passed @a comMachine. */
+    SHARED_LIBRARY_STUFF UIBootItemDataList loadBootItems(const CMachine &comMachine);
+    /** Saves @a bootItems list to passed @a comMachine. */
+    SHARED_LIBRARY_STUFF void saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine);
+}
+using namespace UIBootDataTools;