VirtualBox

Changeset 91164 in vbox


Ignore:
Timestamp:
Sep 8, 2021 3:23:02 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. More fixes for the summary page.

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

Legend:

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

    r91132 r91164  
    202202    }
    203203
    204     /* Compose medium-variant: */
    205     QVector<KMediumVariant> variants(sizeof(qulonglong)*8);
    206     for (int i = 0; i < variants.size(); ++i)
    207     {
    208         qulonglong temp = m_uMediumVariant;
    209         temp &= UINT64_C(1)<<i;
    210         variants[i] = (KMediumVariant)temp;
    211     }
    212 
    213204    /* Create base storage for the new virtual-disk: */
    214     CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, variants);
     205    CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, mediumVariants());
    215206    if (!newVirtualDisk.isOk())
    216207        msgCenter().cannotCreateHardDiskStorage(newVirtualDisk, m_strMediumPath, this);
     
    909900}
    910901
     902QVector<KMediumVariant> UIWizardNewVM::mediumVariants() const
     903{
     904    /* Compose medium-variant: */
     905    QVector<KMediumVariant> variants(sizeof(qulonglong)*8);
     906    for (int i = 0; i < variants.size(); ++i)
     907    {
     908        qulonglong temp = m_uMediumVariant;
     909        temp &= UINT64_C(1)<<i;
     910        variants[i] = (KMediumVariant)temp;
     911    }
     912    return variants;
     913}
     914
    911915const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
    912916{
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

    r91108 r91164  
    163163        bool emptyDiskRecommended() const;
    164164        void setEmptyDiskRecommended(bool fEmptyDiskRecommended);
     165
     166        QVector<KMediumVariant> mediumVariants() const;
    165167    /** @} */
    166168
     
    235237       SelectedDiskSource m_enmDiskSource;
    236238       bool m_fEmptyDiskRecommended;
     239       QVector<KMediumVariant> m_mediumVariants;
    237240    /** @} */
    238241};
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.cpp

    r91108 r91164  
    162162        pWizard->setDiskSource(SelectedDiskSource_Existing);
    163163        pWizard->setVirtualDisk(m_pDiskSelector->id());
     164        pWizard->setMediumPath(m_pDiskSelector->location());
    164165    }
    165166    else
     
    174175void UIWizardNewVMDiskPage::sltMediaComboBoxIndexChanged()
    175176{
    176     AssertReturnVoid(m_pDiskSelector && wizardWindow<UIWizardNewVM>());
     177    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     178    AssertReturnVoid(pWizard && m_pDiskSelector);
    177179    m_userModifiedParameters << "SelectedExistingMediumIndex";
    178     wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id());
     180    pWizard->setVirtualDisk(m_pDiskSelector->id());
     181    pWizard->setMediumPath(m_pDiskSelector->location());
    179182    emit completeChanged();
    180183}
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

    r91152 r91164  
    704704void UIWizardNewVMExpertPage::sltMediaComboBoxIndexChanged()
    705705{
    706     AssertReturnVoid(wizardWindow<UIWizardNewVM>());
    707706    AssertReturnVoid(m_pDiskSelector);
     707    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     708    AssertReturnVoid(pWizard);
     709
    708710    /* Make sure to set m_virtualDisk: */
    709     wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id());
     711    pWizard->setVirtualDisk(m_pDiskSelector->id());
     712    pWizard->setMediumPath(m_pDiskSelector->location());
    710713    emit completeChanged();
    711714}
     
    723726        pWizard->setDiskSource(SelectedDiskSource_Existing);
    724727        pWizard->setVirtualDisk(m_pDiskSelector->id());
     728        pWizard->setMediumPath(m_pDiskSelector->location());
    725729    }
    726730    else
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

    r91155 r91164  
    358358    UIWizardNewVMSummaryItem *pHardwareRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Hardware"), QVariant(),
    359359                                                                    UIIconPool::iconSet(":/cpu_16px.png"));
     360    pHardwareRoot->setIsSectionTitle(true);
    360361    pHardwareRoot->addChild(UIWizardNewVM::tr("Base Memory"), pWizard->memorySize());
    361362    pHardwareRoot->addChild(UIWizardNewVM::tr("Processor(s)"), pWizard->CPUCount());
     363    pHardwareRoot->addChild(UIWizardNewVM::tr("EFI Enable"), pWizard->EFIEnabled());
     364
     365    /* Disk related info: */
    362366    UIWizardNewVMSummaryItem *pDiskRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Disk"), QVariant(),
    363367                                                                UIIconPool::iconSet(":/hd_16px.png"));
    364     pDiskRoot->addChild(UIWizardNewVM::tr("Disk Size"), UITranslator::formatSize(pWizard->mediumSize()));
     368    pDiskRoot->setIsSectionTitle(true);
     369    if (pWizard->diskSource() == SelectedDiskSource_New)
     370    {
     371        pDiskRoot->addChild(UIWizardNewVM::tr("Disk Size"), UITranslator::formatSize(pWizard->mediumSize()));
     372        const QVector<KMediumVariant> &mediumVariants = pWizard->mediumVariants();
     373        pDiskRoot->addChild(UIWizardNewVM::tr("Pre-allocate Full Size"),
     374                            (mediumVariants.contains(KMediumVariant_Fixed) ? true : false));
     375    }
     376    else if (pWizard->diskSource() == SelectedDiskSource_Existing)
     377        pDiskRoot->addChild(UIWizardNewVM::tr("Attached Disk"), pWizard->mediumPath());
     378    else if (pWizard->diskSource() == SelectedDiskSource_Empty)
     379        pDiskRoot->addChild(UIWizardNewVM::tr("Attached Disk"), UIWizardNewVM::tr("None"));
     380
    365381    Q_UNUSED(pDiskRoot);
    366382
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