- Timestamp:
- Mar 3, 2022 4:24:56 PM (3 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 7 edited
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h (modified) (1 diff)
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (2 diffs)
-
Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h (modified) (1 diff)
-
Main/src-server/UnattendedImpl.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
r93645 r94078 926 926 if (m_fSkipUnattendedInstall) 927 927 return false; 928 if (!is OSTypeDetectionOK())928 if (!isUnattendedInstallSupported()) 929 929 return false; 930 930 return true; 931 931 } 932 932 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; 933 bool UIWizardNewVM::isUnattendedInstallSupported() const 934 { 935 AssertReturn(!m_comUnattended.isNull(), false); 936 return m_comUnattended.GetIsUnattendedInstallSupported(); 941 937 } 942 938 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
r93642 r94078 53 53 const QString &strMachineGroup, const QString &strHelpHashtag, CUnattended &comUnattended); 54 54 bool isUnattendedEnabled() const; 55 bool is OSTypeDetectionOK() const;55 bool isUnattendedInstallSupported() const; 56 56 bool isGuestOSTypeWindows() const; 57 57 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp
r94055 r94078 941 941 return; 942 942 } 943 if (!is OSTypeDetectionOK())943 if (!isUnattendedInstallSupported()) 944 944 { 945 945 m_pSkipUnattendedCheckBox->setEnabled(false); … … 974 974 } 975 975 976 bool UIWizardNewVMExpertPage::is OSTypeDetectionOK() const976 bool UIWizardNewVMExpertPage::isUnattendedInstallSupported() const 977 977 { 978 978 UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>(); 979 979 AssertReturn(pWizard, false); 980 return pWizard->is OSTypeDetectionOK();980 return pWizard->isUnattendedInstallSupported(); 981 981 } 982 982 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h
r93606 r94078 124 124 void setSkipCheckBoxEnable(); 125 125 bool isUnattendedEnabled() const; 126 bool is OSTypeDetectionOK() const;126 bool isUnattendedInstallSupported() const; 127 127 void setEnableDiskSelectionWidgets(bool fEnabled); 128 128 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp
r94055 r94078 561 561 return; 562 562 } 563 if (!is OSTypeDetectionOK())563 if (!isUnattendedInstallSupported()) 564 564 { 565 565 m_pSkipUnattendedCheckBox->setEnabled(false); … … 577 577 } 578 578 579 bool UIWizardNewVMNameOSTypePage::is OSTypeDetectionOK() const579 bool UIWizardNewVMNameOSTypePage::isUnattendedInstallSupported() const 580 580 { 581 581 UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>(); 582 582 AssertReturn(pWizard, false); 583 return pWizard->is OSTypeDetectionOK();583 return pWizard->isUnattendedInstallSupported(); 584 584 } 585 585 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h
r93990 r94078 87 87 void setSkipCheckBoxEnable(); 88 88 bool isUnattendedEnabled() const; 89 bool is OSTypeDetectionOK() const;89 bool isUnattendedInstallSupported() const; 90 90 void setEditionSelectorEnabled(); 91 91 -
trunk/src/VBox/Main/src-server/UnattendedImpl.cpp
r94075 r94078 3563 3563 HRESULT Unattended::getIsUnattendedInstallSupported(BOOL *aIsUnattendedInstallSupported) 3564 3564 { 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 } 3566 3571 return S_OK; 3567 3572 }
Note:
See TracChangeset
for help on using the changeset viewer.

