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

Timestamp:

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

Author:

vboxsync

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

138789

Message:

FE/Qt: bugref:9515. Painting user name/password line edits to indicate any error.

Location:

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

Files:

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

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

@@ -132 +132 @@
     if (m_pUserNameLineEdit && m_pUserNameLineEdit->text().isEmpty())
     {
-        // mark user name the line edit
+        markLineEdit(m_pUserNameLineEdit, true);
         return false;
     }
+    else
+        markLineEdit(m_pUserNameLineEdit, false);
+    bool fPasswordOK = true;
     if (m_pPasswordLineEdit && m_pPasswordRepeatLineEdit)
     {
         if (m_pPasswordLineEdit->text() != m_pPasswordRepeatLineEdit->text())
-        {
-            // mark password line edits
-            return false;
-        }
+            fPasswordOK = false;
         if (m_pPasswordLineEdit->text().isEmpty())
-            return false;
-    }
-    return true;
+            fPasswordOK = false;
+    }
+    markLineEdit(m_pPasswordLineEdit, !fPasswordOK);
+    markLineEdit(m_pPasswordRepeatLineEdit, !fPasswordOK);
+    return fPasswordOK;
 }
 
@@ -188 +190 @@
     connect(pLineEdit, &T::textChanged, this, &UIUserNamePasswordEditor::sigSomeTextChanged);
     return;
+}
+
+void UIUserNamePasswordEditor::markLineEdit(QLineEdit *pLineEdit, bool fError)
+{
+    if (!pLineEdit)
+        return;
+    QPalette palette = pLineEdit->palette();
+    if (fError)
+        palette.setColor(QPalette::Base, QColor(255, 180, 180));
+    else
+        palette.setColor(QPalette::Base, m_orginalLineEditBaseColor);
+    pLineEdit->setPalette(palette);
 }
 
@@ -205 +219 @@
     connect(m_pPasswordRepeatLineEdit, &UIPasswordLineEdit::sigTextVisibilityToggled,
             this, &UIUserNamePasswordEditor::sltHandlePasswordVisibility);
+    /* Cache the original back color of the line edit to restore it correctly: */
+    if (m_pUserNameLineEdit)
+        m_orginalLineEditBaseColor = m_pUserNameLineEdit->palette().color(QPalette::Base);
 
     retranslateUi();

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

@@ -92 +92 @@
     void retranslateUi();
 
+private slots:
+
+    void sltHandlePasswordVisibility(bool fPasswordVisible);
+
 private:
 
@@ -97 +101 @@
     template <class T>
     void addLineEdit(int &iRow, QLabel *&pLabel, T *&pLineEdit, QGridLayout *pLayout);
+    /** Changes @p pLineEdit's base color to indicate an error or reverts it to the original color. */
+    void markLineEdit(QLineEdit *pLineEdit, bool fError);
 
     QLineEdit          *m_pUserNameLineEdit;
@@ -105 +111 @@
     QLabel *m_pPasswordLabel;
     QLabel *m_pPasswordRepeatLabel;
-
-private slots:
-
-    void sltHandlePasswordVisibility(bool fPasswordVisible);
+    QColor m_orginalLineEditBaseColor;
 };
 

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

@@ -355 +355 @@
 void UIWizardNewVMPageBasicNameType::sltNameChanged(const QString &strNewName)
 {
-    /* Call to base-class: */
     onNameChanged(strNewName);
     composeMachineFilePath();