Changeset 87571 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 3, 2021 3:22:37 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142598

Message:

FE/Qt: bugref:9515. Renaming page3 as page2.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVMPageBasic2.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp ) (33 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic2.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h ) (6 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -654 +654 @@
         src/wizards/newvm/UIWizardNewVM.h \
         src/wizards/newvm/UIWizardNewVMPageBasic1.h \
-        src/wizards/newvm/UIWizardNewVMPageBasic3.h \
+        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
         src/wizards/newvm/UIWizardNewVMPageBasic5.h \
@@ -1136 +1136 @@
         src/wizards/newvm/UIWizardNewVM.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
-        src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
+        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
         src/wizards/newvm/UIWizardNewVMPageBasic5.cpp \

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

@@ -24 +24 @@
 #include "UIWizardNewVM.h"
 #include "UIWizardNewVMPageBasic1.h"
-#include "UIWizardNewVMPageBasic3.h"
+#include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVMPageBasic4.h"
 #include "UIWizardNewVMPageBasic5.h"
@@ -81 +81 @@
         {
             setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
-            setPage(Page3, new UIWizardNewVMPageBasic3);
+            setPage(Page2, new UIWizardNewVMPageBasic2);
             setPage(Page4, new UIWizardNewVMPageBasic4);
             setPage(Page5, new UIWizardNewVMPageBasic5);

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

@@ -61 +61 @@
     {
         Page1,
-        Page3,
+        Page2,
         Page4,
         Page5,

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

@@ -496 +496 @@
 {
     if (isUnattendedEnabled())
-        return UIWizardNewVM::Page3;
+        return UIWizardNewVM::Page2;
     return UIWizardNewVM::Page4;
 }

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic3 class implementation.
+ * VBox Qt GUI - UIWizardNewVMPageBasic2 class implementation.
  */
 
@@ -31 +31 @@
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIWizardNewVMPageBasic3.h"
+#include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVM.h"
 
@@ -39 +39 @@
 #include "CUnattended.h"
 
-UIWizardNewVMPage3::UIWizardNewVMPage3()
+UIWizardNewVMPage2::UIWizardNewVMPage2()
     : m_pUserNameContainer(0)
     , m_pAdditionalOptionsContainer(0)
@@ -56 +56 @@
 }
 
-QString UIWizardNewVMPage3::userName() const
+QString UIWizardNewVMPage2::userName() const
 {
     if (m_pUserNamePasswordEditor)
@@ -63 +63 @@
 }
 
-void UIWizardNewVMPage3::setUserName(const QString &strName)
+void UIWizardNewVMPage2::setUserName(const QString &strName)
 {
     if (m_pUserNamePasswordEditor)
@@ -69 +69 @@
 }
 
-QString UIWizardNewVMPage3::password() const
+QString UIWizardNewVMPage2::password() const
 {
     if (m_pUserNamePasswordEditor)
@@ -76 +76 @@
 }
 
-void UIWizardNewVMPage3::setPassword(const QString &strPassword)
+void UIWizardNewVMPage2::setPassword(const QString &strPassword)
 {
     if (m_pUserNamePasswordEditor)
@@ -82 +82 @@
 }
 
-QString UIWizardNewVMPage3::hostname() const
+QString UIWizardNewVMPage2::hostname() const
 {
     if (m_pHostnameLineEdit)
@@ -89 +89 @@
 }
 
-void UIWizardNewVMPage3::setHostname(const QString &strHostName)
+void UIWizardNewVMPage2::setHostname(const QString &strHostName)
 {
     if (m_pHostnameLineEdit)
@@ -95 +95 @@
 }
 
-bool UIWizardNewVMPage3::installGuestAdditions() const
+bool UIWizardNewVMPage2::installGuestAdditions() const
 {
     if (!m_pGAInstallCheckBox)
@@ -102 +102 @@
 }
 
-void UIWizardNewVMPage3::setInstallGuestAdditions(bool fInstallGA)
+void UIWizardNewVMPage2::setInstallGuestAdditions(bool fInstallGA)
 {
     if (m_pGAInstallCheckBox)
@@ -108 +108 @@
 }
 
-QString UIWizardNewVMPage3::guestAdditionsISOPath() const
+QString UIWizardNewVMPage2::guestAdditionsISOPath() const
 {
     if (!m_pGAISOFilePathSelector)
@@ -115 +115 @@
 }
 
-void UIWizardNewVMPage3::setGuestAdditionsISOPath(const QString &strISOPath)
+void UIWizardNewVMPage2::setGuestAdditionsISOPath(const QString &strISOPath)
 {
     if (m_pGAISOFilePathSelector)
@@ -121 +121 @@
 }
 
-QString UIWizardNewVMPage3::productKey() const
+QString UIWizardNewVMPage2::productKey() const
 {
     if (!m_pProductKeyLineEdit || !m_pProductKeyLineEdit->hasAcceptableInput())
@@ -128 +128 @@
 }
 
-QWidget *UIWizardNewVMPage3::createGAInstallWidgets()
+QWidget *UIWizardNewVMPage2::createGAInstallWidgets()
 {
     if (m_pGAInstallationISOContainer)
@@ -154 +154 @@
 }
 
-bool UIWizardNewVMPage3::checkGAISOFile() const
+bool UIWizardNewVMPage2::checkGAISOFile() const
 {
     if (!m_pGAISOFilePathSelector)
@@ -168 +168 @@
 }
 
-void UIWizardNewVMPage3::markWidgets() const
+void UIWizardNewVMPage2::markWidgets() const
 {
     if (installGuestAdditions())
@@ -174 +174 @@
 }
 
-void UIWizardNewVMPage3::retranslateWidgets()
+void UIWizardNewVMPage2::retranslateWidgets()
 {
     if (m_pHostnameLabel)
@@ -201 +201 @@
 }
 
-void UIWizardNewVMPage3::disableEnableGAWidgets(bool fEnabled)
+void UIWizardNewVMPage2::disableEnableGAWidgets(bool fEnabled)
 {
     if (m_pGAISOPathLabel)
@@ -209 +209 @@
 }
 
-void UIWizardNewVMPage3::disableEnableProductKeyWidgets(bool fEnabled)
+void UIWizardNewVMPage2::disableEnableProductKeyWidgets(bool fEnabled)
 {
     if (m_pProductKeyLabel)
@@ -217 +217 @@
 }
 
-bool UIWizardNewVMPage3::startHeadless() const
+bool UIWizardNewVMPage2::startHeadless() const
 {
     if (!m_pStartHeadlessCheckBox)
@@ -224 +224 @@
 }
 
-QWidget *UIWizardNewVMPage3::createUserNameWidgets()
+QWidget *UIWizardNewVMPage2::createUserNameWidgets()
 {
     if (m_pUserNameContainer)
@@ -240 +240 @@
 }
 
-QWidget *UIWizardNewVMPage3::createAdditionalOptionsWidgets()
+QWidget *UIWizardNewVMPage2::createAdditionalOptionsWidgets()
 {
     if (m_pAdditionalOptionsContainer)
@@ -280 +280 @@
 }
 
-bool UIWizardNewVMPage3::isGAInstallEnabled() const
+bool UIWizardNewVMPage2::isGAInstallEnabled() const
 {
     if (m_pGAInstallCheckBox && m_pGAInstallCheckBox->isChecked())
@@ -287 +287 @@
 }
 
-UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
+UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
     : m_pLabel(0)
 {
@@ -293 +293 @@
 }
 
-void UIWizardNewVMPageBasic3::prepare()
+void UIWizardNewVMPageBasic2::prepare()
 {
     QGridLayout *pMainLayout = new QGridLayout(this);
@@ -319 +319 @@
 }
 
-void UIWizardNewVMPageBasic3::createConnections()
+void UIWizardNewVMPageBasic2::createConnections()
 {
     if (m_pUserNamePasswordEditor)
         connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
-                this, &UIWizardNewVMPageBasic3::completeChanged);
+                this, &UIWizardNewVMPageBasic2::completeChanged);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAISOFilePathSelector, &UIFilePathSelector::pathChanged,
-                this, &UIWizardNewVMPageBasic3::sltGAISOPathChanged);
+                this, &UIWizardNewVMPageBasic2::sltGAISOPathChanged);
     if (m_pGAISOFilePathSelector)
         connect(m_pGAInstallCheckBox, &QCheckBox::toggled,
-                this, &UIWizardNewVMPageBasic3::sltInstallGACheckBoxToggle);
-}
-
-
-void UIWizardNewVMPageBasic3::retranslateUi()
+                this, &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
+}
+
+
+void UIWizardNewVMPageBasic2::retranslateUi()
 {
     setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
@@ -343 +343 @@
 }
 
