- Timestamp:
- Jul 29, 2021 12:10:20 PM (3 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/wizards
- Files:
-
- 3 edited
-
editors/UIWizardDiskEditors.cpp (modified) (1 diff)
-
newvd/UIWizardNewVD.cpp (modified) (1 diff)
-
newvd/UIWizardNewVDPageSizeLocation.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp
r90401 r90403 573 573 } 574 574 575 576 575 /* static */ 577 576 QString UIMediumSizeAndPathGroupBox::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions) -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp
r90401 r90403 154 154 } 155 155 156 /* Copy medium: */157 156 UINotificationProgressMediumCreate *pNotification = new UINotificationProgressMediumCreate(comVirtualDisk, 158 157 m_uMediumSize, -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageSizeLocation.cpp
r90401 r90403 340 340 void UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked() 341 341 { 342 //m_userModifiedParameters 342 343 /* Call to base-class: */ 343 344 //onSelectLocationButtonClicked(); … … 346 347 void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong /*uSize*/) 347 348 { 349 AssertReturnVoid(m_pMediumSizePathGroup); 350 m_userModifiedParameters << "MediumSize"; 351 newVDWizardPropertySet(MediumSize, m_pMediumSizePathGroup->mediumSize()); 348 352 349 353 } … … 351 355 void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &/*strPath*/) 352 356 { 353 357 AssertReturnVoid(m_pMediumSizePathGroup); 358 m_userModifiedParameters << "MediumPath"; 359 newVDWizardPropertySet(MediumPath, m_pMediumSizePathGroup->mediumPath()); 354 360 } 355 361 … … 372 378 UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard()); 373 379 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 } 383 401 retranslateUi(); 384 402 } … … 386 404 bool UIWizardNewVDPageSizeLocation::isComplete() const 387 405 { 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; 394 413 } 395 414
Note:
See TracChangeset
for help on using the changeset viewer.

