last commit, quality of life update

zeekliviu · May 25, 2023 · ff234f6 · ff234f6
1 parent 348eedd
commit ff234f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Proiect C#/Forms/ChangePassword.cs b/Proiect C#/Forms/ChangePassword.cs
@@ -89,7 +89,7 @@ private void newPwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!IsValidPassword(newPwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(newPwdTxtBox, errorMsg);
-                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn)
+                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn && this.ActiveControl != hideNewPwdBtn && this.ActiveControl != showNewRetypedPwdBtn && this.ActiveControl != hideNewRetypedPwdBtn)
                     e.Cancel = true;
             }
             else
@@ -119,7 +119,7 @@ private void retypePwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!PasswordsMatch(retypePwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(retypePwdTxtBox, errorMsg);
-                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewRetypedPwdBtn)
+                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn && this.ActiveControl != hideNewPwdBtn && this.ActiveControl != showNewRetypedPwdBtn && this.ActiveControl != hideNewRetypedPwdBtn)
                     e.Cancel = true;
             }
             else

diff --git a/Proiect C#/Forms/ResetPassword.cs b/Proiect C#/Forms/ResetPassword.cs
@@ -69,7 +69,7 @@ private void newPwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!IsValidPassword(newPwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(newPwdTxtBox, errorMsg);
-                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn && this.ActiveControl != hideNewPwdBtn)
+                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn && this.ActiveControl != hideNewPwdBtn && this.ActiveControl != showNewRetypedPwdBtn && this.ActiveControl != hideNewRetypedPwdBtn)
                     e.Cancel = true;
             }
             else
@@ -99,7 +99,7 @@ private void retypePwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!PasswordsMatch(retypePwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(retypePwdTxtBox, errorMsg);
-                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewRetypedPwdBtn && this.ActiveControl != hideNewRetypedPwdBtn)
+                if (this.ActiveControl != cancelBtn && this.ActiveControl != showNewPwdBtn && this.ActiveControl != hideNewPwdBtn && this.ActiveControl != showNewRetypedPwdBtn && this.ActiveControl != hideNewRetypedPwdBtn)
                     e.Cancel = true;
             }
             else

diff --git a/Proiect C#/Forms/SignUpForm.cs b/Proiect C#/Forms/SignUpForm.cs
@@ -72,7 +72,7 @@ private void firstPwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!IsValidPassword(firstPwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(firstPwdTxtBox, errorMsg);
-                if (this.ActiveControl != backBtn && this.ActiveControl != showFirstPwdBtn && this.ActiveControl != hideFirstPwdBtn)
+                if (this.ActiveControl != backBtn && this.ActiveControl != showFirstPwdBtn && this.ActiveControl != hideFirstPwdBtn && this.ActiveControl != showSecondPwdBtn && this.ActiveControl != hideSecondPwdBtn)
                     e.Cancel = true;
             }
             else
@@ -138,7 +138,7 @@ private void secondPwdTxtBox_Validating(object sender, CancelEventArgs e)
             if (!PasswordsMatch(secondPwdTxtBox.Text, out errorMsg))
             {
                 this.errorProvider.SetError(secondPwdTxtBox, errorMsg);
-                if (this.ActiveControl != backBtn && this.ActiveControl != showSecondPwdBtn && this.ActiveControl != hideSecondPwdBtn)
+                if (this.ActiveControl != backBtn && this.ActiveControl != showFirstPwdBtn && this.ActiveControl != hideFirstPwdBtn && this.ActiveControl != showSecondPwdBtn && this.ActiveControl != hideSecondPwdBtn)
                     e.Cancel = true;
             }
             else