-void UIWizardNewVMPageBasic3::initializePage()
+void UIWizardNewVMPageBasic2::initializePage()
 {
     disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
@@ -350 +350 @@
 }
 
-bool UIWizardNewVMPageBasic3::isComplete() const
+bool UIWizardNewVMPageBasic2::isComplete() const
 {
     markWidgets();
@@ -371 +371 @@
 }
 
-void UIWizardNewVMPageBasic3::cleanupPage()
-{
-}
-
-void UIWizardNewVMPageBasic3::showEvent(QShowEvent *pEvent)
+void UIWizardNewVMPageBasic2::cleanupPage()
+{
+}
+
+void UIWizardNewVMPageBasic2::showEvent(QShowEvent *pEvent)
 {
     // if (m_pToolBox)
@@ -382 +382 @@
 }
 
-void UIWizardNewVMPageBasic3::sltInstallGACheckBoxToggle(bool fEnabled)
+void UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle(bool fEnabled)
 {
     disableEnableGAWidgets(fEnabled);
@@ -388 +388 @@
 }
 
-void UIWizardNewVMPageBasic3::sltGAISOPathChanged(const QString &strPath)
+void UIWizardNewVMPageBasic2::sltGAISOPathChanged(const QString &strPath)
 {
     Q_UNUSED(strPath);
@@ -394 +394 @@
 }
 
-bool UIWizardNewVMPageBasic3::isProductKeyWidgetEnabled() const
+bool UIWizardNewVMPageBasic2::isProductKeyWidgetEnabled() const
 {
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIWizardNewVMPageBasic3 class declaration.
+ * VBox Qt GUI - UIWizardNewVMPageBasic2 class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
-#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
+#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
+#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -39 +39 @@
 
 
-class UIWizardNewVMPage3 : public UIWizardPageBase
+class UIWizardNewVMPage2 : public UIWizardPageBase
 {
 public:
 
-    UIWizardNewVMPage3();
+    UIWizardNewVMPage2();
 
     /** @name Property getters/setters
@@ -106 +106 @@
 };
 
-class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
+class UIWizardNewVMPageBasic2 : public UIWizardPage, public UIWizardNewVMPage2
 {
     Q_OBJECT;
@@ -119 +119 @@
 public:
 
-    UIWizardNewVMPageBasic3();
+    UIWizardNewVMPageBasic2();
 
 protected:
@@ -145 +145 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h */

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

@@ -183 +183 @@
 {
     UIWizardNewVMPage1::retranslateWidgets();
-    UIWizardNewVMPage3::retranslateWidgets();
+    UIWizardNewVMPage2::retranslateWidgets();
     UIWizardNewVMPage4::retranslateWidgets();
     UIWizardNewVMPage5::retranslateWidgets();
@@ -305 +305 @@
 {
     UIWizardNewVMPage1::markWidgets();
-    UIWizardNewVMPage3::markWidgets();
+    UIWizardNewVMPage2::markWidgets();
 }
 

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

@@ -24 +24 @@
 /* Local includes: */
 #include "UIWizardNewVMPageBasic1.h"
-#include "UIWizardNewVMPageBasic3.h"
+#include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVMPageBasic4.h"
 #include "UIWizardNewVMPageBasic5.h"
@@ -35 +35 @@
 class UIWizardNewVMPageExpert : public UIWizardPage,
                                 public UIWizardNewVMPage1,
-                                public UIWizardNewVMPage3,
+                                public UIWizardNewVMPage2,
                                 public UIWizardNewVMPage4,
                                 public UIWizardNewVMPage5