Changeset 90232 in vbox

Timestamp:

Jul 16, 2021 2:27:18 PM (4 years ago)

Author:

vboxsync

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

145770

Message:

FE/Qt: bugref:9996. More initialization fixes and some more connections.

Location:

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

Files:

• editors/UIWizardNewVMEditors.cpp (modified) (1 diff)
• editors/UIWizardNewVMEditors.h (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (7 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)
• newvm/UIWizardNewVMUnattendedPageBasic.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp

@@ -191 +191 @@
 
     if (m_pGAISOFilePathSelector)
-        m_pGAISOFilePathSelector->setEnabled(m_pGAISOFilePathSelector);
+        m_pGAISOFilePathSelector->setEnabled(fEnabled);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.h

@@ -93 +93 @@
     /** @} */
 
-public slots:
+private slots:
 
     void sltToggleWidgetsEnabled(bool fEnabled);

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

@@ -125 +125 @@
     if (!m_userModifiedParameters.contains("MediumPath"))
         updateVirtualMediumPathFromMachinePathName();
+    if (!m_userModifiedParameters.contains("HostnameDomainName"))
+        updateHostnameDomainNameFromMachineName();
     emit completeChanged();
 }
@@ -173 +175 @@
     m_userModifiedParameters << "GuestAdditionsISOPath";
     newVMWizardPropertySet(GuestAdditionsISOPath, strPath);
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle(bool fEnabled)
+{
+    newVMWizardPropertySet(InstallGuestAdditions, fEnabled);
+    m_userModifiedParameters << "InstallGuestAdditions";
     emit completeChanged();
 }
@@ -213 +222 @@
     if (m_pNameAndSystemLayout && m_pNameAndSystemEditor)
         m_pNameAndSystemLayout->setColumnMinimumWidth(0, m_pNameAndSystemEditor->firstColumnWidth());
-}
-
-void UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle(bool fEnabled)
-{
-    Q_UNUSED(fEnabled);
-    emit completeChanged();
 }
 
@@ -256 +259 @@
 
     }
-    // if (m_pUserNamePasswordGroupBox)
-    //     connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordEditor::sigSomeTextChanged,
-    //             this, &UIWizardNewVMPageExpert::completeChanged);
+
+    if (m_pUserNamePasswordGroupBox)
+    {
+        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigPasswordChanged,
+                this, &UIWizardNewVMPageExpert::sltPasswordChanged);
+        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigUserNameChanged,
+                this, &UIWizardNewVMPageExpert::sltUserNameChanged);
+    }
+
+
+    if (m_pAdditionalOptionsContainer)
+    {
+        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigHostnameDomainNameChanged,
+                this, &UIWizardNewVMPageExpert::sltHostnameDomainNameChanged);
+        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigProductKeyChanged,
+                this, &UIWizardNewVMPageExpert::sltProductKeyChanged);
+        connect(m_pAdditionalOptionsContainer, &UIAdditionalUnattendedOptions::sigStartHeadlessChanged,
+                this, &UIWizardNewVMPageExpert::sltStartHeadlessChanged);
+    }
 
 
@@ -356 +375 @@
     AssertReturnVoid(pWizard);
     /* Initialize wizard properties: */
-    if (m_pNameAndSystemEditor)
-    {
-        /* Guest OS type: */
-        newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
-        newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
-        /* Vm name, folder, file path etc. will be initilized by composeMachineFilePath: */
-    }
-
-    /* Medium related properties: */
-    if (m_pFormatButtonGroup)
-        newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
-    if (!m_userModifiedParameters.contains("MediumPath"))
-        updateVirtualMediumPathFromMachinePathName();
+    {
+        if (m_pNameAndSystemEditor)
+        {
+            /* Guest OS type: */
+            newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
+            newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
+            /* Vm name, folder, file path etc. will be initilized by composeMachineFilePath: */
+        }
+
+        /* Medium related properties: */
+        if (m_pFormatButtonGroup)
+            newVMWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
+        if (!m_userModifiedParameters.contains("MediumPath"))
+            updateVirtualMediumPathFromMachinePathName();
+    }
+
+    /* Initialize user/password if they are not modified by the user: */
+    if (m_pUserNamePasswordGroupBox)
+    {
+        m_pUserNamePasswordGroupBox->blockSignals(true);
+        if (!m_userModifiedParameters.contains("UserName"))
+            m_pUserNamePasswordGroupBox->setUserName(pWizard->userName());
+        if (!m_userModifiedParameters.contains("Password"))
+            m_pUserNamePasswordGroupBox->setPassword(pWizard->password());
+        m_pUserNamePasswordGroupBox->blockSignals(false);
+    }
+    if (!m_userModifiedParameters.contains("HostnameDomainName"))
+        updateHostnameDomainNameFromMachineName();
+
 
     // disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
