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

Timestamp:

Jul 8, 2020 2:23:18 PM (5 years ago)

Author:

vboxsync

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

139044

Message:

FE/Qt: bugref:9515. Fixing more isComplete related stuff

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIUserNamePasswordEditor.cpp (modified) (4 diffs)
• widgets/UIUserNamePasswordEditor.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -122 +122 @@
 }
 
-bool UIUserNamePasswordEditor::isComplete()
-{
-    if (m_pUserNameLineEdit && m_pUserNameLineEdit->text().isEmpty())
-    {
-        markLineEdit(m_pUserNameLineEdit, true);
-        return false;
-    }
-    else
-        markLineEdit(m_pUserNameLineEdit, false);
+bool UIUserNamePasswordEditor::isUserNameComplete()
+{
+    bool fComplete = (m_pUserNameLineEdit && !m_pUserNameLineEdit->text().isEmpty());
+    markLineEdit(m_pUserNameLineEdit, !fComplete);
+    return fComplete;
+}
+
+bool UIUserNamePasswordEditor::isPasswordComplete()
+{
     bool fPasswordOK = true;
     if (m_pPasswordLineEdit && m_pPasswordRepeatLineEdit)
@@ -144 +144 @@
 }
 
+bool UIUserNamePasswordEditor::isComplete()
+{
+    bool fUserNameField = isUserNameComplete();
+    bool fPasswordField = isPasswordComplete();
+    return fUserNameField && fPasswordField;
+}
+
 void UIUserNamePasswordEditor::retranslateUi()
 {
@@ -182 +189 @@
     pLabel->setBuddy(pLineEdit);
     ++iRow;
-    connect(pLineEdit, &T::textChanged, this, &UIUserNamePasswordEditor::sigSomeTextChanged);
+    connect(pLineEdit, &T::textChanged, this, &UIUserNamePasswordEditor::sltSomeTextChanged);
     return;
 }
@@ -228 +235 @@
         m_pPasswordRepeatLineEdit->toggleTextVisibility(fPasswordVisible);
 }
+
+void UIUserNamePasswordEditor::sltSomeTextChanged()
+{
+    /* Check text lines edits and mark them accordingly: */
+    isComplete();
+    emit sigSomeTextChanged();
+}

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

@@ -91 +91 @@
 
     void sltHandlePasswordVisibility(bool fPasswordVisible);
+    void sltSomeTextChanged();
 
 private:
@@ -99 +100 @@
     /** Changes @p pLineEdit's base color to indicate an error or reverts it to the original color. */
     void markLineEdit(QLineEdit *pLineEdit, bool fError);
+
+    bool isUserNameComplete();
+    bool isPasswordComplete();
 
     QLineEdit          *m_pUserNameLineEdit;

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

@@ -207 +207 @@
         {
             if (m_pNameAndSystemEditor)
-            {
-                m_pNameAndSystemEditor->blockSignals(true);
                 m_pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
-                m_pNameAndSystemEditor->blockSignals(false);
-            }
             break;
         }

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

@@ -352 +352 @@
             return false;
     }
+    if (m_pUserNamePasswordEditor)
+    {
+        if (!m_pUserNamePasswordEditor->isComplete())
+            return false;
+    }
     return true;
 }