Changeset 84906 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 22, 2020 2:34:49 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Using the user name and password during unattended install.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasicInstallSetup.cpp (modified) (5 diffs)
• wizards/newvm/UIWizardNewVMPageBasicInstallSetup.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1894 +1894 @@
     comUnattendedInstaller.SetMachine(comMachine);
     checkUnattendedInstallError(comUnattendedInstaller);
+    comUnattendedInstaller.SetUser(unattendedData.m_strUserName);
+    comUnattendedInstaller.SetPassword(unattendedData.m_strPassword);
     comUnattendedInstaller.Prepare();
     checkUnattendedInstallError(comUnattendedInstaller);

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

@@ -514 +514 @@
 {
     m_unattendedInstallData = unattendedInstallData;
+    UIWizardNewVMPageBasicInstallSetup *pPage = qobject_cast<UIWizardNewVMPageBasicInstallSetup *>(page(PageInstallSetup));
+    if (pPage)
+        pPage->setDefaultUnattendedInstallData(unattendedInstallData);
 }
 
@@ -529 +532 @@
     if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::Bool))
         m_unattendedInstallData.m_fStartHeadless = fieldValue.toBool();
+
+    fieldValue = field("userName");
+    if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::QString))
+        m_unattendedInstallData.m_strUserName = fieldValue.toString();
+
+    fieldValue = field("password");
+    if (!fieldValue.isNull() && fieldValue.isValid() && fieldValue.canConvert(QMetaType::QString))
+        m_unattendedInstallData.m_strPassword = fieldValue.toString();
 
     m_unattendedInstallData.m_uMachineUid = createdMachineId();

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

@@ -47 +47 @@
 }
 
+QString UIUserNamePasswordEditor::userName() const
+{
+    if (m_pUserNameField)
+        return m_pUserNameField->text();
+    return QString();
+}
+
+void UIUserNamePasswordEditor::setUserName(const QString &strUserName)
+{
+    if (m_pUserNameField)
+        return m_pUserNameField->setText(strUserName);
+}
+
+QString UIUserNamePasswordEditor::password() const
+{
+    if (m_pPasswordField)
+        return m_pPasswordField->text();
+    return QString();
+}
+
+void UIUserNamePasswordEditor::setPassword(const QString &strPassword)
+{
+    if (m_pPasswordField)
+        m_pPasswordField->setText(strPassword);
+    if (m_pPasswordRepeatField)
+        m_pPasswordRepeatField->setText(strPassword);
+}
+
 void UIUserNamePasswordEditor::retranslateUi()
 {
@@ -68 +96 @@
 }
 
-void UIUserNamePasswordEditor::addField(QLabel *&pLabel, QLineEdit *&pLineEdit, QGridLayout *pLayout, bool fIsPasswordField /* = false */)
+void UIUserNamePasswordEditor::addLineEdit(QLabel *&pLabel, QLineEdit *&pLineEdit, QGridLayout *pLayout, bool fIsPasswordField /* = false */)
 {
     static int iRow = 0;
@@ -97 +125 @@
     setLayout(pMainLayout);
 
-    addField(m_pUserNameFieldLabel, m_pUserNameField, pMainLayout);
-    addField(m_pPasswordFieldLabel, m_pPasswordField, pMainLayout, true);
-    addField(m_pPasswordRepeatFieldLabel, m_pPasswordRepeatField, pMainLayout, true);
+    addLineEdit(m_pUserNameFieldLabel, m_pUserNameField, pMainLayout);
+    addLineEdit(m_pPasswordFieldLabel, m_pPasswordField, pMainLayout, true);
+    addLineEdit(m_pPasswordRepeatFieldLabel, m_pPasswordRepeatField, pMainLayout, true);
+
     retranslateUi();
 }
@@ -107 +136 @@
 {
 }
+
+QString UIWizardNewVMPageInstallSetup::userName() const
+{
+    if (m_pUserNamePasswordEditor)
+        return m_pUserNamePasswordEditor->userName();
+    return QString();
+}
+
+QString UIWizardNewVMPageInstallSetup::password() const
+{
+    if (m_pUserNamePasswordEditor)
+        return m_pUserNamePasswordEditor->password();
+    return QString();
+}
+
 
 UIWizardNewVMPageBasicInstallSetup::UIWizardNewVMPageBasicInstallSetup()
@@ -126 +170 @@
     }
 
+
     /* Register fields: */
-    // registerField("baseMemory", this, "baseMemory");
-    // registerField("VCPUCount", this, "VCPUCount");
+    registerField("userName", this, "userName");
+    registerField("password", this, "password");
+}
+
+void UIWizardNewVMPageBasicInstallSetup::setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData)
+{
+    /* Initialize the widget data: */
+
+    if (m_pUserNamePasswordEditor)
+    {
+        m_pUserNamePasswordEditor->setUserName(unattendedInstallData.m_strUserName);
+        m_pUserNamePasswordEditor->setPassword(unattendedInstallData.m_strPassword);
+    }
 }
 

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

@@ -35 +35 @@
 class QSpinBox;
 class QIRichTextLabel;
+struct UIUnattendedInstallData;
 
 class UIUserNamePasswordEditor : public QIWithRetranslateUI<QWidget>
@@ -45 +46 @@
     UIUserNamePasswordEditor(QWidget *pParent = 0);
 
+    QString userName() const;
+    void setUserName(const QString &strUserName);
+
+    QString password() const;
+    void setPassword(const QString &strPassword);
+
 protected:
 
@@ -52 +59 @@
 
     void prepare();
-    void addField(QLabel *&pLabel, QLineEdit *&pLineEdit, QGridLayout *pLayout, bool fIsPasswordField = false);
+    void addLineEdit(QLabel *&pLabel, QLineEdit *&pLineEdit, QGridLayout *pLayout, bool fIsPasswordField = false);
 
     QLineEdit *m_pUserNameField;
@@ -67 +74 @@
 class UIWizardNewVMPageInstallSetup : public UIWizardPageBase
 {
+public:
+
+    UIWizardNewVMPageInstallSetup();
+
+    QString userName() const;
+    QString password() const;
+
 protected:
 
-    /* Constructor: */
-    UIWizardNewVMPageInstallSetup();
 
 
@@ -81 +93 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(QString userName READ userName);
+    Q_PROPERTY(QString password READ password);
 
 public:
@@ -86 +100 @@
     /* Constructor: */
     UIWizardNewVMPageBasicInstallSetup();
+    void setDefaultUnattendedInstallData(const UIUnattendedInstallData &unattendedInstallData);
 
 private slots: