Changeset 91164 in vbox
- Timestamp:
- Sep 8, 2021 3:23:02 PM (3 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm
- Files:
-
- 5 edited
-
UIWizardNewVM.cpp (modified) (2 diffs)
-
UIWizardNewVM.h (modified) (2 diffs)
-
UIWizardNewVMDiskPage.cpp (modified) (2 diffs)
-
UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
-
UIWizardNewVMSummaryPage.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
r91132 r91164 202 202 } 203 203 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 213 204 /* Create base storage for the new virtual-disk: */ 214 CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, variants);205 CProgress comProgress = newVirtualDisk.CreateBaseStorage(m_uMediumSize, mediumVariants()); 215 206 if (!newVirtualDisk.isOk()) 216 207 msgCenter().cannotCreateHardDiskStorage(newVirtualDisk, m_strMediumPath, this); … … 909 900 } 910 901 902 QVector<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 911 915 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const 912 916 { -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
r91108 r91164 163 163 bool emptyDiskRecommended() const; 164 164 void setEmptyDiskRecommended(bool fEmptyDiskRecommended); 165 166 QVector<KMediumVariant> mediumVariants() const; 165 167 /** @} */ 166 168 … … 235 237 SelectedDiskSource m_enmDiskSource; 236 238 bool m_fEmptyDiskRecommended; 239 QVector<KMediumVariant> m_mediumVariants; 237 240 /** @} */ 238 241 }; -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.cpp
r91108 r91164 162 162 pWizard->setDiskSource(SelectedDiskSource_Existing); 163 163 pWizard->setVirtualDisk(m_pDiskSelector->id()); 164 pWizard->setMediumPath(m_pDiskSelector->location()); 164 165 } 165 166 else … … 174 175 void UIWizardNewVMDiskPage::sltMediaComboBoxIndexChanged() 175 176 { 176 AssertReturnVoid(m_pDiskSelector && wizardWindow<UIWizardNewVM>()); 177 UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>(); 178 AssertReturnVoid(pWizard && m_pDiskSelector); 177 179 m_userModifiedParameters << "SelectedExistingMediumIndex"; 178 wizardWindow<UIWizardNewVM>()->setVirtualDisk(m_pDiskSelector->id()); 180 pWizard->setVirtualDisk(m_pDiskSelector->id()); 181 pWizard->setMediumPath(m_pDiskSelector->location()); 179 182 emit completeChanged(); 180 183 } -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp
r91152 r91164 704 704 void UIWizardNewVMExpertPage::sltMediaComboBoxIndexChanged() 705 705 { 706 AssertReturnVoid(wizardWindow<UIWizardNewVM>());707 706 AssertReturnVoid(m_pDiskSelector); 707 UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>(); 708 AssertReturnVoid(pWizard); 709 708 710 /* 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()); 710 713 emit completeChanged(); 711 714 } … … 723 726 pWizard->setDiskSource(SelectedDiskSource_Existing); 724 727 pWizard->setVirtualDisk(m_pDiskSelector->id()); 728 pWizard->setMediumPath(m_pDiskSelector->location()); 725 729 } 726 730 else -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp
r91155 r91164 358 358 UIWizardNewVMSummaryItem *pHardwareRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Hardware"), QVariant(), 359 359 UIIconPool::iconSet(":/cpu_16px.png")); 360 pHardwareRoot->setIsSectionTitle(true); 360 361 pHardwareRoot->addChild(UIWizardNewVM::tr("Base Memory"), pWizard->memorySize()); 361 362 pHardwareRoot->addChild(UIWizardNewVM::tr("Processor(s)"), pWizard->CPUCount()); 363 pHardwareRoot->addChild(UIWizardNewVM::tr("EFI Enable"), pWizard->EFIEnabled()); 364 365 /* Disk related info: */ 362 366 UIWizardNewVMSummaryItem *pDiskRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Disk"), QVariant(), 363 367 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 365 381 Q_UNUSED(pDiskRoot); 366 382
Note:
See TracChangeset
for help on using the changeset viewer.

