VirtualBox

Changeset 94078 in vbox


Ignore:
Timestamp:
Mar 3, 2022 4:24:56 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt, Main/Unattended: bugref:9515, bugref:9781. Utilizing the new IUnattended property to determine if unattended install is supported.

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

    r93645 r94078  
    926926    if (m_fSkipUnattendedInstall)
    927927        return false;
    928     if (!isOSTypeDetectionOK())
     928    if (!isUnattendedInstallSupported())
    929929        return false;
    930930    return true;
    931931}
    932932
    933 bool UIWizardNewVM::isOSTypeDetectionOK() const
    934 {
    935     QString strDetectedOSTypeId = detectedOSTypeId();
    936     if (strDetectedOSTypeId.isEmpty())
    937         return false;
    938     if (strDetectedOSTypeId.contains("other", Qt::CaseInsensitive))
    939         return false;
    940     return true;
     933bool UIWizardNewVM::isUnattendedInstallSupported() const
     934{
     935    AssertReturn(!m_comUnattended.isNull(), false);
     936    return m_comUnattended.GetIsUnattendedInstallSupported();
    941937}
    942938
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

    r93642 r94078  
    5353                  const QString &strMachineGroup, const QString &strHelpHashtag, CUnattended &comUnattended);
    5454    bool isUnattendedEnabled() const;
    55     bool isOSTypeDetectionOK() const;
     55    bool isUnattendedInstallSupported() const;
    5656    bool isGuestOSTypeWindows() const;
    5757
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

    r94055 r94078  
    941941        return;
    942942    }
    943     if (!isOSTypeDetectionOK())
     943    if (!isUnattendedInstallSupported())
    944944    {
    945945        m_pSkipUnattendedCheckBox->setEnabled(false);
     
    974974}
    975975
    976 bool UIWizardNewVMExpertPage::isOSTypeDetectionOK() const
     976bool UIWizardNewVMExpertPage::isUnattendedInstallSupported() const
    977977{
    978978    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    979979    AssertReturn(pWizard, false);
    980     return pWizard->isOSTypeDetectionOK();
     980    return pWizard->isUnattendedInstallSupported();
    981981}
    982982
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h

    r93606 r94078  
    124124    void setSkipCheckBoxEnable();
    125125    bool isUnattendedEnabled() const;
    126     bool isOSTypeDetectionOK() const;
     126    bool isUnattendedInstallSupported() const;
    127127    void setEnableDiskSelectionWidgets(bool fEnabled);
    128128
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

    r94055 r94078  
    561561        return;
    562562    }
    563     if (!isOSTypeDetectionOK())
     563    if (!isUnattendedInstallSupported())
    564564    {
    565565        m_pSkipUnattendedCheckBox->setEnabled(false);
     
    577577}
    578578
    579 bool UIWizardNewVMNameOSTypePage::isOSTypeDetectionOK() const
     579bool UIWizardNewVMNameOSTypePage::isUnattendedInstallSupported() const
    580580{
    581581    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    582582    AssertReturn(pWizard, false);
    583     return pWizard->isOSTypeDetectionOK();
     583    return pWizard->isUnattendedInstallSupported();
    584584}
    585585
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

    r93990 r94078  
    8787    void setSkipCheckBoxEnable();
    8888    bool isUnattendedEnabled() const;
    89     bool isOSTypeDetectionOK() const;
     89    bool isUnattendedInstallSupported() const;
    9090    void setEditionSelectorEnabled();
    9191
  • trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

    r94075 r94078  
    35633563HRESULT Unattended::getIsUnattendedInstallSupported(BOOL *aIsUnattendedInstallSupported)
    35643564{
    3565     *aIsUnattendedInstallSupported = true;
     3565    /* Unattended is disabled by default if we could not detect OS type. */
     3566    if (mStrDetectedOSTypeId.isEmpty() || mStrDetectedOSVersion.isEmpty())
     3567    {
     3568        *aIsUnattendedInstallSupported = false;
     3569        return S_OK;
     3570    }
    35663571    return S_OK;
    35673572}
Note: See TracChangeset for help on using the changeset viewer.

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