michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Repeat password' field added, entered passwords are verified.

Browse Source
This commit is contained in:
Milan Hanajik
2017-03-15 08:11:54 +01:00
parent 42ac833091
commit 58d34023b7
6 changed files with 147 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Forms/EditSelectedUser.Designer.cs
Generated
+16
View File
@@ -44,6 +44,8 @@ namespace TBF.Forms
this.checkedListBoxGroups = new System.Windows.Forms.CheckedListBox();
this.groupsLabel = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.repeatPasswordLabel = new System.Windows.Forms.Label();
this.txtRepeatPassword = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// txtName
@@ -109,10 +111,22 @@ namespace TBF.Forms
resources.ApplyResources(this.groupsLabel, "groupsLabel");
this.groupsLabel.Name = "groupsLabel";
//
// repeatPasswordLabel
//
resources.ApplyResources(this.repeatPasswordLabel, "repeatPasswordLabel");
this.repeatPasswordLabel.Name = "repeatPasswordLabel";
//
// txtRepeatPassword
//
resources.ApplyResources(this.txtRepeatPassword, "txtRepeatPassword");
this.txtRepeatPassword.Name = "txtRepeatPassword";
//
// EditSelectedUser
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.repeatPasswordLabel);
this.Controls.Add(this.txtRepeatPassword);
this.Controls.Add(this.groupsLabel);
this.Controls.Add(this.checkedListBoxGroups);
this.Controls.Add(this.btnCancel);
@@ -144,5 +158,7 @@ namespace TBF.Forms
private System.Windows.Forms.CheckedListBox checkedListBoxGroups;
private System.Windows.Forms.Label groupsLabel;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.Label repeatPasswordLabel;
private System.Windows.Forms.TextBox txtRepeatPassword;
}
}
TestBenchFramework/Forms/EditSelectedUser.cs
+15 -5
View File
@@ -30,6 +30,7 @@ namespace TBF.Forms
txtName.Text = CurrentEditUser.UserName;
txtDescription.Text = CurrentEditUser.FullName;
txtPassword.Text = "";
txtRepeatPassword.Text = "";
ShowGroups();
}
@@ -38,6 +39,7 @@ namespace TBF.Forms
Text = Strings.Edit_User;
nameLabel.Text = Strings.Name;
passwordLabel.Text = Strings.Password;
repeatPasswordLabel.Text = Strings.Repeat_password;
descriptionLabel.Text = Strings.DescriptionColHdr;
groupsLabel.Text = Strings.Groups;
btnOk.Text = Strings.OkBtnText;
@@ -79,12 +81,20 @@ namespace TBF.Forms
}
CurrentEditUser.UserName = txtName.Text;
if (txtPassword.Text != "")
{
if (txtPassword.Text != txtRepeatPassword.Text)
{
MessageBox.Show(Strings.Passwords_different);
return false;
}
else
{
CurrentEditUser.SetPassword(txtPassword.Text);
}
}
if (txtPassword.Text != "")
{
CurrentEditUser.SetPassword(txtPassword.Text);
}
CurrentEditUser.UserName = txtName.Text;
CurrentEditUser.FullName = txtDescription.Text;
// Groups
TestBenchFramework/Forms/EditSelectedUser.resx
+86 -31
View File
@@ -119,14 +119,14 @@
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="txtName.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 9</value>
<value>137, 9</value>
</data>
<data name="txtName.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 20</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtName.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>1</value>
</data>
<data name="&gt;&gt;txtName.Name" xml:space="preserve">
<value>txtName</value>
@@ -138,7 +138,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtName.ZOrder" xml:space="preserve">
<value>9</value>
<value>11</value>
</data>
<data name="nameLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -150,7 +150,7 @@
<value>35, 13</value>
</data>
<data name="nameLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>0</value>
</data>
<data name="nameLabel.Text" xml:space="preserve">
<value>Name</value>
@@ -165,16 +165,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;nameLabel.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 252</value>
<value>137, 270</value>
</data>
<data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
<value>84, 40</value>
</data>
<data name="btnOk.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>10</value>
</data>
<data name="btnOk.Text" xml:space="preserve">
<value>OK</value>
@@ -189,16 +189,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 252</value>
<value>253, 270</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
<value>84, 40</value>
</data>
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>11</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Cancel</value>
@@ -213,10 +213,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="txtPassword.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 40</value>
<value>137, 40</value>
</data>
<data name="txtPassword.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
<value>*</value>
@@ -225,7 +225,7 @@
<value>200, 20</value>
</data>
<data name="txtPassword.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>3</value>
</data>
<data name="&gt;&gt;txtPassword.Name" xml:space="preserve">
<value>txtPassword</value>
@@ -237,7 +237,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtPassword.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="passwordLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -249,7 +249,7 @@
<value>53, 13</value>
</data>
<data name="passwordLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>2</value>
</data>
<data name="passwordLabel.Text" xml:space="preserve">
<value>Password</value>
@@ -264,10 +264,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;passwordLabel.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="txtDescription.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 70</value>
<value>137, 99</value>
</data>
<data name="txtDescription.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
@@ -276,7 +276,7 @@
<value>200, 59</value>
</data>
<data name="txtDescription.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>7</value>
</data>
<data name="&gt;&gt;txtDescription.Name" xml:space="preserve">
<value>txtDescription</value>
@@ -288,19 +288,19 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtDescription.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="descriptionLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="descriptionLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 73</value>
<value>9, 102</value>
</data>
<data name="descriptionLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="descriptionLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>6</value>
</data>
<data name="descriptionLabel.Text" xml:space="preserve">
<value>Description</value>
@@ -315,16 +315,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;descriptionLabel.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="checkedListBoxGroups.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 135</value>
<value>137, 164</value>
</data>
<data name="checkedListBoxGroups.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 94</value>
</data>
<data name="checkedListBoxGroups.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>9</value>
</data>
<data name="&gt;&gt;checkedListBoxGroups.Name" xml:space="preserve">
<value>checkedListBoxGroups</value>
@@ -336,19 +336,19 @@
<value>$this</value>
</data>
<data name="&gt;&gt;checkedListBoxGroups.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="groupsLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="groupsLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 135</value>
<value>9, 164</value>
</data>
<data name="groupsLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>41, 13</value>
</data>
<data name="groupsLabel.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>8</value>
</data>
<data name="groupsLabel.Text" xml:space="preserve">
<value>Groups</value>
@@ -363,11 +363,66 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupsLabel.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="repeatPasswordLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="repeatPasswordLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="repeatPasswordLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 69</value>
</data>
<data name="repeatPasswordLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>90, 13</value>
</data>
<data name="repeatPasswordLabel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="repeatPasswordLabel.Text" xml:space="preserve">
<value>Repeat password</value>
</data>
<data name="&gt;&gt;repeatPasswordLabel.Name" xml:space="preserve">
<value>repeatPasswordLabel</value>
</data>
<data name="&gt;&gt;repeatPasswordLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;repeatPasswordLabel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;repeatPasswordLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtRepeatPassword.Location" type="System.Drawing.Point, System.Drawing">
<value>137, 66</value>
</data>
<data name="txtRepeatPassword.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
<value>*</value>
</data>
<data name="txtRepeatPassword.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 20</value>
</data>
<data name="txtRepeatPassword.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;txtRepeatPassword.Name" xml:space="preserve">
<value>txtRepeatPassword</value>
</data>
<data name="&gt;&gt;txtRepeatPassword.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtRepeatPassword.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;txtRepeatPassword.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -375,7 +430,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>318, 287</value>
<value>375, 319</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Edit User</value>
TestBenchFramework/Resources/Strings.Designer.cs
Generated
+18
View File
@@ -2463,6 +2463,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Fields &apos;Password&apos; and &apos;Repeat password&apos; are different. Retype them please..
/// </summary>
internal static string Passwords_different {
get {
return ResourceManager.GetString("Passwords_different", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Paths.
/// </summary>
@@ -3246,6 +3255,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Repeat password.
/// </summary>
internal static string Repeat_password {
get {
return ResourceManager.GetString("Repeat_password", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Repeats nr..
/// </summary>
TestBenchFramework/Resources/Strings.de.resx
+6
View File
@@ -1407,4 +1407,10 @@
<data name="Test_volume_exceeds_the_scale_capacity" xml:space="preserve">
<value>Prüfpunktvolumen uberschritt Behalter</value>
</data>
<data name="Repeat_password" xml:space="preserve">
<value>Passwort wiederholen</value>
</data>
<data name="Passwords_different" xml:space="preserve">
<value>Felder 'Password' und 'Passwort wiederholen' sind anders, wiederholen sie bitte.</value>
</data>
</root>
TestBenchFramework/Resources/Strings.resx
+6
View File
@@ -1684,4 +1684,10 @@
<data name="Test_volume_exceeds_the_scale_capacity" xml:space="preserve">
<value>Test volume exceeds the scale capacity</value>
</data>
<data name="Repeat_password" xml:space="preserve">
<value>Repeat password</value>
</data>
<data name="Passwords_different" xml:space="preserve">
<value>Fields 'Password' and 'Repeat password' are different. Retype them please.</value>
</data>
</root>