Changeset 91060 in vbox
- Timestamp:
- Sep 1, 2021 1:58:48 PM (3 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 2 edited
- 8 moved
-
Makefile.kmk (modified) (2 diffs)
-
src/wizards/clonevm/UIWizardCloneVM.cpp (modified) (2 diffs)
-
src/wizards/clonevm/UIWizardCloneVMExpertPage.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp ) (14 diffs)
-
src/wizards/clonevm/UIWizardCloneVMExpertPage.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.h ) (5 diffs)
-
src/wizards/clonevm/UIWizardCloneVMModePage.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMModePageBasic.cpp ) (8 diffs)
-
src/wizards/clonevm/UIWizardCloneVMModePage.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMModePageBasic.h ) (5 diffs)
-
src/wizards/clonevm/UIWizardCloneVMNamePathPage.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMNamePathPageBasic.cpp ) (14 diffs)
-
src/wizards/clonevm/UIWizardCloneVMNamePathPage.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMNamePathPageBasic.h ) (5 diffs)
-
src/wizards/clonevm/UIWizardCloneVMTypePage.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMTypePageBasic.cpp ) (8 diffs)
-
src/wizards/clonevm/UIWizardCloneVMTypePage.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMTypePageBasic.h ) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r91059 r91060 666 666 src/wizards/newvm/UIWizardNewVMExpertPage.h \ 667 667 src/wizards/clonevm/UIWizardCloneVM.h \ 668 src/wizards/clonevm/UIWizardCloneVMNamePathPage Basic.h \669 src/wizards/clonevm/UIWizardCloneVMTypePage Basic.h \670 src/wizards/clonevm/UIWizardCloneVMModePage Basic.h \671 src/wizards/clonevm/UIWizardCloneVM PageExpert.h \668 src/wizards/clonevm/UIWizardCloneVMNamePathPage.h \ 669 src/wizards/clonevm/UIWizardCloneVMTypePage.h \ 670 src/wizards/clonevm/UIWizardCloneVMModePage.h \ 671 src/wizards/clonevm/UIWizardCloneVMExpertPage.h \ 672 672 src/wizards/clonevd/UIWizardCloneVD.h \ 673 673 src/wizards/clonevd/UIWizardCloneVDPageFormat.h \ … … 1174 1174 src/wizards/newvm/UIWizardNewVMExpertPage.cpp \ 1175 1175 src/wizards/clonevm/UIWizardCloneVM.cpp \ 1176 src/wizards/clonevm/UIWizardCloneVMNamePathPage Basic.cpp \1177 src/wizards/clonevm/UIWizardCloneVMTypePage Basic.cpp \1178 src/wizards/clonevm/UIWizardCloneVMModePage Basic.cpp \1179 src/wizards/clonevm/UIWizardCloneVM PageExpert.cpp \1176 src/wizards/clonevm/UIWizardCloneVMNamePathPage.cpp \ 1177 src/wizards/clonevm/UIWizardCloneVMTypePage.cpp \ 1178 src/wizards/clonevm/UIWizardCloneVMModePage.cpp \ 1179 src/wizards/clonevm/UIWizardCloneVMExpertPage.cpp \ 1180 1180 src/wizards/clonevd/UIWizardCloneVD.cpp \ 1181 1181 src/wizards/clonevd/UIWizardCloneVDPageFormat.cpp \ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp
r91035 r91060 22 22 #include "UIProgressObject.h" 23 23 #include "UIWizardCloneVM.h" 24 #include "UIWizardCloneVMNamePathPage Basic.h"25 #include "UIWizardCloneVMTypePage Basic.h"26 #include "UIWizardCloneVMModePage Basic.h"27 #include "UIWizardCloneVM PageExpert.h"24 #include "UIWizardCloneVMNamePathPage.h" 25 #include "UIWizardCloneVMTypePage.h" 26 #include "UIWizardCloneVMModePage.h" 27 #include "UIWizardCloneVMExpertPage.h" 28 28 29 29 /* COM includes: */ … … 284 284 case WizardMode_Basic: 285 285 { 286 addPage(new UIWizardCloneVMNamePathPage Basic(m_strCloneName, strDefaultMachineFolder, m_strGroup));287 addPage(new UIWizardCloneVMTypePage Basic(m_snapshot.isNull()));286 addPage(new UIWizardCloneVMNamePathPage(m_strCloneName, strDefaultMachineFolder, m_strGroup)); 287 addPage(new UIWizardCloneVMTypePage(m_snapshot.isNull())); 288 288 if (m_machine.GetSnapshotCount() > 0) 289 m_iCloneModePageIndex = addPage(new UIWizardCloneVMModePage Basic(m_snapshot.isNull() ? false : m_snapshot.GetChildrenCount() > 0));289 m_iCloneModePageIndex = addPage(new UIWizardCloneVMModePage(m_snapshot.isNull() ? false : m_snapshot.GetChildrenCount() > 0)); 290 290 break; 291 291 } 292 292 case WizardMode_Expert: 293 293 { 294 addPage(new UIWizardCloneVM PageExpert(m_machine.GetName(),294 addPage(new UIWizardCloneVMExpertPage(m_machine.GetName(), 295 295 strDefaultMachineFolder, 296 296 m_snapshot.isNull(), -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMExpertPage.cpp
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVM PageExpertclass implementation.3 * VBox Qt GUI - UIWizardCloneVMExpertPage class implementation. 4 4 */ 5 5 … … 28 28 #include "UICommon.h" 29 29 #include "UIFilePathSelector.h" 30 #include "UIWizardCloneVM PageExpert.h"30 #include "UIWizardCloneVMExpertPage.h" 31 31 #include "UIWizardCloneVM.h" 32 #include "UIWizardCloneVMNamePathPage Basic.h"32 #include "UIWizardCloneVMNamePathPage.h" 33 33 34 34 /* COM includes: */ … … 36 36 37 37 38 UIWizardCloneVM PageExpert::UIWizardCloneVMPageExpert(const QString &strOriginalName, const QString &strDefaultPath,38 UIWizardCloneVMExpertPage::UIWizardCloneVMExpertPage(const QString &strOriginalName, const QString &strDefaultPath, 39 39 bool /*fAdditionalInfo*/, bool fShowChildsOption, const QString &strGroup) 40 40 : m_pNamePathGroupBox(0) … … 47 47 } 48 48 49 void UIWizardCloneVM PageExpert::prepare(const QString &strOriginalName, const QString &strDefaultPath, bool fShowChildsOption)49 void UIWizardCloneVMExpertPage::prepare(const QString &strOriginalName, const QString &strDefaultPath, bool fShowChildsOption) 50 50 { 51 51 QGridLayout *pMainLayout = new QGridLayout(this); … … 56 56 pMainLayout->addWidget(m_pNamePathGroupBox, 0, 0, 3, 2); 57 57 connect(m_pNamePathGroupBox, &UICloneVMNamePathEditor::sigCloneNameChanged, 58 this, &UIWizardCloneVM PageExpert::sltCloneNameChanged);58 this, &UIWizardCloneVMExpertPage::sltCloneNameChanged); 59 59 connect(m_pNamePathGroupBox, &UICloneVMNamePathEditor::sigClonePathChanged, 60 this, &UIWizardCloneVM PageExpert::sltClonePathChanged);60 this, &UIWizardCloneVMExpertPage::sltClonePathChanged); 61 61 } 62 62 … … 74 74 pMainLayout->addWidget(m_pAdditionalOptionsGroupBox, 5, 0, 2, 2); 75 75 connect(m_pAdditionalOptionsGroupBox, &UICloneVMAdditionalOptionsEditor::sigMACAddressClonePolicyChanged, 76 this, &UIWizardCloneVM PageExpert::sltMACAddressClonePolicyChanged);76 this, &UIWizardCloneVMExpertPage::sltMACAddressClonePolicyChanged); 77 77 connect(m_pAdditionalOptionsGroupBox, &UICloneVMAdditionalOptionsEditor::sigKeepDiskNamesToggled, 78 this, &UIWizardCloneVM PageExpert::sltKeepDiskNamesToggled);78 this, &UIWizardCloneVMExpertPage::sltKeepDiskNamesToggled); 79 79 connect(m_pAdditionalOptionsGroupBox, &UICloneVMAdditionalOptionsEditor::sigKeepHardwareUUIDsToggled, 80 this, &UIWizardCloneVM PageExpert::sltKeepHardwareUUIDsToggled);80 this, &UIWizardCloneVMExpertPage::sltKeepHardwareUUIDsToggled); 81 81 } 82 82 … … 84 84 } 85 85 86 void UIWizardCloneVM PageExpert::retranslateUi()86 void UIWizardCloneVMExpertPage::retranslateUi() 87 87 { 88 88 /* Translate widgets: */ … … 97 97 } 98 98 99 void UIWizardCloneVM PageExpert::initializePage()99 void UIWizardCloneVMExpertPage::initializePage() 100 100 { 101 101 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); … … 106 106 pWizard->setCloneName(m_pNamePathGroupBox->cloneName()); 107 107 pWizard->setCloneFilePath( 108 UIWizardCloneVMNamePath Page::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, m_pNamePathGroupBox->clonePath()));108 UIWizardCloneVMNamePathCommon::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, m_pNamePathGroupBox->clonePath())); 109 109 } 110 110 if (m_pAdditionalOptionsGroupBox) … … 122 122 } 123 123 124 bool UIWizardCloneVM PageExpert::isComplete() const124 bool UIWizardCloneVMExpertPage::isComplete() const 125 125 { 126 126 return m_pNamePathGroupBox && m_pNamePathGroupBox->isComplete(m_strGroup); 127 127 } 128 128 129 bool UIWizardCloneVM PageExpert::validatePage()129 bool UIWizardCloneVMExpertPage::validatePage() 130 130 { 131 131 AssertReturn(wizardWindow<UIWizardCloneVM>(), false); … … 133 133 } 134 134 135 void UIWizardCloneVM PageExpert::sltCloneNameChanged(const QString &strCloneName)135 void UIWizardCloneVMExpertPage::sltCloneNameChanged(const QString &strCloneName) 136 136 { 137 137 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); … … 140 140 pWizard->setCloneName(strCloneName); 141 141 pWizard->setCloneFilePath( 142 UIWizardCloneVMNamePath Page::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathGroupBox->clonePath()));142 UIWizardCloneVMNamePathCommon::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathGroupBox->clonePath())); 143 143 emit completeChanged(); 144 144 } 145 145 146 void UIWizardCloneVM PageExpert::sltClonePathChanged(const QString &strClonePath)146 void UIWizardCloneVMExpertPage::sltClonePathChanged(const QString &strClonePath) 147 147 { 148 148 AssertReturnVoid(m_pNamePathGroupBox && wizardWindow<UIWizardCloneVM>()); 149 149 wizardWindow<UIWizardCloneVM>()->setCloneFilePath( 150 UIWizardCloneVMNamePath Page::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, strClonePath));150 UIWizardCloneVMNamePathCommon::composeCloneFilePath(m_pNamePathGroupBox->cloneName(), m_strGroup, strClonePath)); 151 151 emit completeChanged(); 152 152 } 153 153 154 void UIWizardCloneVM PageExpert::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy)154 void UIWizardCloneVMExpertPage::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy) 155 155 { 156 156 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); … … 158 158 } 159 159 160 void UIWizardCloneVM PageExpert::sltKeepDiskNamesToggled(bool fKeepDiskNames)160 void UIWizardCloneVMExpertPage::sltKeepDiskNamesToggled(bool fKeepDiskNames) 161 161 { 162 162 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); … … 164 164 } 165 165 166 void UIWizardCloneVM PageExpert::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs)166 void UIWizardCloneVMExpertPage::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs) 167 167 { 168 168 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMExpertPage.h
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVM PageExpertclass declaration.3 * VBox Qt GUI - UIWizardCloneVMExpertPage class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVM PageExpert_h19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVM PageExpert_h18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMExpertPage_h 19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMExpertPage_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 33 33 34 34 /** Expert page of the Clone Virtual Machine wizard. */ 35 class UIWizardCloneVM PageExpert: public UINativeWizardPage35 class UIWizardCloneVMExpertPage : public UINativeWizardPage 36 36 { 37 37 Q_OBJECT; … … 40 40 41 41 /** Constructor. */ 42 UIWizardCloneVM PageExpert(const QString &strOriginalName, const QString &strDefaultPath,42 UIWizardCloneVMExpertPage(const QString &strOriginalName, const QString &strDefaultPath, 43 43 bool fAdditionalInfo, bool fShowChildsOption, const QString &strGroup); 44 44 … … 71 71 }; 72 72 73 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVM PageExpert_h */73 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMExpertPage_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMModePage.cpp
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMModePage Basicclass implementation.3 * VBox Qt GUI - UIWizardCloneVMModePage class implementation. 4 4 */ 5 5 … … 22 22 #include "UIWizardCloneVM.h" 23 23 #include "UIWizardCloneVMEditors.h" 24 #include "UIWizardCloneVMModePage Basic.h"24 #include "UIWizardCloneVMModePage.h" 25 25 #include "QIRichTextLabel.h" 26 26 27 UIWizardCloneVMModePage Basic::UIWizardCloneVMModePageBasic(bool fShowChildsOption)27 UIWizardCloneVMModePage::UIWizardCloneVMModePage(bool fShowChildsOption) 28 28 : m_pLabel(0) 29 29 , m_pCloneModeGroupBox(0) … … 33 33 } 34 34 35 void UIWizardCloneVMModePage Basic::prepare()35 void UIWizardCloneVMModePage::prepare() 36 36 { 37 37 QVBoxLayout *pMainLayout = new QVBoxLayout(this); … … 48 48 m_pCloneModeGroupBox->setFlat(true); 49 49 connect(m_pCloneModeGroupBox, &UICloneVMCloneModeGroupBox::sigCloneModeChanged, 50 this, &UIWizardCloneVMModePage Basic::sltCloneModeChanged);50 this, &UIWizardCloneVMModePage::sltCloneModeChanged); 51 51 } 52 52 pMainLayout->addStretch(); … … 55 55 } 56 56 57 void UIWizardCloneVMModePage Basic::retranslateUi()57 void UIWizardCloneVMModePage::retranslateUi() 58 58 { 59 59 /* Translate page: */ … … 88 88 } 89 89 90 void UIWizardCloneVMModePage Basic::initializePage()90 void UIWizardCloneVMModePage::initializePage() 91 91 { 92 92 … … 98 98 } 99 99 100 bool UIWizardCloneVMModePage Basic::validatePage()100 bool UIWizardCloneVMModePage::validatePage() 101 101 { 102 102 bool fResult = true; … … 110 110 } 111 111 112 void UIWizardCloneVMModePage Basic::sltCloneModeChanged(KCloneMode enmCloneMode)112 void UIWizardCloneVMModePage::sltCloneModeChanged(KCloneMode enmCloneMode) 113 113 { 114 114 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMModePage.h
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMModePage Basicclass declaration.3 * VBox Qt GUI - UIWizardCloneVMModePage class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage Basic_h19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage Basic_h18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage_h 19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 36 36 37 37 /** 3rd page of the Clone Virtual Machine wizard (basic extension). */ 38 class UIWizardCloneVMModePage Basic: public UINativeWizardPage38 class UIWizardCloneVMModePage : public UINativeWizardPage 39 39 { 40 40 Q_OBJECT; … … 43 43 44 44 /** Constructor. */ 45 UIWizardCloneVMModePage Basic(bool fShowChildsOption);45 UIWizardCloneVMModePage(bool fShowChildsOption); 46 46 47 47 private slots: … … 69 69 }; 70 70 71 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage Basic_h */71 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMModePage_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMNamePathPage.cpp
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMNamePathPage Basicclass implementation.3 * VBox Qt GUI - UIWizardCloneVMNamePathPage class implementation. 4 4 */ 5 5 … … 23 23 #include "QIRichTextLabel.h" 24 24 #include "UIWizardCloneVM.h" 25 #include "UIWizardCloneVMNamePathPage Basic.h"25 #include "UIWizardCloneVMNamePathPage.h" 26 26 #include "UICommon.h" 27 27 … … 29 29 #include "CVirtualBox.h" 30 30 31 QString UIWizardCloneVMNamePath Page::composeCloneFilePath(const QString &strCloneName, const QString &strGroup, const QString &strFolderPath)31 QString UIWizardCloneVMNamePathCommon::composeCloneFilePath(const QString &strCloneName, const QString &strGroup, const QString &strFolderPath) 32 32 { 33 33 CVirtualBox vbox = uiCommon().virtualBox(); … … 35 35 } 36 36 37 UIWizardCloneVMNamePathPage Basic::UIWizardCloneVMNamePathPageBasic(const QString &strOriginalName, const QString &strDefaultPath, const QString &strGroup)37 UIWizardCloneVMNamePathPage::UIWizardCloneVMNamePathPage(const QString &strOriginalName, const QString &strDefaultPath, const QString &strGroup) 38 38 : m_pNamePathEditor(0) 39 39 , m_pAdditionalOptionsEditor(0) … … 44 44 } 45 45 46 void UIWizardCloneVMNamePathPage Basic::retranslateUi()46 void UIWizardCloneVMNamePathPage::retranslateUi() 47 47 { 48 48 setTitle(UIWizardCloneVM::tr("New machine name and path")); … … 65 65 } 66 66 67 void UIWizardCloneVMNamePathPage Basic::initializePage()67 void UIWizardCloneVMNamePathPage::initializePage() 68 68 { 69 69 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); … … 76 76 pWizard->setCloneName(m_pNamePathEditor->cloneName()); 77 77 if (!m_userModifiedParameters.contains("CloneFilePath")) 78 pWizard->setCloneFilePath(UIWizardCloneVMNamePath Page::composeCloneFilePath(m_pNamePathEditor->cloneName(),78 pWizard->setCloneFilePath(UIWizardCloneVMNamePathCommon::composeCloneFilePath(m_pNamePathEditor->cloneName(), 79 79 m_strGroup, m_pNamePathEditor->clonePath())); 80 80 … … 91 91 } 92 92 93 void UIWizardCloneVMNamePathPage Basic::prepare(const QString &strDefaultClonePath)93 void UIWizardCloneVMNamePathPage::prepare(const QString &strDefaultClonePath) 94 94 { 95 95 QVBoxLayout *pMainLayout = new QVBoxLayout(this); … … 108 108 pMainLayout->addWidget(m_pNamePathEditor); 109 109 connect(m_pNamePathEditor, &UICloneVMNamePathEditor::sigCloneNameChanged, 110 this, &UIWizardCloneVMNamePathPage Basic::sltCloneNameChanged);110 this, &UIWizardCloneVMNamePathPage::sltCloneNameChanged); 111 111 connect(m_pNamePathEditor, &UICloneVMNamePathEditor::sigClonePathChanged, 112 this, &UIWizardCloneVMNamePathPage Basic::sltClonePathChanged);112 this, &UIWizardCloneVMNamePathPage::sltClonePathChanged); 113 113 } 114 114 … … 119 119 pMainLayout->addWidget(m_pAdditionalOptionsEditor); 120 120 connect(m_pAdditionalOptionsEditor, &UICloneVMAdditionalOptionsEditor::sigMACAddressClonePolicyChanged, 121 this, &UIWizardCloneVMNamePathPage Basic::sltMACAddressClonePolicyChanged);121 this, &UIWizardCloneVMNamePathPage::sltMACAddressClonePolicyChanged); 122 122 connect(m_pAdditionalOptionsEditor, &UICloneVMAdditionalOptionsEditor::sigKeepDiskNamesToggled, 123 this, &UIWizardCloneVMNamePathPage Basic::sltKeepDiskNamesToggled);123 this, &UIWizardCloneVMNamePathPage::sltKeepDiskNamesToggled); 124 124 connect(m_pAdditionalOptionsEditor, &UICloneVMAdditionalOptionsEditor::sigKeepHardwareUUIDsToggled, 125 this, &UIWizardCloneVMNamePathPage Basic::sltKeepHardwareUUIDsToggled);125 this, &UIWizardCloneVMNamePathPage::sltKeepHardwareUUIDsToggled); 126 126 } 127 127 … … 131 131 } 132 132 133 bool UIWizardCloneVMNamePathPage Basic::isComplete() const133 bool UIWizardCloneVMNamePathPage::isComplete() const 134 134 { 135 135 return m_pNamePathEditor && m_pNamePathEditor->isComplete(m_strGroup); 136 136 } 137 137 138 void UIWizardCloneVMNamePathPage Basic::sltCloneNameChanged(const QString &strCloneName)138 void UIWizardCloneVMNamePathPage::sltCloneNameChanged(const QString &strCloneName) 139 139 { 140 140 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); … … 144 144 m_userModifiedParameters << "CloneFilePath"; 145 145 pWizard->setCloneName(strCloneName); 146 pWizard->setCloneFilePath(UIWizardCloneVMNamePath Page::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathEditor->clonePath()));146 pWizard->setCloneFilePath(UIWizardCloneVMNamePathCommon::composeCloneFilePath(strCloneName, m_strGroup, m_pNamePathEditor->clonePath())); 147 147 emit completeChanged(); 148 148 } 149 149 150 void UIWizardCloneVMNamePathPage Basic::sltClonePathChanged(const QString &strClonePath)150 void UIWizardCloneVMNamePathPage::sltClonePathChanged(const QString &strClonePath) 151 151 { 152 152 AssertReturnVoid(m_pNamePathEditor); 153 153 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); 154 154 m_userModifiedParameters << "CloneFilePath"; 155 wizardWindow<UIWizardCloneVM>()->setCloneFilePath(UIWizardCloneVMNamePath Page::composeCloneFilePath(m_pNamePathEditor->cloneName(), m_strGroup, strClonePath));155 wizardWindow<UIWizardCloneVM>()->setCloneFilePath(UIWizardCloneVMNamePathCommon::composeCloneFilePath(m_pNamePathEditor->cloneName(), m_strGroup, strClonePath)); 156 156 emit completeChanged(); 157 157 } 158 158 159 void UIWizardCloneVMNamePathPage Basic::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy)159 void UIWizardCloneVMNamePathPage::sltMACAddressClonePolicyChanged(MACAddressClonePolicy enmMACAddressClonePolicy) 160 160 { 161 161 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); … … 165 165 } 166 166 167 void UIWizardCloneVMNamePathPage Basic::sltKeepDiskNamesToggled(bool fKeepDiskNames)167 void UIWizardCloneVMNamePathPage::sltKeepDiskNamesToggled(bool fKeepDiskNames) 168 168 { 169 169 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); … … 173 173 } 174 174 175 void UIWizardCloneVMNamePathPage Basic::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs)175 void UIWizardCloneVMNamePathPage::sltKeepHardwareUUIDsToggled(bool fKeepHardwareUUIDs) 176 176 { 177 177 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMNamePathPage.h
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMNamePathPage Basicclass declaration.3 * VBox Qt GUI - UIWizardCloneVMNamePathPage class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage Basic_h19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage Basic_h18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage_h 19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 34 34 class QIRichTextLabel; 35 35 36 namespace UIWizardCloneVMNamePath Page36 namespace UIWizardCloneVMNamePathCommon 37 37 { 38 38 QString composeCloneFilePath(const QString &strCloneName, const QString &strGroup, const QString &strFolderPath); 39 39 } 40 40 41 class UIWizardCloneVMNamePathPage Basic: public UINativeWizardPage41 class UIWizardCloneVMNamePathPage : public UINativeWizardPage 42 42 { 43 43 Q_OBJECT; … … 45 45 public: 46 46 47 UIWizardCloneVMNamePathPage Basic(const QString &strOriginalName, const QString &strDefaultPath, const QString &strGroup);47 UIWizardCloneVMNamePathPage(const QString &strOriginalName, const QString &strDefaultPath, const QString &strGroup); 48 48 49 49 private slots: … … 71 71 }; 72 72 73 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage Basic_h */73 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMNamePathPage_h */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMTypePage.cpp
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMTypePage Basicclass implementation.3 * VBox Qt GUI - UIWizardCloneVMTypePage class implementation. 4 4 */ 5 5 … … 20 20 21 21 /* GUI includes: */ 22 #include "UIWizardCloneVMTypePage Basic.h"22 #include "UIWizardCloneVMTypePage.h" 23 23 #include "UIWizardCloneVM.h" 24 24 #include "QIRichTextLabel.h" 25 25 #include "UIWizardCloneVMEditors.h" 26 26 27 UIWizardCloneVMTypePage Basic::UIWizardCloneVMTypePageBasic(bool fAdditionalInfo)27 UIWizardCloneVMTypePage::UIWizardCloneVMTypePage(bool fAdditionalInfo) 28 28 : m_pLabel(0) 29 29 , m_fAdditionalInfo(fAdditionalInfo) … … 33 33 } 34 34 35 void UIWizardCloneVMTypePage Basic::prepare()35 void UIWizardCloneVMTypePage::prepare() 36 36 { 37 37 QVBoxLayout *pMainLayout = new QVBoxLayout(this); … … 47 47 pMainLayout->addWidget(m_pCloneTypeGroupBox); 48 48 connect(m_pCloneTypeGroupBox, &UICloneVMCloneTypeGroupBox::sigFullCloneSelected, 49 this, &UIWizardCloneVMTypePage Basic::sltCloneTypeChanged);49 this, &UIWizardCloneVMTypePage::sltCloneTypeChanged); 50 50 } 51 51 … … 53 53 } 54 54 55 void UIWizardCloneVMTypePage Basic::sltCloneTypeChanged(bool fIsFullClone)55 void UIWizardCloneVMTypePage::sltCloneTypeChanged(bool fIsFullClone) 56 56 { 57 57 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); … … 63 63 } 64 64 65 void UIWizardCloneVMTypePage Basic::retranslateUi()65 void UIWizardCloneVMTypePage::retranslateUi() 66 66 { 67 67 /* Translate page: */ … … 85 85 } 86 86 87 void UIWizardCloneVMTypePage Basic::initializePage()87 void UIWizardCloneVMTypePage::initializePage() 88 88 { 89 89 AssertReturnVoid(wizardWindow<UIWizardCloneVM>()); … … 93 93 } 94 94 95 bool UIWizardCloneVMTypePage Basic::validatePage()95 bool UIWizardCloneVMTypePage::validatePage() 96 96 { 97 97 UIWizardCloneVM *pWizard = wizardWindow<UIWizardCloneVM>(); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMTypePage.h
r91059 r91060 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - UIWizardCloneVMTypePage Basicclass declaration.3 * VBox Qt GUI - UIWizardCloneVMTypePage class declaration. 4 4 */ 5 5 … … 16 16 */ 17 17 18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage Basic_h19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage Basic_h18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage_h 19 #define FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage_h 20 20 #ifndef RT_WITHOUT_PRAGMA_ONCE 21 21 # pragma once … … 32 32 class UICloneVMCloneTypeGroupBox; 33 33 34 class UIWizardCloneVMTypePage Basic: public UINativeWizardPage34 class UIWizardCloneVMTypePage : public UINativeWizardPage 35 35 { 36 36 Q_OBJECT; … … 38 38 public: 39 39 40 UIWizardCloneVMTypePage Basic(bool fAdditionalInfo);40 UIWizardCloneVMTypePage(bool fAdditionalInfo); 41 41 42 42 private slots: … … 57 57 }; 58 58 59 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage Basic_h */59 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevm_UIWizardCloneVMTypePage_h */
Note:
See TracChangeset
for help on using the changeset viewer.

