VirtualBox

Changeset 107889 in vbox


Ignore:
Timestamp:
Jan 22, 2025 11:31:39 AM (2 weeks ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10840. Change the label of the checkbox to enable/disable unattended install.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

    r107119 r107889  
    5959    , m_pSizeAndLocationGroup(0)
    6060    , m_pNameAndSystemEditor(0)
    61     , m_pSkipUnattendedCheckBox(0)
     61    , m_pUnattendedCheckBox(0)
    6262    , m_pNameAndSystemLayout(0)
    6363    , m_pHardwareWidgetContainer(0)
    … …  
    219219void UIWizardNewVMExpertPage::sltRetranslateUI()
    220220{
    221     if (m_pSkipUnattendedCheckBox)
    222     {
    223         m_pSkipUnattendedCheckBox->setText(UIWizardNewVM::tr("&Skip Unattended Installation"));
    224         m_pSkipUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install is disabled and the selected ISO "
    225                                                                 "is mounted on the vm."));
     221    if (m_pUnattendedCheckBox)
     222    {
     223        m_pUnattendedCheckBox->setText(UIWizardNewVM::tr("&Proceed with Unattended Installation"));
     224        m_pUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install is enabled."));
    226225    }
    227226
    … …  
    312311                this, &UIWizardNewVMExpertPage::sltSelectedDiskSourceChanged);
    313312
    314     if (m_pSkipUnattendedCheckBox)
    315         connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled,
     313    if (m_pUnattendedCheckBox)
     314        connect(m_pUnattendedCheckBox, &QCheckBox::toggled,
    316315                this, &UIWizardNewVMExpertPage::sltSkipUnattendedCheckBoxChecked);
    317316
    … …  
    728727{
    729728    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    730     m_userModifiedParameters << "SkipUnattendedInstall";
    731     wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(fSkip);
     729    m_userModifiedParameters << "UnattendedInstall";
     730    wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(!fSkip);
    732731    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
    733732    emit completeChanged();
    … …  
    981980    if (m_pNameAndSystemEditor)
    982981        m_pNameAndSystemLayout->addWidget(m_pNameAndSystemEditor, 0, 0, 1, 2);
    983     m_pSkipUnattendedCheckBox = new QCheckBox;
    984     if (m_pSkipUnattendedCheckBox)
    985         m_pNameAndSystemLayout->addWidget(m_pSkipUnattendedCheckBox, 1, 1);
     982    m_pUnattendedCheckBox = new QCheckBox;
     983    if (m_pUnattendedCheckBox)
     984    {
     985        m_pNameAndSystemLayout->addWidget(m_pUnattendedCheckBox, 1, 1);
     986        m_pUnattendedCheckBox->setChecked(true);
     987    }
    986988    return pContainerWidget;
    987989}
    … …  
    989991void UIWizardNewVMExpertPage::setSkipCheckBoxEnable()
    990992{
    991     AssertReturnVoid(m_pSkipUnattendedCheckBox && m_pNameAndSystemEditor);
     993    AssertReturnVoid(m_pUnattendedCheckBox && m_pNameAndSystemEditor);
    992994    const QString &strPath = m_pNameAndSystemEditor->ISOImagePath();
    993995    if (strPath.isEmpty())
    994996    {
    995         m_pSkipUnattendedCheckBox->setEnabled(false);
     997        m_pUnattendedCheckBox->setEnabled(false);
    996998        return;
    997999    }
    9981000    if (!isUnattendedInstallSupported())
    9991001    {
    1000         m_pSkipUnattendedCheckBox->setEnabled(false);
     1002        m_pUnattendedCheckBox->setEnabled(false);
    10011003        return;
    10021004    }
    10031005
    1004     m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
     1006    m_pUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
    10051007}
    10061008

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h

    r106061 r107889  
    145145        UIMediumSizeAndPathGroupBox *m_pSizeAndLocationGroup;
    146146        UINameAndSystemEditor *m_pNameAndSystemEditor;
    147         QCheckBox *m_pSkipUnattendedCheckBox;
     147        QCheckBox *m_pUnattendedCheckBox;
    148148        QGridLayout *m_pNameAndSystemLayout;
    149149        UINewVMHardwareContainer *m_pHardwareWidgetContainer;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

    r107852 r107889  
    477477    , m_pNameAndSystemLayout(0)
    478478    , m_pNameAndSystemEditor(0)
    479     , m_pSkipUnattendedCheckBox(0)
     479    , m_pUnattendedCheckBox(0)
    480480    , m_pNameOSTypeLabel(0)
    481481    , m_pInfoLabel(0)
    … …  
    520520        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigEditionChanged, this, &UIWizardNewVMNameOSTypePage::sltSelectedEditionChanged);
    521521    }
    522     if (m_pSkipUnattendedCheckBox)
    523         connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMNameOSTypePage::sltSkipUnattendedInstallChanged);
     522    if (m_pUnattendedCheckBox)
     523        connect(m_pUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMNameOSTypePage::sltSkipUnattendedInstallChanged);
    524524}
    525525
    … …  
    575575                                                      "may be used to install the guest operating system."));
    576576
    577     if (m_pSkipUnattendedCheckBox)
    578     {
    579         m_pSkipUnattendedCheckBox->setText(UIWizardNewVM::tr("&Skip Unattended Installation"));
    580         m_pSkipUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install is disabled and the selected ISO "
    581                                                                 "is mounted on the vm."));
     577    if (m_pUnattendedCheckBox)
     578    {
     579        m_pUnattendedCheckBox->setText(UIWizardNewVM::tr("&Proceed with Unattended Installation"));
     580        m_pUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install is enabled."));
    582581    }
    583582
    … …  
    729728    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    730729    m_userModifiedParameters << "SkipUnattendedInstall";
    731     wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(fSkip);
     730    wizardWindow<UIWizardNewVM>()->setSkipUnattendedInstall(!fSkip);
    732731    setEditionSelectorEnabled();
    733732    updateInfoLabel();
    … …  
    756755                m_pNameAndSystemLayout->addWidget(m_pNameAndSystemEditor, 0, 0, 1, 2);
    757756
    758             /* Prepare Skip Unattended checkbox: */
    759             m_pSkipUnattendedCheckBox = new QCheckBox;
    760             if (m_pSkipUnattendedCheckBox)
    761                 m_pNameAndSystemLayout->addWidget(m_pSkipUnattendedCheckBox, 1, 1);
     757            /* Prepare Unattended checkbox: */
     758            m_pUnattendedCheckBox = new QCheckBox;
     759            if (m_pUnattendedCheckBox)
     760            {
     761                m_pNameAndSystemLayout->addWidget(m_pUnattendedCheckBox, 1, 1);
     762                m_pUnattendedCheckBox->setChecked(true);
     763            }
    762764            m_pInfoLabel = new QIRichTextLabel(pContainerWidget);
    763765            if (m_pInfoLabel)
    … …  
    786788void UIWizardNewVMNameOSTypePage::setSkipCheckBoxEnable()
    787789{
    788     AssertReturnVoid(m_pSkipUnattendedCheckBox && m_pNameAndSystemEditor);
     790    AssertReturnVoid(m_pUnattendedCheckBox && m_pNameAndSystemEditor);
    789791    const QString &strPath = m_pNameAndSystemEditor->ISOImagePath();
    790792    if (strPath.isEmpty())
    791793    {
    792         m_pSkipUnattendedCheckBox->setEnabled(false);
     794        m_pUnattendedCheckBox->setEnabled(false);
    793795        return;
    794796    }
    795797    if (!isUnattendedInstallSupported())
    796798    {
    797         m_pSkipUnattendedCheckBox->setEnabled(false);
     799        m_pUnattendedCheckBox->setEnabled(false);
    798800        return;
    799801    }
    800802
    801     m_pSkipUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
     803    m_pUnattendedCheckBox->setEnabled(UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor));
    802804}
    803805
    … …  
    819821void  UIWizardNewVMNameOSTypePage::setEditionSelectorEnabled()
    820822{
    821     if (!m_pNameAndSystemEditor || !m_pSkipUnattendedCheckBox)
     823    if (!m_pNameAndSystemEditor || !m_pUnattendedCheckBox)
    822824        return;
    823825    m_pNameAndSystemEditor->setEditionSelectorEnabled(   !m_pNameAndSystemEditor->isEditionsSelectorEmpty()
    824                                                       && !m_pSkipUnattendedCheckBox->isChecked());
    825 }
     826                                                      && !m_pUnattendedCheckBox->isChecked());
     827}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

    r107002 r107889  
    107107        QGridLayout           *m_pNameAndSystemLayout;
    108108        UINameAndSystemEditor *m_pNameAndSystemEditor;
    109         QCheckBox             *m_pSkipUnattendedCheckBox;
     109        QCheckBox             *m_pUnattendedCheckBox;
    110110        QIRichTextLabel       *m_pNameOSTypeLabel;
    111111        QIRichTextLabel       *m_pInfoLabel;
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