VirtualBox

Changeset 102162 in vbox for trunk/src


Ignore:
Timestamp:
Nov 20, 2023 5:32:01 PM (17 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
160287
Message:

FE/Qt: bugref:10513: UINameAndSystemEditor: Make sure editor allows to specify both x86 and ARM platform types for default case only (like New VM wizard); Same editor for VM settings case should be limited by current VM platform type which is fixed for now.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp

    r102153 r102162  
    6363    m_guestOSTypes.append(UIGuestOSType(comType));
    6464    m_typeIdIndexMap[m_guestOSTypes.last().getId()] = m_guestOSTypes.size() - 1;
    65     QPair<QString, QString> family = QPair<QString, QString>(m_guestOSTypes.last().getFamilyId(), m_guestOSTypes.last().getFamilyDescription());
     65    const QString strFamilyId = m_guestOSTypes.last().getFamilyId();
     66    const QString strFamilyDesc = m_guestOSTypes.last().getFamilyDescription();
     67    const QString strSubtype = m_guestOSTypes.last().getSubtype();
     68    QPair<QString, QString> family = QPair<QString, QString>(strFamilyId, strFamilyDesc);
    6669    if (!m_guestOSFamilies.contains(family))
    6770        m_guestOSFamilies << family;
    68 }
    69 
    70 UIGuestOSTypeManager::UIGuestOSFamilyInfo UIGuestOSTypeManager::getFamilies() const
    71 {
    72     return m_guestOSFamilies;
    73 }
    74 
    75 QStringList UIGuestOSTypeManager::getSubtypeListForFamilyId(const QString &strFamilyId) const
    76 {
     71
     72    /* Acquire arch type: */
     73    const KPlatformArchitecture enmArch = m_guestOSTypes.last().getPlatformArchitecture();
     74    /* Cache family arch type; That will be x86, ARM or None (for *any*): */
     75    if (!m_guestOSFamilyArch.contains(strFamilyId))
     76        m_guestOSFamilyArch[strFamilyId] = enmArch;
     77    else if (m_guestOSFamilyArch.value(strFamilyId) != enmArch)
     78        m_guestOSFamilyArch[strFamilyId] = KPlatformArchitecture_None;
     79    /* Cache subtype arch type; That will be x86, ARM or None (for *any*): */
     80    if (!m_guestOSSubtypeArch.contains(strSubtype))
     81        m_guestOSSubtypeArch[strSubtype] = enmArch;
     82    else if (m_guestOSSubtypeArch.value(strSubtype) != enmArch)
     83        m_guestOSSubtypeArch[strSubtype] = KPlatformArchitecture_None;
     84}
     85
     86UIGuestOSTypeManager::UIGuestOSFamilyInfo
     87UIGuestOSTypeManager::getFamilies(KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
     88{
     89    /* Return all families by default: */
     90    if (enmArch == KPlatformArchitecture_None)
     91        return m_guestOSFamilies;
     92
     93    /* Otherwise we'll have to prepare list by arch type: */
     94    UIGuestOSTypeManager::UIGuestOSFamilyInfo families;
     95    foreach (const UIGuestInfoPair &family, m_guestOSFamilies)
     96    {
     97        const KPlatformArchitecture enmCurrentArch = m_guestOSFamilyArch.value(family.first, KPlatformArchitecture_Max);
     98        if (   enmCurrentArch == enmArch
     99            || enmCurrentArch == KPlatformArchitecture_None)
     100            families << family;
     101    }
     102    return families;
     103}
     104
     105QStringList
     106UIGuestOSTypeManager::getSubtypeListForFamilyId(const QString &strFamilyId,
     107                                                KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
     108{
     109    /* Prepare list by arch type: */
    77110    QStringList subtypes;
    78111    foreach (const UIGuestOSType &type, m_guestOSTypes)
    … …  
    83116        if (strSubtype.isEmpty() || subtypes.contains(strSubtype))
    84117            continue;
    85         subtypes << strSubtype;
     118        const KPlatformArchitecture enmCurrentArch = m_guestOSSubtypeArch.value(strSubtype, KPlatformArchitecture_Max);
     119        if (   enmCurrentArch == enmArch
     120            || enmArch == KPlatformArchitecture_None
     121            || enmCurrentArch == KPlatformArchitecture_None)
     122            subtypes << strSubtype;
    86123    }
    87124    return subtypes;
    88125}
    89126
    90 UIGuestOSTypeManager::UIGuestOSTypeInfo UIGuestOSTypeManager::getTypeListForFamilyId(const QString &strFamilyId) const
     127UIGuestOSTypeManager::UIGuestOSTypeInfo
     128UIGuestOSTypeManager::getTypeListForFamilyId(const QString &strFamilyId,
     129                                             KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
    91130{
    92131    UIGuestOSTypeInfo typeInfoList;
    … …  
    98137        if (typeInfoList.contains(info))
    99138            continue;
    100         typeInfoList << info;
     139        if (   enmArch == KPlatformArchitecture_None
     140            || type.getPlatformArchitecture() == enmArch)
     141            typeInfoList << info;
    101142    }
    102143    return typeInfoList;
    103144}
    104145
    105 UIGuestOSTypeManager::UIGuestOSTypeInfo UIGuestOSTypeManager::getTypeListForSubtype(const QString &strSubtype) const
     146UIGuestOSTypeManager::UIGuestOSTypeInfo
     147UIGuestOSTypeManager::getTypeListForSubtype(const QString &strSubtype,
     148                                            KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
    106149{
    107150    UIGuestOSTypeInfo typeInfoList;
    … …  
    115158        if (typeInfoList.contains(info))
    116159            continue;
    117         typeInfoList << info;
     160        if (   enmArch == KPlatformArchitecture_None
     161            || type.getPlatformArchitecture() == enmArch)
     162            typeInfoList << info;
    118163    }
    119164    return typeInfoList;

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

    r102153 r102162  
    114114
    115115    /** Returns a list of all families (id and description). */
    116     UIGuestOSFamilyInfo getFamilies() const;
     116    UIGuestOSFamilyInfo getFamilies(KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
    117117    /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
    118     QStringList         getSubtypeListForFamilyId(const QString &strFamilyId) const;
     118    QStringList         getSubtypeListForFamilyId(const QString &strFamilyId,
     119                                                  KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
    119120    /** Returns a list of OS types for the @p strFamilyId. */
    120     UIGuestOSTypeInfo   getTypeListForFamilyId(const QString &strFamilyId) const;
     121    UIGuestOSTypeInfo   getTypeListForFamilyId(const QString &strFamilyId,
     122                                               KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
    121123    /** Returns a list of OS types for the @p strSubtype. */
    122     UIGuestOSTypeInfo   getTypeListForSubtype(const QString &strSubtype) const;
     124    UIGuestOSTypeInfo   getTypeListForSubtype(const QString &strSubtype,
     125                                              KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
    123126
    124127    static bool isDOSType(const QString &strOSTypeId);
    … …  
    155158    /** First item of the pair is family id and the 2nd is family description. */
    156159    UIGuestOSFamilyInfo m_guestOSFamilies;
     160
     161    /** Caches arch types on per-family basis. */
     162    QMap<QString, KPlatformArchitecture>  m_guestOSFamilyArch;
     163    /** Caches arch types on per-subtype basis. */
     164    QMap<QString, KPlatformArchitecture>  m_guestOSSubtypeArch;
    157165};
    158166

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

    r102152 r102162  
    303303}
    304304
     305void UINameAndSystemEditor::handleFilterChange()
     306{
     307    populateFamilyCombo();
     308}
     309
    305310void UINameAndSystemEditor::sltSelectedEditionsChanged(int)
    306311{
    … …  
    329334    m_strDistribution = strDistribution;
    330335
     336    /* Get current arch type, usually we'd default to x86, but here 'None' meaningful as well: */
     337    const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
     338                                        ? optionalFlags().value("arch").value<KPlatformArchitecture>()
     339                                        : KPlatformArchitecture_None;
     340
    331341    /* If distribution list is empty, all the types of the family are added to type combo: */
    332342    const UIGuestOSTypeManager::UIGuestOSTypeInfo types
    333343         = m_strDistribution.isEmpty()
    334          ? uiCommon().guestOSTypeManager().getTypeListForFamilyId(m_strFamilyId)
    335          : uiCommon().guestOSTypeManager().getTypeListForSubtype(m_strDistribution);
     344         ? uiCommon().guestOSTypeManager().getTypeListForFamilyId(m_strFamilyId, enmArch)
     345         : uiCommon().guestOSTypeManager().getTypeListForSubtype(m_strDistribution, enmArch);
    336346
    337347    /* Save the most recently used item: */
    … …  
    600610    AssertPtrReturnVoid(m_pComboFamily);
    601611
     612    /* Get current arch type, usually we'd default to x86, but here 'None' meaningful as well: */
     613    const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
     614                                        ? optionalFlags().value("arch").value<KPlatformArchitecture>()
     615                                        : KPlatformArchitecture_None;
     616
    602617    /* Acquire family IDs: */
    603     const UIGuestOSTypeManager::UIGuestOSFamilyInfo &families = uiCommon().guestOSTypeManager().getFamilies();
     618    const UIGuestOSTypeManager::UIGuestOSFamilyInfo families = uiCommon().guestOSTypeManager().getFamilies(enmArch);
    604619
    605620    /* Block signals initially and clear the combo: */
    … …  
    629644    AssertPtrReturnVoid(m_pComboDistribution);
    630645
     646    /* Get current arch type, usually we'd default to x86, but here 'None' meaningful as well: */
     647    const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
     648                                        ? optionalFlags().value("arch").value<KPlatformArchitecture>()
     649                                        : KPlatformArchitecture_None;
     650
    631651    /* Acquire a list of suitable sub-types: */
    632     const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId);
     652    const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId, enmArch);
    633653    m_pLabelDistribution->setEnabled(!distributions.isEmpty());
    634654    m_pComboDistribution->setEnabled(!distributions.isEmpty());

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

    r101713 r102162  
    142142    /** Handles translation event. */
    143143    virtual void retranslateUi() RT_OVERRIDE;
     144
     145    /** Handles filter change.
     146      * Reimplement this in subclass to handle various filter changes,
     147      * like experience mode change or manual filter editor change. */
     148    virtual void handleFilterChange() RT_OVERRIDE;
    144149
    145150private slots:
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette