Changeset 101285 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 27, 2023 9:17:00 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Refactoring UIGuestOSTypeSelectionButton to adjust the new guest os type structure.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -44 +44 @@
 
 
-
+/** A wrapper and manager class for Guest OS types (IGuestOSType). Logically we structure os types into families
+  *  e.g. Window, Linux etc. Some families have so-called variants which for Linux corresponds to distros, while some
+  *  families have no variant. Under variants (and when no variant exists direcly under family) we have guest os
+  *  types, e.g. Debian12_x64 etc. */
 class SHARED_LIBRARY_STUFF UIGuestOSTypeManager
 {
@@ -50 +53 @@
 public:
 
+    /* A list of all OS families. 'first' of each pair is famil Id and 'second' is family description. */
     typedef QVector<QPair<QString, QString> > UIGuestOSTypeFamilyInfo;
     typedef QVector<QPair<QString, QString> > UIGuestOSTypeInfo;

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

@@ -33 +33 @@
 /* GUI includes */
 #include "UICommon.h"
+#include "UIGuestOSType.h"
 #include "UIGuestOSTypeSelectionButton.h"
 #include "UIIconPool.h"
 
+/* Other VBox includes: */
+#include "iprt/assert.h"
 
 UIGuestOSTypeSelectionButton::UIGuestOSTypeSelectionButton(QWidget *pParent)
@@ -76 +79 @@
 void UIGuestOSTypeSelectionButton::setOSTypeId(const QString &strOSTypeId)
 {
+    if (m_strOSTypeId == strOSTypeId)
+        return;
+    const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+    AssertReturnVoid(pManager);
+
     m_strOSTypeId = strOSTypeId;
-    CGuestOSType enmType = uiCommon().vmGuestOSType(strOSTypeId);
 
 #ifndef VBOX_WS_MAC
     /* Looks ugly on the Mac: */
-    setIcon(generalIconPool().guestOSTypePixmapDefault(enmType.GetId()));
+    setIcon(generalIconPool().guestOSTypePixmapDefault(m_strOSTypeId));
 #endif
 
-    setText(enmType.GetDescription());
+    setText(pManager->getDescription(m_strOSTypeId));
 }
 
@@ -92 +99 @@
 }
 
+void UIGuestOSTypeSelectionButton::createOSTypeMenu(const UIGuestOSTypeManager::UIGuestOSTypeInfo &typeList, QMenu *pMenu)
+{
+    for (int j = 0; j < typeList.size(); ++j)
+    {
+        const QPair<QString, QString> &typeInfo = typeList[j];
+        QAction *pAction = pMenu->addAction(generalIconPool().guestOSTypePixmapDefault(typeInfo.first), typeInfo.second);
+        connect(pAction, &QAction::triggered,
+                m_pSignalMapper, static_cast<void(QSignalMapper::*)(void)>(&QSignalMapper::map));
+        m_pSignalMapper->setMapping(pAction, typeInfo.first);
+    }
+}
+
 void UIGuestOSTypeSelectionButton::populateMenu()
 {
-    /* Clea initially: */
+    /* Clear initially: */
     m_pMainMenu->clear();
 
-    /* Create a list of all possible OS types: */
-    foreach(const QString &strFamilyId, uiCommon().vmGuestOSFamilyIDs())
+    const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+    AssertReturnVoid(pManager);
+    UIGuestOSTypeManager::UIGuestOSTypeFamilyInfo familyList = pManager->getFamilies();
+
+    for (int i = 0; i < familyList.size(); ++i)
     {
-        QMenu *pSubMenu = m_pMainMenu->addMenu(uiCommon().vmGuestOSFamilyDescription(strFamilyId));
-        foreach (const CGuestOSType &comType, uiCommon().vmGuestOSTypeList(strFamilyId))
+        const QPair<QString, QString> &familyInfo = familyList[i];
+        QMenu *pSubMenu = m_pMainMenu->addMenu(familyInfo.second);
+        QStringList variantList = pManager->getVariantListForFamilyId(familyInfo.first);
+
+        if (variantList.isEmpty())
+            createOSTypeMenu(pManager->getTypeListForFamilyId(familyInfo.first), pSubMenu);
+        else
         {
-            QAction *pAction = pSubMenu->addAction(generalIconPool().guestOSTypePixmapDefault(comType.GetId()),
-                                                   comType.GetDescription());
-            connect(pAction, &QAction::triggered,
-                    m_pSignalMapper, static_cast<void(QSignalMapper::*)(void)>(&QSignalMapper::map));
-            m_pSignalMapper->setMapping(pAction, comType.GetId());
+            foreach (const QString &strVariant, variantList)
+                createOSTypeMenu(pManager->getTypeListForVariant(strVariant), pSubMenu->addMenu(strVariant));
         }
     }

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

@@ -72 +72 @@
     /** Populates menu. */
     void populateMenu();
-
+    /** A help fundtion for populateMenu(). @p is the list of os type and @p pMenu is the menu to populate. */
+    void createOSTypeMenu(const QVector<QPair<QString, QString> > &typeList, QMenu *pMenu);
     /** Holds the current guest OS type ID. */
     QString  m_strOSTypeId;