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

Timestamp:

Jun 23, 2020 12:06:12 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Adding necessary validity checks for user name/password fields.

Location:

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

Files:

• UIWizardNewVMPageBasicInstallSetup.cpp (modified) (5 diffs)
• UIWizardNewVMPageBasicInstallSetup.h (modified) (3 diffs)
• UIWizardNewVMPageBasicNameType.cpp (modified) (1 diff)
• UIWizardNewVMPageBasicNameType.h (modified) (1 diff)
• UIWizardNewVMPageBasicUnattended.cpp (modified) (1 diff)
• UIWizardNewVMPageBasicUnattended.h (modified) (1 diff)

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

@@ -60 +60 @@
 {
     m_pTextVisibilityButton = new QToolButton(this);
+    m_pTextVisibilityButton->setFocusPolicy(Qt::ClickFocus);
     m_pTextVisibilityButton->setAutoRaise(true);
     m_pTextVisibilityButton->setCursor(Qt::ArrowCursor);
@@ -127 +128 @@
 }
 
+bool UIUserNamePasswordEditor::isComplete()
+{
+    if (m_pUserNameLineEdit && m_pUserNameLineEdit->text().isEmpty())
+    {
+        // mark user name the line edit
+        return false;
+    }
+    if (m_pPasswordLineEdit && m_pPasswordRepeatLineEdit)
+    {
+        if (m_pPasswordLineEdit->text() != m_pPasswordRepeatLineEdit->text())
+        {
+            // mark password line edits
+            return false;
+        }
+        if (m_pPasswordLineEdit->text().isEmpty())
+            return false;
+    }
+    return true;
+}
+
 void UIUserNamePasswordEditor::retranslateUi()
 {
@@ -165 +186 @@
     pLabel->setBuddy(pLineEdit);
     ++iRow;
+    connect(pLineEdit, &T::textChanged, this, &UIUserNamePasswordEditor::sigSomeTextChanged);
     return;
 }
@@ -226 +248 @@
             m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
             pMemoryLayout->addWidget(m_pUserNamePasswordEditor, 0, 0);
+            connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
+                    this, &UIWizardNewVMPageBasicInstallSetup::completeChanged);
         }
         if (m_pLabel)
@@ -277 +301 @@
 bool UIWizardNewVMPageBasicInstallSetup::isComplete() const
 {
-    return UIWizardPage::isComplete();
-}
+    if (m_pUserNamePasswordEditor)
+        return m_pUserNamePasswordEditor->isComplete();
+    return true;
+}

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

@@ -70 +70 @@
     Q_OBJECT;
 
+signals:
+
+    /** this is emitted whenever the content of one of the line edits is changed. */
+    void sigSomeTextChanged();
+
 public:
 
@@ -79 +84 @@
     QString password() const;
     void setPassword(const QString &strPassword);
+
+    /** Returns false if username or password fields are empty, or password fields do not match. */
+    bool isComplete();
 
 protected:
@@ -115 +123 @@
 protected:
 
-
-
     /* Widgets: */
     UIUserNamePasswordEditor *m_pUserNamePasswordEditor;

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

@@ -347 +347 @@
 int UIWizardNewVMPageBasicNameType::nextId() const
 {
-    // UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    // if (!pWizard || !pWizard->isUnattendedInstallEnabled())
-    //     return UIWizardNewVM::PageHardware;
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (!pWizard || !pWizard->isUnattendedInstallEnabled())
+        return UIWizardNewVM::PageHardware;
     return UIWizardNewVM::PageInstallSetup;
 }

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

@@ -117 +117 @@
 
     /* Validation stuff: */
-    bool validatePage();
+    virtual bool validatePage() /* override */;
 
     /* Widgets: */

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

@@ -115 +115 @@
 {
     bool fISOFileOK = checkISOFile();
-    //emit completeChanged();
     return fISOFileOK;
 }

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

@@ -91 +91 @@
 
     /* Validation stuff: */
-    bool validatePage();
+    virtual bool validatePage() /* override */;
 
     /* Widgets: */