Changeset 88576 in vbox

Timestamp:

Apr 19, 2021 1:00:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Renaming page 1 and 2 of the new vm wizard

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (4 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageNameOSType.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ) (30 diffs)
• src/wizards/newvm/UIWizardNewVMPageNameOSType.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h ) (6 diffs)
• src/wizards/newvm/UIWizardNewVMPageUnattended.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp ) (33 diffs)
• src/wizards/newvm/UIWizardNewVMPageUnattended.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h ) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -661 +661 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \
         src/wizards/newvm/UIWizardNewVM.h \
-        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
-        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
+        src/wizards/newvm/UIWizardNewVMPageNameOSType.h \
+        src/wizards/newvm/UIWizardNewVMPageUnattended.h \
         src/wizards/newvm/UIWizardNewVMPageBasic3.h \
         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
@@ -1152 +1152 @@
         src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \
         src/wizards/newvm/UIWizardNewVM.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
+        src/wizards/newvm/UIWizardNewVMPageNameOSType.cpp \
+        src/wizards/newvm/UIWizardNewVMPageUnattended.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -23 +23 @@
 #include "UICommon.h"
 #include "UIWizardNewVM.h"
-#include "UIWizardNewVMPageBasic1.h"
-#include "UIWizardNewVMPageBasic2.h"
+#include "UIWizardNewVMPageNameOSType.h"
+#include "UIWizardNewVMPageUnattended.h"
 #include "UIWizardNewVMPageBasic3.h"
 #include "UIWizardNewVMPageBasic4.h"
@@ -82 +82 @@
         case WizardMode_Basic:
         {
-            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
-            setPage(Page2, new UIWizardNewVMPageBasic2);
+            setPage(Page1, new UIWizardNewVMPageNameOSType(m_strGroup));
+            setPage(Page2, new UIWizardNewVMPageUnattended);
             setPage(Page3, new UIWizardNewVMPageBasic3);
             setPage(Page4, new UIWizardNewVMPageBasic4);
@@ -510 +510 @@
         case WizardMode_Basic:
         {
-            UIWizardNewVMPageBasic1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page1));
+            UIWizardNewVMPageNameOSType *pPage = qobject_cast<UIWizardNewVMPageNameOSType*> (page(Page1));
             /* Make sure that we were able to find the page that created the folder. */
             Assert(pPage);
@@ -531 +531 @@
 void UIWizardNewVM::sltHandleDetectedOSTypeChange()
 {
-    UIWizardNewVMPageBasic1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*>(page(Page1));
+    UIWizardNewVMPageNameOSType *pPage = qobject_cast<UIWizardNewVMPageNameOSType*>(page(Page1));
     if (!pPage)
         return;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -48 +48 @@
 
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
-    : UIWizardNewVMPage1(strGroup)
+    : UIWizardNewVMPageBaseNameOSType(strGroup)
     , m_pToolBox(0)
     , m_pDiskFormatGroupBox(0)
@@ -154 +154 @@
 void UIWizardNewVMPageExpert::retranslateUi()
 {
-    UIWizardNewVMPage1::retranslateWidgets();
-    UIWizardNewVMPage2::retranslateWidgets();
+    UIWizardNewVMPageBaseNameOSType::retranslateWidgets();
+    UIWizardNewVMPageBaseUnattended::retranslateWidgets();
     UIWizardNewVMPage3::retranslateWidgets();
     UIWizardNewVMPage4::retranslateWidgets();
@@ -338 +338 @@
 void UIWizardNewVMPageExpert::markWidgets() const
 {
-    UIWizardNewVMPage1::markWidgets();
-    UIWizardNewVMPage2::markWidgets();
+    UIWizardNewVMPageBaseNameOSType::markWidgets();
+    UIWizardNewVMPageBaseUnattended::markWidgets();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -26 +26 @@
 
 /* Local includes: */
-#include "UIWizardNewVMPageBasic1.h"
-#include "UIWizardNewVMPageBasic2.h"
+#include "UIWizardNewVMPageNameOSType.h"
+#include "UIWizardNewVMPageUnattended.h"
 #include "UIWizardNewVMPageBasic3.h"
 #include "UIWizardNewVMPageBasic4.h"
@@ -38 +38 @@
 /** Expert page of the New Virtual Machine wizard. */
 class UIWizardNewVMPageExpert : public UIWizardPage,
-                                public UIWizardNewVMPage1,
-                                public UIWizardNewVMPage2,
+                                public UIWizardNewVMPageBaseNameOSType,
+                                public UIWizardNewVMPageBaseUnattended,
                                 public UIWizardNewVMPage3,
                                 public UIWizardNewVMPage4,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageNameOSType.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic1 class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasicNameOSStype class implementation.
  */
 
@@ -31 +31 @@
 #include "UIMessageCenter.h"
 #include "UINameAndSystemEditor.h"
-#include "UIWizardNewVMPageBasic1.h"
+#include "UIWizardNewVMPageNameOSType.h"
 #include "UIWizardNewVM.h"
 
@@ -178 +178 @@
 };
 
-UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
+UIWizardNewVMPageBaseNameOSType::UIWizardNewVMPageBaseNameOSType(const QString &strGroup)
     : m_pNameAndSystemEditor(0)
     , m_pSkipUnattendedCheckBox(0)
@@ -188 +188 @@
 }
 
-void UIWizardNewVMPage1::onNameChanged(QString strNewName)
+void UIWizardNewVMPageBaseNameOSType::onNameChanged(QString strNewName)
 {
     /* Do not forget about achitecture bits, if not yet specified: */
@@ -204 +204 @@
 }
 
-void UIWizardNewVMPage1::onOsTypeChanged()
+void UIWizardNewVMPageBaseNameOSType::onOsTypeChanged()
 {
     /* If the user manually edited the OS type, we didn't want our automatic OS type guessing anymore.
@@ -212 +212 @@
 }
 
-void UIWizardNewVMPage1::composeMachineFilePath()
+void UIWizardNewVMPageBaseNameOSType::composeMachineFilePath()
 {
     if (!m_pNameAndSystemEditor)
@@ -232 +232 @@
 }
 
-QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets()
+QWidget *UIWizardNewVMPageBaseNameOSType::createNameOSTypeWidgets()
 {
     /* Prepare container widget: */
@@ -264 +264 @@
 }
 
-bool UIWizardNewVMPage1::createMachineFolder()
+bool UIWizardNewVMPageBaseNameOSType::createMachineFolder()
 {
     if (!m_pNameAndSystemEditor)
@@ -302 +302 @@
 }
 
-bool UIWizardNewVMPage1::cleanupMachineFolder(bool fWizardCancel /* = false */)
+bool UIWizardNewVMPageBaseNameOSType::cleanupMachineFolder(bool fWizardCancel /* = false */)
 {
     /* Make sure folder was previosly created: */
@@ -321 +321 @@
 }
 
-QString UIWizardNewVMPage1::machineFilePath() const
+QString UIWizardNewVMPageBaseNameOSType::machineFilePath() const
 {
     return m_strMachineFilePath;
 }
 
-void UIWizardNewVMPage1::setMachineFilePath(const QString &strMachineFilePath)
+void UIWizardNewVMPageBaseNameOSType::setMachineFilePath(const QString &strMachineFilePath)
 {
     m_strMachineFilePath = strMachineFilePath;
 }
 
-QString UIWizardNewVMPage1::machineFolder() const
+QString UIWizardNewVMPageBaseNameOSType::machineFolder() const
 {
     return m_strMachineFolder;
 }
 
-void UIWizardNewVMPage1::setMachineFolder(const QString &strMachineFolder)
+void UIWizardNewVMPageBaseNameOSType::setMachineFolder(const QString &strMachineFolder)
 {
     m_strMachineFolder = strMachineFolder;
 }
 
-QString UIWizardNewVMPage1::machineBaseName() const
+QString UIWizardNewVMPageBaseNameOSType::machineBaseName() const
 {
     return m_strMachineBaseName;
 }
 
-void UIWizardNewVMPage1::setMachineBaseName(const QString &strMachineBaseName)
+void UIWizardNewVMPageBaseNameOSType::setMachineBaseName(const QString &strMachineBaseName)
 {
     m_strMachineBaseName = strMachineBaseName;
 }
 
-QString UIWizardNewVMPage1::guestOSFamiyId() const
+QString UIWizardNewVMPageBaseNameOSType::guestOSFamiyId() const
 {
     if (!m_pNameAndSystemEditor)
@@ -358 +358 @@
 }
 
-void UIWizardNewVMPage1::markWidgets() const
+void UIWizardNewVMPageBaseNameOSType::markWidgets() const
 {
     if (m_pNameAndSystemEditor)
@@ -367 +367 @@
 }
 
-void UIWizardNewVMPage1::retranslateWidgets()
+void UIWizardNewVMPageBaseNameOSType::retranslateWidgets()
 {
     if (m_pSkipUnattendedCheckBox)
@@ -378 +378 @@
 }
 
-QString UIWizardNewVMPage1::ISOFilePath() const
+QString UIWizardNewVMPageBaseNameOSType::ISOFilePath() const
 {
     if (!m_pNameAndSystemEditor)
@@ -385 +385 @@
 }
 
-bool UIWizardNewVMPage1::isUnattendedEnabled() const
+bool UIWizardNewVMPageBaseNameOSType::isUnattendedEnabled() const
 {
     if (!m_pNameAndSystemEditor)
@@ -397 +397 @@
 }
 
-const QString &UIWizardNewVMPage1::detectedOSTypeId() const
+const QString &UIWizardNewVMPageBaseNameOSType::detectedOSTypeId() const
 {
     return m_strDetectedOSTypeId;
 }
 
-bool UIWizardNewVMPage1::determineOSType(const QString &strISOPath)
+bool UIWizardNewVMPageBaseNameOSType::determineOSType(const QString &strISOPath)
 {
     QFileInfo isoFileInfo(strISOPath);
@@ -419 +419 @@
 }
 
-bool UIWizardNewVMPage1::skipUnattendedInstall() const
+bool UIWizardNewVMPageBaseNameOSType::skipUnattendedInstall() const
 {
     return m_pSkipUnattendedCheckBox && m_pSkipUnattendedCheckBox->isChecked();
 }
 
-bool UIWizardNewVMPage1::checkISOFile() const
+bool UIWizardNewVMPageBaseNameOSType::checkISOFile() const
 {
     if (!m_pNameAndSystemEditor)
@@ -437 +437 @@
 }
 
-void UIWizardNewVMPage1::setSkipCheckBoxEnable()
+void UIWizardNewVMPageBaseNameOSType::setSkipCheckBoxEnable()
 {
     if (!m_pSkipUnattendedCheckBox)
@@ -448 +448 @@
 }
 
-void UIWizardNewVMPage1::setTypeByISODetectedOSType(const QString &strDetectedOSType)
+void UIWizardNewVMPageBaseNameOSType::setTypeByISODetectedOSType(const QString &strDetectedOSType)
 {
     Q_UNUSED(strDetectedOSType);
@@ -456 +456 @@
 
 
-UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
-    : UIWizardNewVMPage1(strGroup)
+UIWizardNewVMPageNameOSType::UIWizardNewVMPageNameOSType(const QString &strGroup)
+    : UIWizardNewVMPageBaseNameOSType(strGroup)
     , m_pNameOSTypeLabel(0)
 {
@@ -463 +463 @@
 }
 
-void UIWizardNewVMPageBasic1::prepare()
+void UIWizardNewVMPageNameOSType::prepare()
 {
     /* Prepare page layout: */
@@ -494 +494 @@
 }
 
-void UIWizardNewVMPageBasic1::createConnections()
+void UIWizardNewVMPageNameOSType::createConnections()
 {
     if (m_pNameAndSystemEditor)
     {
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic1::sltPathChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic1::sltOsTypeChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged, this, &UIWizardNewVMPageBasic1::sltISOPathChanged);
-    }
-}
-
-bool UIWizardNewVMPageBasic1::isComplete() const
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageNameOSType::sltNameChanged);
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageNameOSType::sltPathChanged);
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageNameOSType::sltOsTypeChanged);
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged, this, &UIWizardNewVMPageNameOSType::sltISOPathChanged);
+    }
+}
+
+bool UIWizardNewVMPageNameOSType::isComplete() const
 {
     markWidgets();
@@ -513 +513 @@
 }
 
-int UIWizardNewVMPageBasic1::nextId() const
+int UIWizardNewVMPageNameOSType::nextId() const
 {
     if (isUnattendedEnabled())
@@ -520 +520 @@
 }
 
-void UIWizardNewVMPageBasic1::sltNameChanged(const QString &strNewName)
+void UIWizardNewVMPageNameOSType::sltNameChanged(const QString &strNewName)
 {
     onNameChanged(strNewName);
@@ -526 +526 @@
 }
 
-void UIWizardNewVMPageBasic1::sltPathChanged(const QString &strNewPath)
+void UIWizardNewVMPageNameOSType::sltPathChanged(const QString &strNewPath)
 {
     Q_UNUSED(strNewPath);
@@ -532 +532 @@
 }
 
-void UIWizardNewVMPageBasic1::sltOsTypeChanged()
+void UIWizardNewVMPageNameOSType::sltOsTypeChanged()
 {
     /* Call to base-class: */
@@ -538 +538 @@
 }
 
-void UIWizardNewVMPageBasic1::retranslateUi()
+void UIWizardNewVMPageNameOSType::retranslateUi()
 {
     retranslateWidgets();
@@ -553 +553 @@
 }
 
-void UIWizardNewVMPageBasic1::initializePage()
+void UIWizardNewVMPageNameOSType::initializePage()
 {
     /* Translate page: */
@@ -562 +562 @@
 }
 
-void UIWizardNewVMPageBasic1::cleanupPage()
+void UIWizardNewVMPageNameOSType::cleanupPage()
 {
     /* Cleanup: */
@@ -570 +570 @@
 }
 
-bool UIWizardNewVMPageBasic1::validatePage()
+bool UIWizardNewVMPageNameOSType::validatePage()
 {
     /* Try to create machine folder: */
@@ -576 +576 @@
 }
 
-void UIWizardNewVMPageBasic1::sltISOPathChanged(const QString &strPath)
+void UIWizardNewVMPageNameOSType::sltISOPathChanged(const QString &strPath)
 {
     determineOSType(strPath);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageNameOSType.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic1 class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageNameOSType class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageNameOSType_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageNameOSType_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -38 +38 @@
 
 /** 1st page of the New Virtual Machine wizard (base part): */
-class UIWizardNewVMPage1 : public UIWizardPageBase
+class UIWizardNewVMPageBaseNameOSType : public UIWizardPageBase
 {
 protected:
 
     /** Constructor. */
-    UIWizardNewVMPage1(const QString &strGroup);
+    UIWizardNewVMPageBaseNameOSType(const QString &strGroup);
 
     /** Handlers. */
@@ -116 +116 @@
 
 /** 1st page of the New Virtual Machine wizard (basic extension). */
-class UIWizardNewVMPageBasic1 : public UIWizardPage, public UIWizardNewVMPage1
+class UIWizardNewVMPageNameOSType : public UIWizardPage, public UIWizardNewVMPageBaseNameOSType
 {
 
@@ -131 +131 @@
 
     /** Constructor. */
-    UIWizardNewVMPageBasic1(const QString &strGroup);
+    UIWizardNewVMPageNameOSType(const QString &strGroup);
     virtual bool isComplete() const; /* override */
     virtual int nextId() const /* override */;
@@ -169 +169 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic1_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageNameOSType_h */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageUnattended.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic2 class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageUnattended class implementation.
  */
 
@@ -32 +32 @@
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIWizardNewVMPageBasic2.h"
+#include "UIWizardNewVMPageUnattended.h"
 #include "UIWizardNewVM.h"
 
@@ -40 +40 @@
 #include "CUnattended.h"
 
-UIWizardNewVMPage2::UIWizardNewVMPage2()
+UIWizardNewVMPageBaseUnattended::UIWizardNewVMPageBaseUnattended()
     : m_pUserNameContainer(0)
     , m_pAdditionalOptionsContainer(0)
@@ -56 +56 @@
 }
 
-QString UIWizardNewVMPage2::userName() const
+QString UIWizardNewVMPageBaseUnattended::userName() const
 {
     if (m_pUserNamePasswordEditor)
@@ -63 +63 @@
 }
 
-void UIWizardNewVMPage2::setUserName(const QString &strName)
+void UIWizardNewVMPageBaseUnattended::setUserName(const QString &strName)
 {
     if (m_pUserNamePasswordEditor)
@@ -69 +69 @@
 }
 
-QString UIWizardNewVMPage2::password() const
+QString UIWizardNewVMPageBaseUnattended::password() const
 {
     if (m_pUserNamePasswordEditor)
@@ -76 +76 @@
 }
 
-void UIWizardNewVMPage2::setPassword(const QString &strPassword)
+void UIWizardNewVMPageBaseUnattended::setPassword(const QString &strPassword)
 {
     if (m_pUserNamePasswordEditor)
@@ -82 +82 @@
 }
 
-QString UIWizardNewVMPage2::hostname() const
+QString UIWizardNewVMPageBaseUnattended::hostname() const
 {
     if (m_pHostnameLineEdit)
@@ -89 +89 @@
 }
 
-void UIWizardNewVMPage2::setHostname(const QString &strHostName)
+void UIWizardNewVMPageBaseUnattended::setHostname(const QString &strHostName)
 {
     if (m_pHostnameLineEdit)
@@ -95 +95 @@
 }
 
-bool UIWizardNewVMPage2::installGuestAdditions() const
+bool UIWizardNewVMPageBaseUnattended::installGuestAdditions() const
 {
     if (!m_pGAInstallationISOContainer)
@@ -102 +102 @@
 }
 
-void UIWizardNewVMPage2::setInstallGuestAdditions(bool fInstallGA)
+void UIWizardNewVMPageBaseUnattended::setInstallGuestAdditions(bool fInstallGA)
 {
     if (m_pGAInstallationISOContainer)
@@ -108 +108 @@
 }
 
-QString UIWizardNewVMPage2::guestAdditionsISOPath() const
+QString UIWizardNewVMPageBaseUnattended::guestAdditionsISOPath() const
 {
     if (!m_pGAISOFilePathSelector)
@@ -115 +115 @@
 }
 
-void UIWizardNewVMPage2::setGuestAdditionsISOPath(const QString &strISOPath)
+void UIWizardNewVMPageBaseUnattended::setGuestAdditionsISOPath(const QString &strISOPath)
 {
     if (m_pGAISOFilePathSelector)
@@ -121 +121 @@
 }
 
-QString UIWizardNewVMPage2::productKey() const
+QString UIWizardNewVMPageBaseUnattended::productKey() const
 {
     if (!m_pProductKeyLineEdit || !m_pProductKeyLineEdit->hasAcceptableInput())
@@ -128 +128 @@
 }
 
-QWidget *UIWizardNewVMPage2::createGAInstallWidgets()
+QWidget *UIWizardNewVMPageBaseUnattended::createGAInstallWidgets()
 {
     if (m_pGAInstallationISOContainer)
@@ -171 +171 @@
 }
 
-bool UIWizardNewVMPage2::checkGAISOFile() const
+bool UIWizardNewVMPageBaseUnattended::checkGAISOFile() const
 {
     if (!m_pGAISOFilePathSelector)
@@ -185 +185 @@
 }
 
-void UIWizardNewVMPage2::markWidgets() const
+void UIWizardNewVMPageBaseUnattended::markWidgets() const
 {
     if (installGuestAdditions())
@@ -191 +191 @@
 }
 
-void UIWizardNewVMPage2::retranslateWidgets()
+void UIWizardNewVMPageBaseUnattended::retranslateWidgets()
 {
     if (m_pHostnameLabel)
@@ -220 +220 @@
 }
 
-void UIWizardNewVMPage2::disableEnableGAWidgets(bool fEnabled)
+void UIWizardNewVMPageBaseUnattended::disableEnableGAWidgets(bool fEnabled)
 {
     if (m_pGAISOPathLabel)
@@ -228 +228 @@
 }
 
-void UIWizardNewVMPage2::disableEnableProductKeyWidgets(bool fEnabled)
+void UIWizardNewVMPageBaseUnattended::disableEnableProductKeyWidgets(bool fEnabled)
 {
     if (m_pProductKeyLabel)
@@ -236 +236 @@
 }
 
-bool UIWizardNewVMPage2::startHeadless() const
+bool UIWizardNewVMPageBaseUnattended::startHeadless() const
 {
     if (!m_pStartHeadlessCheckBox)
@@ -243 +243 @@
 }
 
-QWidget *UIWizardNewVMPage2::createUserNameWidgets()
+QWidget *UIWizardNewVMPageBaseUnattended::createUserNameWidgets()
 {
     if (m_pUserNameContainer)
@@ -259 +259 @@
 }
 
-QWidget *UIWizardNewVMPage2::createAdditionalOptionsWidgets()
+QWidget *UIWizardNewVMPageBaseUnattended::createAdditionalOptionsWidgets()
 {
     if (m_pAdditionalOptionsContainer)
@@ -307 +307 @@
 }
 
-bool UIWizardNewVMPage2::isGAInstallEnabled() const
+bool UIWizardNewVMPageBaseUnattended::isGAInstallEnabled() const
 {
     if (m_pGAInstallationISOContainer && m_pGAInstallationISOContainer->isChecked())
@@ -314 +314 @@
 }
 
-UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
+UIWizardNewVMPageUnattended::UIWizardNewVMPageUnattended()
     : m_pLabel(0)
 {
@@ -320 +320 @@
 }
 
-void UIWizardNewVMPageBasic2::prepare()
+void UIWizardNewVMPageUnattended::prepare()
 {
     QGridLayout *pMainLayout = new QGridLayout(this);
@@ -342 +342 @@
 }
 
-void UIWizardNewVMPageBasic2::createConnections()
+void UIWizardNewVMPageUnattended::createConnections()
 {
     if (m_pUserNamePasswordEditor)
         connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
-                this, &UIWizardNewVMPageBasic2::completeChanged);
+                this, &UIWizardNewVMPageUnattended::completeChanged);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAISOFilePathSelector, &UIFilePathSelector::pathChanged,
-                this, &UIWizardNewVMPageBasic2::sltGAISOPathChanged);
+                this, &UIWizardNewVMPageUnattended::sltGAISOPathChanged);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAInstallationISOContainer, &QGroupBox::toggled,
-                this, &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
-}
-
-
-void UIWizardNewVMPageBasic2::retranslateUi()
+                this, &UIWizardNewVMPageUnattended::sltInstallGACheckBoxToggle);
+}
+
+
+void UIWizardNewVMPageUnattended::retranslateUi()
 {
     setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
@@ -366 +366 @@
 }
 