@@ -674 +709 @@
 }
 
+void UIWizardNewVMPageExpert::sltPasswordChanged(const QString &strPassword)
+{
+    newVMWizardPropertySet(Password, strPassword);
+    m_userModifiedParameters << "Password";
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltUserNameChanged(const QString &strUserName)
+{
+    newVMWizardPropertySet(UserName, strUserName);
+    m_userModifiedParameters << "UserName";
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltHostnameDomainNameChanged(const QString &strHostnameDomainName)
+{
+    newVMWizardPropertySet(HostnameDomainName, strHostnameDomainName);
+    m_userModifiedParameters << "HostnameDomainName";
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltProductKeyChanged(const QString &strProductKey)
+{
+    m_userModifiedParameters << "ProductKey";
+    newVMWizardPropertySet(ProductKey, strProductKey);
+}
+
+void UIWizardNewVMPageExpert::sltStartHeadlessChanged(bool fStartHeadless)
+{
+    m_userModifiedParameters << "StartHeadless";
+    newVMWizardPropertySet(StartHeadless, fStartHeadless);
+}
+
+
 void UIWizardNewVMPageExpert::updateVirtualMediumPathFromMachinePathName()
 {
@@ -756 +825 @@
     }
 }
+
+void UIWizardNewVMPageExpert::updateHostnameDomainNameFromMachineName()
+{
+    if (!m_pAdditionalOptionsContainer)
+        return;
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    AssertReturnVoid(pWizard);
+
+    m_pAdditionalOptionsContainer->blockSignals(true);
+    m_pAdditionalOptionsContainer->setHostname(pWizard->machineBaseName());
+    m_pAdditionalOptionsContainer->setDomainName("myguest.virtualbox.org");
+    /* Initialize unattended hostname here since we cannot get the default value from CUnattended this early (unlike username etc): */
+    newVMWizardPropertySet(HostnameDomainName, m_pAdditionalOptionsContainer->hostnameDomainName());
+
+    m_pAdditionalOptionsContainer->blockSignals(false);
+}

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

@@ -88 +88 @@
     void sltCPUCountChanged(int iCount);
     void sltEFIEnabledChanged(bool fEnabled);
+    void sltPasswordChanged(const QString &strPassword);
+    void sltUserNameChanged(const QString &strUserName);
 
+    void sltHostnameDomainNameChanged(const QString &strHostnameDomainName);
+    void sltProductKeyChanged(const QString &strProductKey);
+    void sltStartHeadlessChanged(bool fStartHeadless);
 
 private:
@@ -128 +133 @@
     void updateVirtualMediumPathFromMachinePathName();
     void updateWidgetAterMediumFormatChange();
+    void updateHostnameDomainNameFromMachineName();
     void setEnableNewDiskWidgets(bool fEnable);
     void setVirtualDiskFromDiskCombo();

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

@@ -130 +130 @@
     if (m_pAdditionalOptionsContainer)
         m_pAdditionalOptionsContainer->disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
-    if (m_pGAInstallationISOContainer)
-        m_pGAInstallationISOContainer->sltToggleWidgetsEnabled(m_pGAInstallationISOContainer->isChecked());
     retranslateUi();
 
@@ -157 +155 @@
             newVMWizardPropertySet(HostnameDomainName, m_pAdditionalOptionsContainer->hostnameDomainName());
         }
-
         m_pAdditionalOptionsContainer->blockSignals(false);
     }
@@ -201 +198 @@
 void UIWizardNewVMUnattendedPageBasic::sltInstallGACheckBoxToggle(bool fEnabled)
 {
-    if (m_pGAInstallationISOContainer)
-        m_pGAInstallationISOContainer->sltToggleWidgetsEnabled(fEnabled);
     newVMWizardPropertySet(InstallGuestAdditions, fEnabled);
     m_userModifiedParameters << "InstallGuestAdditions";
@@ -246 +241 @@
 void UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged(const QString &strProductKey)
 {
+    m_userModifiedParameters << "ProductKey";
     newVMWizardPropertySet(ProductKey, strProductKey);
 }
@@ -251 +247 @@
 void UIWizardNewVMUnattendedPageBasic::sltStartHeadlessChanged(bool fStartHeadless)
 {
+    m_userModifiedParameters << "StartHeadless";
     newVMWizardPropertySet(StartHeadless, fStartHeadless);
 }