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

Timestamp:

Jul 3, 2020 2:59:53 PM (5 years ago)

Author:

vboxsync

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

138959

Message:

FE/Qt: bugref:9515. Some fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVMPageBasic2.cpp (modified) (5 diffs)
• UIWizardNewVMPageBasic2.h (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "QIRichTextLabel.h"
 #include "UIFilePathSelector.h"
+#include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
 #include "UIWizardNewVMPageBasic2.h"
@@ -177 +178 @@
     pGridLayout->addWidget(m_pHostnameLineEdit, 3, 1, 1, 3);
 
-    m_pToolBox->insertItem(Tabs_UserNameHostname, pContainer, QString());
+    m_pToolBox->insertItem(Tabs_UserNameHostname, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
 
 }
@@ -209 +210 @@
     pContainerLayout->addWidget(m_pISOFilePathSelector, 1, 2, 1, 4);
 
-    m_pToolBox->insertItem(Tabs_GAInstall, pContainer, QString());
+    m_pToolBox->insertItem(Tabs_GAInstall, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
 }
 
@@ -226 +227 @@
     pGridLayout->addWidget(m_pProductKeyLineEdit, 0, 1, 1, 3);
 
-    m_pToolBox->insertItem(Tabs_ProductKey, pContainer, QString());
+    m_pToolBox->insertItem(Tabs_ProductKey, pContainer, UIIconPool::iconSet(":/cloud_profile_manager_16px.png"), QString());
 }
 
 void UIWizardNewVMPageBasic2::retranslateUi()
 {
-    setTitle(UIWizardNewVM::tr("User Name/Password and Hostname Settings"));
+    setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("<p>Here you can specify the user name/password and hostname. "
-                                            "The values you enter here will be used during the unattended install.</p>"));
+        m_pLabel->setText(UIWizardNewVM::tr("<p>Here you can configure the unattended install by modifying user name, password, and "
+                                            "hostname. You can additionally enable guest additions install and a product key for "
+                                            "Microsoft Windows guests.</p>"));
     if (m_pHostnameLabel)
         m_pHostnameLabel->setText(UIWizardNewVM::tr("Hostname:"));
@@ -282 +284 @@
 }
 
+
 void UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle(bool fEnabled)
 {

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

@@ -105 +105 @@
 
     virtual void showEvent(QShowEvent *pEvent) /* override */;
+    /** Don't reset the user entered values in case of "back" button press. */
+    virtual void cleanupPage() /* override */;
 
 private slots:
@@ -123 +125 @@
     bool isProductKeyWidgetVisible() const;
 
-    /** Override the default behavior which resets the fields to proginal values. */
-    void cleanupPage() /* override */;
-
     QIRichTextLabel *m_pLabel;
 };