Changeset 84886 in vbox for trunk/src/VBox/Frontends
- Timestamp:
- Jun 21, 2020 3:03:55 PM (5 years ago)
- svn:sync-xref-src-repo-rev:
- 138743
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 5 edited
- 8 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r84879 r84886 681 681 src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \ 682 682 src/wizards/newvm/UIWizardNewVM.h \ 683 src/wizards/newvm/UIWizardNewVMPageBasic 0.h \684 src/wizards/newvm/UIWizardNewVMPageBasic 1.h \685 src/wizards/newvm/UIWizardNewVMPageBasic 2.h \686 src/wizards/newvm/UIWizardNewVMPageBasic 3.h \683 src/wizards/newvm/UIWizardNewVMPageBasicUnattended.h \ 684 src/wizards/newvm/UIWizardNewVMPageBasicNameType.h \ 685 src/wizards/newvm/UIWizardNewVMPageBasicHardware.h \ 686 src/wizards/newvm/UIWizardNewVMPageBasicDisk.h \ 687 687 src/wizards/newvm/UIWizardNewVMPageExpert.h \ 688 688 src/wizards/clonevm/UIWizardCloneVM.h \ … … 1141 1141 src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \ 1142 1142 src/wizards/newvm/UIWizardNewVM.cpp \ 1143 src/wizards/newvm/UIWizardNewVMPageBasic 0.cpp \1144 src/wizards/newvm/UIWizardNewVMPageBasic 1.cpp \1145 src/wizards/newvm/UIWizardNewVMPageBasic 2.cpp \1146 src/wizards/newvm/UIWizardNewVMPageBasic 3.cpp \1143 src/wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp \ 1144 src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp \ 1145 src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp \ 1146 src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp \ 1147 1147 src/wizards/newvm/UIWizardNewVMPageExpert.cpp \ 1148 1148 src/wizards/clonevm/UIWizardCloneVM.cpp \ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
r84880 r84886 19 19 #include "UICommon.h" 20 20 #include "UIWizardNewVM.h" 21 #include "UIWizardNewVMPageBasic 0.h"22 #include "UIWizardNewVMPageBasic 1.h"23 #include "UIWizardNewVMPageBasic 2.h"24 #include "UIWizardNewVMPageBasic 3.h"21 #include "UIWizardNewVMPageBasicUnattended.h" 22 #include "UIWizardNewVMPageBasicNameType.h" 23 #include "UIWizardNewVMPageBasicHardware.h" 24 #include "UIWizardNewVMPageBasicDisk.h" 25 25 #include "UIWizardNewVMPageExpert.h" 26 26 #include "UIMessageCenter.h" … … 69 69 case WizardMode_Basic: 70 70 { 71 setPage(Page1, new UIWizardNewVMPageBasic 0);72 setPage(Page2, new UIWizardNewVMPageBasic 1(m_strGroup));73 setPage(Page3, new UIWizardNewVMPageBasic 2);74 setPage(Page4, new UIWizardNewVMPageBasic 3);71 setPage(Page1, new UIWizardNewVMPageBasicUnattended); 72 setPage(Page2, new UIWizardNewVMPageBasicNameType(m_strGroup)); 73 setPage(Page3, new UIWizardNewVMPageBasicHardware); 74 setPage(Page4, new UIWizardNewVMPageBasicDisk); 75 75 break; 76 76 } … … 379 379 case WizardMode_Basic: 380 380 { 381 UIWizardNewVMPageBasic 1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page2));381 UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(Page2)); 382 382 /* Make sure that we were able to find the page that created the folder. */ 383 383 Assert(pPage); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
r84870 r84886 73 73 74 74 /* Who will be able to create virtual-machine: */ 75 friend class UIWizardNewVMPageBasic 3;75 friend class UIWizardNewVMPageBasicDisk; 76 76 friend class UIWizardNewVMPageExpert; 77 77 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 3class implementation.3 * VBox Qt GUI - UIWizardNewVMPageBasicDisk class implementation. 4 4 */ 5 5 … … 32 32 #include "UIWizardNewVD.h" 33 33 #include "UIWizardNewVM.h" 34 #include "UIWizardNewVMPageBasic 3.h"35 36 UIWizardNewVMPage 3::UIWizardNewVMPage3()34 #include "UIWizardNewVMPageBasicDisk.h" 35 36 UIWizardNewVMPageDisk::UIWizardNewVMPageDisk() 37 37 : m_fRecommendedNoDisk(false) 38 38 { 39 39 } 40 40 41 void UIWizardNewVMPage 3::updateVirtualDiskSource()41 void UIWizardNewVMPageDisk::updateVirtualDiskSource() 42 42 { 43 43 /* Enable/disable controls: */ … … 60 60 } 61 61 62 void UIWizardNewVMPage 3::getWithFileOpenDialog()62 void UIWizardNewVMPageDisk::getWithFileOpenDialog() 63 63 { 64 64 /* Get opened medium id: */ … … 83 83 } 84 84 85 bool UIWizardNewVMPage 3::getWithNewVirtualDiskWizard()85 bool UIWizardNewVMPageDisk::getWithNewVirtualDiskWizard() 86 86 { 87 87 /* Create New Virtual Hard Drive wizard: */ … … 105 105 } 106 106 107 void UIWizardNewVMPage 3::ensureNewVirtualDiskDeleted()107 void UIWizardNewVMPageDisk::ensureNewVirtualDiskDeleted() 108 108 { 109 109 /* Make sure virtual-disk valid: */ … … 129 129 } 130 130 131 UIWizardNewVMPageBasic 3::UIWizardNewVMPageBasic3()131 UIWizardNewVMPageBasicDisk::UIWizardNewVMPageBasicDisk() 132 132 { 133 133 /* Create widgets: */ … … 168 168 /* Setup connections: */ 169 169 connect(m_pDiskSkip, &QRadioButton::toggled, 170 this, &UIWizardNewVMPageBasic 3::sltVirtualDiskSourceChanged);170 this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged); 171 171 connect(m_pDiskCreate, &QRadioButton::toggled, 172 this, &UIWizardNewVMPageBasic 3::sltVirtualDiskSourceChanged);172 this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged); 173 173 connect(m_pDiskPresent, &QRadioButton::toggled, 174 this, &UIWizardNewVMPageBasic 3::sltVirtualDiskSourceChanged);174 this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged); 175 175 connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged), 176 this, &UIWizardNewVMPageBasic 3::sltVirtualDiskSourceChanged);176 this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged); 177 177 connect(m_pVMMButton, &QIToolButton::clicked, 178 this, &UIWizardNewVMPageBasic 3::sltGetWithFileOpenDialog);178 this, &UIWizardNewVMPageBasicDisk::sltGetWithFileOpenDialog); 179 179 180 180 /* Register classes: */ … … 187 187 } 188 188 189 void UIWizardNewVMPageBasic 3::sltVirtualDiskSourceChanged()189 void UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged() 190 190 { 191 191 /* Call to base-class: */ … … 196 196 } 197 197 198 void UIWizardNewVMPageBasic 3::sltGetWithFileOpenDialog()198 void UIWizardNewVMPageBasicDisk::sltGetWithFileOpenDialog() 199 199 { 200 200 /* Call to base-class: */ … … 202 202 } 203 203 204 void UIWizardNewVMPageBasic 3::retranslateUi()204 void UIWizardNewVMPageBasicDisk::retranslateUi() 205 205 { 206 206 /* Translate page: */ … … 223 223 } 224 224 225 void UIWizardNewVMPageBasic 3::initializePage()225 void UIWizardNewVMPageBasicDisk::initializePage() 226 226 { 227 227 /* Translate page: */ … … 244 244 } 245 245 246 void UIWizardNewVMPageBasic 3::cleanupPage()246 void UIWizardNewVMPageBasicDisk::cleanupPage() 247 247 { 248 248 /* Call to base-class: */ … … 251 251 } 252 252 253 bool UIWizardNewVMPageBasic 3::isComplete() const253 bool UIWizardNewVMPageBasicDisk::isComplete() const 254 254 { 255 255 /* Make sure 'virtualDisk' field feats the rules: */ … … 259 259 } 260 260 261 bool UIWizardNewVMPageBasic 3::validatePage()261 bool UIWizardNewVMPageBasicDisk::validatePage() 262 262 { 263 263 /* Initial result: */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicDisk.h
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 3class declaration.3 * VBox Qt GUI - UIWizardNewVMPageBasicDisk class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 3_h19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 3_h18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h 19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 39 39 40 40 /* 3rd page of the New Virtual Machine wizard (base part): */ 41 class UIWizardNewVMPage 3: public UIWizardPageBase41 class UIWizardNewVMPageDisk : public UIWizardPageBase 42 42 { 43 43 protected: 44 44 45 45 /* Constructor: */ 46 UIWizardNewVMPage 3();46 UIWizardNewVMPageDisk(); 47 47 48 48 /* Handlers: */ … … 88 88 89 89 /* 3rd page of the New Virtual Machine wizard (basic extension): */ 90 class UIWizardNewVMPageBasic 3 : public UIWizardPage, public UIWizardNewVMPage390 class UIWizardNewVMPageBasicDisk : public UIWizardPage, public UIWizardNewVMPageDisk 91 91 { 92 92 Q_OBJECT; … … 99 99 100 100 /* Constructor: */ 101 UIWizardNewVMPageBasic 3();101 UIWizardNewVMPageBasicDisk(); 102 102 103 103 protected: … … 133 133 }; 134 134 135 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */ 136 135 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicHardware.cpp
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 2class implementation.3 * VBox Qt GUI - UIWizardNewVMPageBasicHardware class implementation. 4 4 */ 5 5 … … 30 30 #include "UICommon.h" 31 31 #include "UIVirtualCPUEditor.h" 32 #include "UIWizardNewVMPageBasic 2.h"32 #include "UIWizardNewVMPageBasicHardware.h" 33 33 #include "UIWizardNewVM.h" 34 34 35 35 36 UIWizardNewVMPage 2::UIWizardNewVMPage2()36 UIWizardNewVMPageHardware::UIWizardNewVMPageHardware() 37 37 : m_pBaseMemoryEditor(0) 38 38 , m_pVirtualCPUEditor(0) … … 40 40 } 41 41 42 int UIWizardNewVMPage 2::baseMemory() const42 int UIWizardNewVMPageHardware::baseMemory() const 43 43 { 44 44 if (!m_pBaseMemoryEditor) … … 47 47 } 48 48 49 int UIWizardNewVMPage 2::VCPUCount() const49 int UIWizardNewVMPageHardware::VCPUCount() const 50 50 { 51 51 if (!m_pVirtualCPUEditor) … … 54 54 } 55 55 56 UIWizardNewVMPageBasic 2::UIWizardNewVMPageBasic2()56 UIWizardNewVMPageBasicHardware::UIWizardNewVMPageBasicHardware() 57 57 : m_pLabel(0) 58 58 { … … 80 80 } 81 81 82 void UIWizardNewVMPageBasic 2::retranslateUi()82 void UIWizardNewVMPageBasicHardware::retranslateUi() 83 83 { 84 84 /* Translate page: */ … … 90 90 } 91 91 92 void UIWizardNewVMPageBasic 2::initializePage()92 void UIWizardNewVMPageBasicHardware::initializePage() 93 93 { 94 94 /* Translate page: */ … … 104 104 } 105 105 106 bool UIWizardNewVMPageBasic 2::isComplete() const106 bool UIWizardNewVMPageBasicHardware::isComplete() const 107 107 { 108 108 return UIWizardPage::isComplete(); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicHardware.h
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 2class declaration.3 * VBox Qt GUI - UIWizardNewVMPageBasicHardware class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 2_h19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 2_h18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicHardware_h 19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicHardware_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 34 34 35 35 /* 2nd page of the New Virtual Machine wizard (base part): */ 36 class UIWizardNewVMPage 2: public UIWizardPageBase36 class UIWizardNewVMPageHardware : public UIWizardPageBase 37 37 { 38 38 protected: 39 39 40 40 /* Constructor: */ 41 UIWizardNewVMPage 2();41 UIWizardNewVMPageHardware(); 42 42 43 43 int baseMemory() const; … … 50 50 51 51 /* 2nd page of the New Virtual Machine wizard (basic extension): */ 52 class UIWizardNewVMPageBasic 2 : public UIWizardPage, public UIWizardNewVMPage252 class UIWizardNewVMPageBasicHardware : public UIWizardPage, public UIWizardNewVMPageHardware 53 53 { 54 54 Q_OBJECT; … … 59 59 60 60 /* Constructor: */ 61 UIWizardNewVMPageBasic 2();61 UIWizardNewVMPageBasicHardware(); 62 62 63 63 private slots: … … 78 78 }; 79 79 80 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 2_h */80 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicHardware_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicNameType.cpp
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 1class implementation.3 * VBox Qt GUI - UIWizardNewVMPageBasicNameType class implementation. 4 4 */ 5 5 … … 27 27 #include "UIMessageCenter.h" 28 28 #include "UINameAndSystemEditor.h" 29 #include "UIWizardNewVMPageBasic 1.h"29 #include "UIWizardNewVMPageBasicNameType.h" 30 30 #include "UIWizardNewVM.h" 31 31 … … 174 174 }; 175 175 176 UIWizardNewVMPage 1::UIWizardNewVMPage1(const QString &strGroup)176 UIWizardNewVMPageNameType::UIWizardNewVMPageNameType(const QString &strGroup) 177 177 : m_pNameAndSystemEditor(0) 178 178 , m_strGroup(strGroup) … … 184 184 } 185 185 186 void UIWizardNewVMPage 1::onNameChanged(QString strNewName)186 void UIWizardNewVMPageNameType::onNameChanged(QString strNewName) 187 187 { 188 188 /* Do not forget about achitecture bits, if not yet specified: */ … … 204 204 } 205 205 206 void UIWizardNewVMPage 1::onOsTypeChanged()206 void UIWizardNewVMPageNameType::onOsTypeChanged() 207 207 { 208 208 /* If the user manually edited the OS type, we didn't want our automatic OS type guessing anymore. … … 212 212 } 213 213 214 void UIWizardNewVMPage 1::composeMachineFilePath()214 void UIWizardNewVMPageNameType::composeMachineFilePath() 215 215 { 216 216 if (!m_pNameAndSystemEditor) … … 232 232 } 233 233 234 bool UIWizardNewVMPage 1::createMachineFolder()234 bool UIWizardNewVMPageNameType::createMachineFolder() 235 235 { 236 236 if (!m_pNameAndSystemEditor) … … 270 270 } 271 271 272 bool UIWizardNewVMPage 1::cleanupMachineFolder(bool fWizardCancel /* = false */)272 bool UIWizardNewVMPageNameType::cleanupMachineFolder(bool fWizardCancel /* = false */) 273 273 { 274 274 /* Make sure folder was previosly created: */ … … 289 289 } 290 290 291 QString UIWizardNewVMPage 1::machineFilePath() const291 QString UIWizardNewVMPageNameType::machineFilePath() const 292 292 { 293 293 return m_strMachineFilePath; 294 294 } 295 295 296 void UIWizardNewVMPage 1::setMachineFilePath(const QString &strMachineFilePath)296 void UIWizardNewVMPageNameType::setMachineFilePath(const QString &strMachineFilePath) 297 297 { 298 298 m_strMachineFilePath = strMachineFilePath; 299 299 } 300 300 301 QString UIWizardNewVMPage 1::machineFolder() const301 QString UIWizardNewVMPageNameType::machineFolder() const 302 302 { 303 303 return m_strMachineFolder; 304 304 } 305 305 306 void UIWizardNewVMPage 1::setMachineFolder(const QString &strMachineFolder)306 void UIWizardNewVMPageNameType::setMachineFolder(const QString &strMachineFolder) 307 307 { 308 308 m_strMachineFolder = strMachineFolder; 309 309 } 310 310 311 QString UIWizardNewVMPage 1::machineBaseName() const311 QString UIWizardNewVMPageNameType::machineBaseName() const 312 312 { 313 313 return m_strMachineBaseName; 314 314 } 315 315 316 void UIWizardNewVMPage 1::setMachineBaseName(const QString &strMachineBaseName)316 void UIWizardNewVMPageNameType::setMachineBaseName(const QString &strMachineBaseName) 317 317 { 318 318 m_strMachineBaseName = strMachineBaseName; 319 319 } 320 320 321 UIWizardNewVMPageBasic 1::UIWizardNewVMPageBasic1(const QString &strGroup)322 : UIWizardNewVMPage 1(strGroup)321 UIWizardNewVMPageBasicNameType::UIWizardNewVMPageBasicNameType(const QString &strGroup) 322 : UIWizardNewVMPageNameType(strGroup) 323 323 { 324 324 /* Create widgets: */ … … 333 333 334 334 /* Setup connections: */ 335 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic 1::sltNameChanged);336 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic 1::sltPathChanged);337 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic 1::sltOsTypeChanged);335 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasicNameType::sltNameChanged); 336 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasicNameType::sltPathChanged); 337 connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasicNameType::sltOsTypeChanged); 338 338 339 339 /* Register fields: */ … … 345 345 } 346 346 347 void UIWizardNewVMPageBasic 1::sltNameChanged(const QString &strNewName)347 void UIWizardNewVMPageBasicNameType::sltNameChanged(const QString &strNewName) 348 348 { 349 349 /* Call to base-class: */ … … 352 352 } 353 353 354 void UIWizardNewVMPageBasic 1::sltPathChanged(const QString &strNewPath)354 void UIWizardNewVMPageBasicNameType::sltPathChanged(const QString &strNewPath) 355 355 { 356 356 Q_UNUSED(strNewPath); … … 358 358 } 359 359 360 void UIWizardNewVMPageBasic 1::sltOsTypeChanged()360 void UIWizardNewVMPageBasicNameType::sltOsTypeChanged() 361 361 { 362 362 /* Call to base-class: */ … … 364 364 } 365 365 366 void UIWizardNewVMPageBasic 1::retranslateUi()366 void UIWizardNewVMPageBasicNameType::retranslateUi() 367 367 { 368 368 /* Translate page: */ … … 376 376 } 377 377 378 void UIWizardNewVMPageBasic 1::initializePage()378 void UIWizardNewVMPageBasicNameType::initializePage() 379 379 { 380 380 /* Translate page: */ … … 384 384 } 385 385 386 void UIWizardNewVMPageBasic 1::cleanupPage()386 void UIWizardNewVMPageBasicNameType::cleanupPage() 387 387 { 388 388 /* Cleanup: */ … … 392 392 } 393 393 394 bool UIWizardNewVMPageBasic 1::validatePage()394 bool UIWizardNewVMPageBasicNameType::validatePage() 395 395 { 396 396 /* Try to create machine folder: */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicNameType.h
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 1class declaration.3 * VBox Qt GUI - UIWizardNewVMPageBasicNameType class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 1_h19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 1_h18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h 19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 30 30 31 31 /* 1st page of the New Virtual Machine wizard (base part): */ 32 class UIWizardNewVMPage 1: public UIWizardPageBase32 class UIWizardNewVMPageNameType : public UIWizardPageBase 33 33 { 34 34 protected: 35 35 36 36 /* Constructor: */ 37 UIWizardNewVMPage 1(const QString &strGroup);37 UIWizardNewVMPageNameType(const QString &strGroup); 38 38 39 39 /* Handlers: */ … … 82 82 83 83 /* 1st page of the New Virtual Machine wizard (basic extension): */ 84 class UIWizardNewVMPageBasic 1 : public UIWizardPage, public UIWizardNewVMPage184 class UIWizardNewVMPageBasicNameType : public UIWizardPage, public UIWizardNewVMPageNameType 85 85 { 86 86 Q_OBJECT; … … 92 92 93 93 /* Constructor: */ 94 UIWizardNewVMPageBasic 1(const QString &strGroup);94 UIWizardNewVMPageBasicNameType(const QString &strGroup); 95 95 96 96 protected: … … 122 122 }; 123 123 124 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 1_h */124 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicNameType_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 0class implementation.3 * VBox Qt GUI - UIWizardNewVMPageBasicUnattended class implementation. 4 4 */ 5 5 … … 30 30 #include "UIMessageCenter.h" 31 31 #include "UINameAndSystemEditor.h" 32 #include "UIWizardNewVMPageBasic 0.h"32 #include "UIWizardNewVMPageBasicUnattended.h" 33 33 #include "UIWizardNewVM.h" 34 34 … … 38 38 39 39 40 UIWizardNewVMPage 0::UIWizardNewVMPage0()40 UIWizardNewVMPageUnattended::UIWizardNewVMPageUnattended() 41 41 : m_pUnattendedCheckBox(0) 42 42 , m_pStartHeadlessCheckBox(0) … … 45 45 } 46 46 47 QString UIWizardNewVMPage 0::ISOFilePath() const47 QString UIWizardNewVMPageUnattended::ISOFilePath() const 48 48 { 49 49 if (!m_pISOFilePathSelector) … … 52 52 } 53 53 54 bool UIWizardNewVMPage 0::isUnattendedEnabled() const54 bool UIWizardNewVMPageUnattended::isUnattendedEnabled() const 55 55 { 56 56 if (!m_pUnattendedCheckBox) … … 59 59 } 60 60 61 bool UIWizardNewVMPage 0::startHeadless() const61 bool UIWizardNewVMPageUnattended::startHeadless() const 62 62 { 63 63 if (!m_pStartHeadlessCheckBox) … … 66 66 } 67 67 68 UIWizardNewVMPageBasic 0::UIWizardNewVMPageBasic0()69 : UIWizardNewVMPage 0()68 UIWizardNewVMPageBasicUnattended::UIWizardNewVMPageBasicUnattended() 69 : UIWizardNewVMPageUnattended() 70 70 { 71 71 /* Create widgets: */ … … 74 74 m_pLabel = new QIRichTextLabel(this); 75 75 m_pUnattendedCheckBox = new QCheckBox; 76 connect(m_pUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageBasic 0::sltUnattendedCheckBoxToggle);76 connect(m_pUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageBasicUnattended::sltUnattendedCheckBoxToggle); 77 77 m_pISOSelectorLabel = new QLabel; 78 78 { … … 87 87 m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); 88 88 m_pISOFilePathSelector->setEnabled(false); 89 connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasic 0::sltPathChanged);89 connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasicUnattended::sltPathChanged); 90 90 } 91 91 m_pStartHeadlessCheckBox = new QCheckBox; … … 112 112 } 113 113 114 bool UIWizardNewVMPageBasic 0::isComplete() const114 bool UIWizardNewVMPageBasicUnattended::isComplete() const 115 115 { 116 116 bool fISOFileOK = checkISOFile(); … … 119 119 } 120 120 121 void UIWizardNewVMPageBasic 0::sltUnattendedCheckBoxToggle(bool fEnabled)121 void UIWizardNewVMPageBasicUnattended::sltUnattendedCheckBoxToggle(bool fEnabled) 122 122 { 123 123 if (m_pISOSelectorLabel) … … 130 130 } 131 131 132 void UIWizardNewVMPageBasic 0::sltPathChanged(const QString &strPath)132 void UIWizardNewVMPageBasicUnattended::sltPathChanged(const QString &strPath) 133 133 { 134 134 Q_UNUSED(strPath); … … 136 136 } 137 137 138 void UIWizardNewVMPageBasic 0::retranslateUi()138 void UIWizardNewVMPageBasicUnattended::retranslateUi() 139 139 { 140 140 /* Translate page: */ … … 154 154 } 155 155 156 bool UIWizardNewVMPageBasic 0::checkISOFile() const156 bool UIWizardNewVMPageBasicUnattended::checkISOFile() const 157 157 { 158 158 if (m_pUnattendedCheckBox && m_pUnattendedCheckBox->isChecked()) … … 165 165 } 166 166 167 void UIWizardNewVMPageBasic 0::initializePage()167 void UIWizardNewVMPageBasicUnattended::initializePage() 168 168 { 169 169 /* Translate page: */ … … 173 173 } 174 174 175 void UIWizardNewVMPageBasic 0::cleanupPage()175 void UIWizardNewVMPageBasicUnattended::cleanupPage() 176 176 { 177 177 UIWizardPage::cleanupPage(); 178 178 } 179 179 180 bool UIWizardNewVMPageBasic 0::validatePage()180 bool UIWizardNewVMPageBasicUnattended::validatePage() 181 181 { 182 182 return checkISOFile(); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicUnattended.h
r84885 r84886 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardNewVMPageBasic 0class declaration.3 * VBox Qt GUI - UIWizardNewVMPageBasicUnattended class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 0_h19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 0_h18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUnattended_h 19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUnattended_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 33 33 34 34 /* 1st page of the New Virtual Machine wizard (base part): */ 35 class UIWizardNewVMPage 0: public UIWizardPageBase35 class UIWizardNewVMPageUnattended : public UIWizardPageBase 36 36 { 37 37 protected: 38 38 39 39 /* Constructor: */ 40 UIWizardNewVMPage 0();40 UIWizardNewVMPageUnattended(); 41 41 42 42 QString ISOFilePath() const; … … 55 55 56 56 /* 1st page of the New Virtual Machine wizard (basic extension): */ 57 class UIWizardNewVMPageBasic 0 : public UIWizardPage, public UIWizardNewVMPage057 class UIWizardNewVMPageBasicUnattended : public UIWizardPage, public UIWizardNewVMPageUnattended 58 58 { 59 59 Q_OBJECT; … … 65 65 66 66 /* Constructor: */ 67 UIWizardNewVMPageBasic 0();67 UIWizardNewVMPageBasicUnattended(); 68 68 virtual bool isComplete() const; /* override */ 69 69 … … 97 97 }; 98 98 99 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic 0_h */99 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicUnattended_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
r84874 r84886 40 40 41 41 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup) 42 : UIWizardNewVMPage 1(strGroup)42 : UIWizardNewVMPageNameType(strGroup) 43 43 { 44 44 /* Create widgets: */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h
r84874 r84886 23 23 24 24 /* Local includes: */ 25 #include "UIWizardNewVMPageBasic 1.h"26 #include "UIWizardNewVMPageBasic 2.h"27 #include "UIWizardNewVMPageBasic 3.h"25 #include "UIWizardNewVMPageBasicNameType.h" 26 #include "UIWizardNewVMPageBasicHardware.h" 27 #include "UIWizardNewVMPageBasicDisk.h" 28 28 29 29 /* Forward declarations: */ … … 32 32 /* Expert page of the New Virtual Machine wizard: */ 33 33 class UIWizardNewVMPageExpert : public UIWizardPage, 34 public UIWizardNewVMPage 1,35 public UIWizardNewVMPage 2,36 public UIWizardNewVMPage 334 public UIWizardNewVMPageNameType, 35 public UIWizardNewVMPageHardware, 36 public UIWizardNewVMPageDisk 37 37 { 38 38 Q_OBJECT;
Note:
See TracChangeset
for help on using the changeset viewer.