VirtualBox

Changeset 90403 in vbox for trunk


Ignore:
Timestamp:
Jul 29, 2021 12:10:20 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Adding missing connections for medium path and size.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/wizards
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

    r90401 r90403  
    573573}
    574574
    575 
    576575/* static */
    577576QString UIMediumSizeAndPathGroupBox::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

    r90401 r90403  
    154154    }
    155155
    156     /* Copy medium: */
    157156    UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk,
    158157                                                                                               m_uMediumSize,
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageSizeLocation.cpp

    r90401 r90403  
    340340void UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked()
    341341{
     342    //m_userModifiedParameters
    342343    /* Call to base-class: */
    343344    //onSelectLocationButtonClicked();
     
    346347void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong /*uSize*/)
    347348{
     349    AssertReturnVoid(m_pMediumSizePathGroup);
     350    m_userModifiedParameters << "MediumSize";
     351    newVDWizardPropertySet(MediumSize, m_pMediumSizePathGroup->mediumSize());
    348352
    349353}
     
    351355void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &/*strPath*/)
    352356{
    353 
     357    AssertReturnVoid(m_pMediumSizePathGroup);
     358    m_userModifiedParameters << "MediumPath";
     359    newVDWizardPropertySet(MediumPath, m_pMediumSizePathGroup->mediumPath());
    354360}
    355361
     
    372378    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
    373379    AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
    374     const CMediumFormat comMediumFormat = pWizard->mediumFormat();
    375     AssertReturnVoid(!comMediumFormat.isNull());
    376 
    377     QString strExtension = UIDiskEditorGroupBox::defaultExtensionForMediumFormat(comMediumFormat);
    378     QString strMediumFilePath =
    379         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
    380                                                                                              strExtension), m_strDefaultPath);
    381     m_pMediumSizePathGroup->setMediumPath(strMediumFilePath);
    382     m_pMediumSizePathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
     380
     381    if (!m_userModifiedParameters.contains("MediumPath"))
     382    {
     383        const CMediumFormat comMediumFormat = pWizard->mediumFormat();
     384        AssertReturnVoid(!comMediumFormat.isNull());
     385        QString strExtension = UIDiskEditorGroupBox::defaultExtensionForMediumFormat(comMediumFormat);
     386        QString strMediumFilePath =
     387            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
     388                                                                                                    strExtension), m_strDefaultPath);
     389        m_pMediumSizePathGroup->blockSignals(true);
     390        m_pMediumSizePathGroup->setMediumPath(strMediumFilePath);
     391        m_pMediumSizePathGroup->blockSignals(false);
     392        newVDWizardPropertySet(MediumPath, m_pMediumSizePathGroup->mediumPath());
     393    }
     394    if (!m_userModifiedParameters.contains("MediumSize"))
     395    {
     396        m_pMediumSizePathGroup->blockSignals(true);
     397        m_pMediumSizePathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
     398        m_pMediumSizePathGroup->blockSignals(false);
     399        newVDWizardPropertySet(MediumSize, m_pMediumSizePathGroup->mediumSize());
     400    }
    383401    retranslateUi();
    384402}
     
    386404bool UIWizardNewVDPageSizeLocation::isComplete() const
    387405{
    388     // if (!m_pLocationEditor)
    389     //     return false;
    390     // /* Make sure current name is not empty and current size fits the bounds: */
    391     // return !m_pLocationEditor->text().trimmed().isEmpty() &&
    392     //        mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
    393     return false;
     406    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
     407    AssertReturn(pWizard, false);
     408    if (pWizard->mediumPath().isEmpty())
     409        return false;
     410    if (pWizard->mediumSize() > m_uMediumSizeMax || pWizard->mediumSize() < m_uMediumSizeMin)
     411        return false;
     412    return true;
    394413}
    395414
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