Changeset 90070 in vbox

Timestamp:

Jul 6, 2021 4:08:24 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: More fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIUserNamePasswordEditor.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMNameOSTypePageBasic.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePageBasic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp

@@ -255 +255 @@
         if (m_pPasswordLineEdit->text() != m_pPasswordRepeatLineEdit->text())
             fPasswordOK = false;
-#if 0
         if (m_pPasswordLineEdit->text().isEmpty())
             fPasswordOK = false;
-#endif
         m_pPasswordLineEdit->mark(!fPasswordOK, m_strPasswordError);
         m_pPasswordRepeatLineEdit->mark(!fPasswordOK, m_strPasswordError);
@@ -317 +315 @@
     {
         if(m_pUserNameLineEdit)
-            m_pUserNameLineEdit->setPlaceholderText(strUsername);
+            m_pUserNameLineEdit->setPlaceholderText(strUsername.remove('&'));
         if (m_pPasswordLineEdit)
-            m_pPasswordLineEdit->setPlaceholderText(strPassword);
+            m_pPasswordLineEdit->setPlaceholderText(strPassword.remove('&'));
         if (m_pPasswordRepeatLineEdit)
-            m_pPasswordRepeatLineEdit->setPlaceholderText(strRepeatPassword);
+            m_pPasswordRepeatLineEdit->setPlaceholderText(strRepeatPassword.remove('&'));
     }
     else

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

@@ -88 +88 @@
         {
             addPage(new UIWizardNewVMNameOSTypePageBasic);
-            // addPage(new UIWizardNewVMUnattendedPageBasic);
-            // addPage(new UIWizardNewVMHardwarePageBasic);
-            // addPage(new UIWizardNewVMDiskPageBasic);
+            addPage(new UIWizardNewVMUnattendedPageBasic);
+            addPage(new UIWizardNewVMHardwarePageBasic);
+            addPage(new UIWizardNewVMDiskPageBasic);
             break;
         }
@@ -806 +806 @@
 bool UIWizardNewVM::isUnattendedEnabled() const
 {
-    if (!m_fSkipUnattendedInstall)
-        return false;
     if (m_strISOFilePath.isEmpty() || m_strISOFilePath.isNull())
         return false;
+    if (m_fSkipUnattendedInstall)
+        return false;
     return true;
 }

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

@@ -30 +30 @@
 #include "CMedium.h"
 
-#define newVMWizardPropertySet(functionName, value)                  \
-    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard()); \
-    if (!pWizard)                                                    \
-        pWizard->set##functionName(value)
+#define newVMWizardPropertySet(functionName, value)                     \
+    do                                                                  \
+    {                                                                   \
+        UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard()); \
+        if (pWizard)                                                   \
+            pWizard->set##functionName(value);                          \
+    }                                                                   \
+    while(0)
 
 /** Container for unattended install related data. */

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

@@ -385 +385 @@
         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltOsTypeChanged);
         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltISOPathChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilChanged);
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged, this, &UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged);
     }
 }
@@ -441 +441 @@
 void UIWizardNewVMNameOSTypePageBasic::initializePage()
 {
-    /* Translate page: */
     retranslateUi();
+
+    /* Make sure parameters are initialized correctly: */
+    if (m_pNameAndSystemEditor)
+        newVMWizardPropertySet(GuestOSFamilyId, m_pNameAndSystemEditor->familyId());
+
     if (m_pNameAndSystemEditor)
         m_pNameAndSystemEditor->setFocus();
@@ -479 +483 @@
 }
 
-void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilChanged(const QString &strGuestOSFamilyId)
+void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId)
 {
     newVMWizardPropertySet(GuestOSFamilyId, strGuestOSFamilyId);

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

@@ -79 +79 @@
 private slots:
 
-    /** Handlers. */
     void sltNameChanged(const QString &strNewText);
     void sltPathChanged(const QString &strNewPath);
     void sltOsTypeChanged();
     void sltISOPathChanged(const QString &strPath);
-    void sltGuestOSFamilChanged(const QString &strGuestOSFamilyId);
+    void sltGuestOSFamilyChanged(const QString &strGuestOSFamilyId);
 
 private: