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

Timestamp:

Jul 13, 2018 12:44:55 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9206: Reworking VBoxGlobal, UIGuestOSTypeSelectionButton and UINameAndSystemEditor to use more proper guest OS type family ID list.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• widgets/UIGuestOSTypeSelectionButton.cpp (modified) (1 diff)
• widgets/UINameAndSystemEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2143 +2143 @@
 }
 
-QList<CGuestOSType> VBoxGlobal::vmGuestOSFamilyList() const
-{
-    QList<CGuestOSType> result;
-    for (int i = 0; i < m_guestOSFamilyIDs.size(); ++i)
-        result << m_guestOSTypes[i][0];
-    return result;
+QString VBoxGlobal::vmGuestOSFamilyDescription(const QString &strFamilyId) const
+{
+    AssertMsg(m_guestOSFamilyDescriptions.contains(strFamilyId),
+              ("Family ID incorrect: '%s'.", strFamilyId.toLatin1().constData()));
+    return m_guestOSFamilyDescriptions.value(strFamilyId);
 }
 
 QList<CGuestOSType> VBoxGlobal::vmGuestOSTypeList(const QString &strFamilyId) const
 {
-    AssertMsg(m_guestOSFamilyIDs.contains(strFamilyId), ("Family ID incorrect: '%s'.", strFamilyId.toLatin1().constData()));
+    AssertMsg(m_guestOSFamilyIDs.contains(strFamilyId),
+              ("Family ID incorrect: '%s'.", strFamilyId.toLatin1().constData()));
     return m_guestOSFamilyIDs.contains(strFamilyId) ?
            m_guestOSTypes[m_guestOSFamilyIDs.indexOf(strFamilyId)] : QList<CGuestOSType>();
@@ -4385 +4385 @@
                 const CGuestOSType os = guestOSTypes.at(i);
                 const QString strFamilyID = os.GetFamilyId();
+                const QString strFamilyDescription = os.GetFamilyDescription();
                 if (!m_guestOSFamilyIDs.contains(strFamilyID))
                 {
                     m_guestOSFamilyIDs << strFamilyID;
+                    m_guestOSFamilyDescriptions[strFamilyID] = strFamilyDescription;
                     m_guestOSTypes << QList<CGuestOSType>();
                 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -21 +21 @@
 /* Qt includes: */
 #include <QFileIconProvider>
+#include <QMap>
 #include <QReadWriteLock>
 
@@ -442 +443 @@
     /** @name COM: Guest OS Type.
      * @{ */
-        /** Returns the list of few guest OS types, queried from
-          * IVirtualBox corresponding to every family id. */
-        QList<CGuestOSType> vmGuestOSFamilyList() const;
-        /** Returns the list of all guest OS types, queried from
-          * IVirtualBox corresponding to passed family id. */
+        /** Returns the list of family IDs. */
+        QList<QString> vmGuestOSFamilyIDs() const { return m_guestOSFamilyIDs; }
+
+        /** Returns a family description with passed @a strFamilyId. */
+        QString vmGuestOSFamilyDescription(const QString &strFamilyId) const;
+        /** Returns a list of all guest OS types with passed @a strFamilyId. */
         QList<CGuestOSType> vmGuestOSTypeList(const QString &strFamilyId) const;
 
-        /** Returns the guest OS type object corresponding to the given type id of list
-          * containing OS types related to OS family determined by family id attribute.
-          * If the index is invalid a null object is returned. */
+        /** Returns the guest OS type for passed @a strTypeId.
+          * It is being serached through the list of family with passed @a strFamilyId if specified. */
         CGuestOSType vmGuestOSType(const QString &strTypeId, const QString &strFamilyId = QString()) const;
-        /** Returns the description corresponding to the given guest OS type id. */
+        /** Returns a type description with passed @a strTypeId. */
         QString vmGuestOSTypeDescription(const QString &strTypeId) const;
 
@@ -833 +834 @@
         /** Holds the guest OS family IDs. */
         QList<QString>               m_guestOSFamilyIDs;
+        /** Holds the guest OS family descriptions. */
+        QMap<QString, QString>       m_guestOSFamilyDescriptions;
         /** Holds the guest OS types for each family ID. */
         QList<QList<CGuestOSType> >  m_guestOSTypes;

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

@@ -84 +84 @@
 void UIGuestOSTypeSelectionButton::populateMenu()
 {
+    /* Clea initially: */
     m_pMainMenu->clear();
 
-    /* Create a list of all possible OS types */
-    QList<CGuestOSType> families = vboxGlobal().vmGuestOSFamilyList();
-    foreach(const CGuestOSType &comFamily, families)
+    /* Create a list of all possible OS types: */
+    foreach(const QString &strFamilyId, vboxGlobal().vmGuestOSFamilyIDs())
     {
-        QMenu *pSubMenu = m_pMainMenu->addMenu(comFamily.GetFamilyDescription());
-        QList<CGuestOSType> types = vboxGlobal().vmGuestOSTypeList(comFamily.GetFamilyId());
-        foreach (const CGuestOSType &comType, types)
+        QMenu *pSubMenu = m_pMainMenu->addMenu(vboxGlobal().vmGuestOSFamilyDescription(strFamilyId));
+        foreach (const CGuestOSType &comType, vboxGlobal().vmGuestOSTypeList(strFamilyId))
         {
             QAction *pAction = pSubMenu->addAction(vboxGlobal().vmGuestOSTypePixmapDefault(comType.GetId()),

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

@@ -338 +338 @@
 {
     /* Populate VM OS family combo: */
-    const QList<CGuestOSType> families = vboxGlobal().vmGuestOSFamilyList();
-    for (int i = 0; i < families.size(); ++i)
-    {
-        const QString strFamilyName = families.at(i).GetFamilyDescription();
-        m_pComboFamily->insertItem(i, strFamilyName);
-        m_pComboFamily->setItemData(i, families.at(i).GetFamilyId(), TypeID);
+    const QList<QString> &familyIDs = vboxGlobal().vmGuestOSFamilyIDs();
+    for (int i = 0; i < familyIDs.size(); ++i)
+    {
+        const QString &strFamilyId = familyIDs.at(i);
+        m_pComboFamily->insertItem(i, vboxGlobal().vmGuestOSFamilyDescription(strFamilyId));
+        m_pComboFamily->setItemData(i, strFamilyId, TypeID);
     }