-void UIWizardNewVMPageBasic2::initializePage()
+void UIWizardNewVMPageUnattended::initializePage()
 {
     disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
@@ -373 +373 @@
 }
 
-bool UIWizardNewVMPageBasic2::isComplete() const
+bool UIWizardNewVMPageUnattended::isComplete() const
 {
     markWidgets();
@@ -394 +394 @@
 }
 
-void UIWizardNewVMPageBasic2::cleanupPage()
-{
-}
-
-void UIWizardNewVMPageBasic2::showEvent(QShowEvent *pEvent)
+void UIWizardNewVMPageUnattended::cleanupPage()
+{
+}
+
+void UIWizardNewVMPageUnattended::showEvent(QShowEvent *pEvent)
 {
     // if (m_pToolBox)
@@ -405 +405 @@
 }
 
-void UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle(bool fEnabled)
+void UIWizardNewVMPageUnattended::sltInstallGACheckBoxToggle(bool fEnabled)
 {
     disableEnableGAWidgets(fEnabled);
@@ -411 +411 @@
 }
 
-void UIWizardNewVMPageBasic2::sltGAISOPathChanged(const QString &strPath)
+void UIWizardNewVMPageUnattended::sltGAISOPathChanged(const QString &strPath)
 {
     Q_UNUSED(strPath);
@@ -417 +417 @@
 }
 
-bool UIWizardNewVMPageBasic2::isProductKeyWidgetEnabled() const
+bool UIWizardNewVMPageUnattended::isProductKeyWidgetEnabled() const
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageUnattended.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic2 class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageUnattended class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageUnattended_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageUnattended_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -39 +39 @@
 
 
-class UIWizardNewVMPage2 : public UIWizardPageBase
+class UIWizardNewVMPageBaseUnattended : public UIWizardPageBase
 {
 public:
 
-    UIWizardNewVMPage2();
+    UIWizardNewVMPageBaseUnattended();
 
     /** @name Property getters/setters
@@ -104 +104 @@
 };
 
-class UIWizardNewVMPageBasic2 : public UIWizardPage, public UIWizardNewVMPage2
+class UIWizardNewVMPageUnattended : public UIWizardPage, public UIWizardNewVMPageBaseUnattended
 {
     Q_OBJECT;
@@ -117 +117 @@
 public:
 
-    UIWizardNewVMPageBasic2();
+    UIWizardNewVMPageUnattended();
 
 protected:
@@ -143 +143 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageUnattended_h */