From 721bfdf5c808f694359aeea3a895290398e07b51 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 15 Mar 2017 13:52:44 +0100 Subject: [PATCH] Users.Forms.EditUsers --> Users.Forms.UserManagementDlg --- TestBenchFramework/MainWnd.cs | 2 +- UserManagement/Program.cs | 2 +- .../{EditUsers.cs => UserManagementDlg.cs} | 17 +-- ...igner.cs => UserManagementDlg.designer.cs} | 60 +++++---- ...{EditUsers.resx => UserManagementDlg.resx} | 127 +++++++++++------- Users/Users.csproj | 10 +- 6 files changed, 132 insertions(+), 86 deletions(-) rename Users/Forms/{EditUsers.cs => UserManagementDlg.cs} (90%) rename Users/Forms/{EditUsers.Designer.cs => UserManagementDlg.designer.cs} (71%) rename Users/Forms/{EditUsers.resx => UserManagementDlg.resx} (78%) diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 8b24cc978..6668a5eff 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -378,7 +378,7 @@ namespace TBF private void proceduresTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new ProceduresDlg().ShowDialog(); Cursor = Cursors.Default; } private void localSettingsTSMItem_Click(object s, EventArgs e) { new PreferencesDlg().ShowDialog(); } private void databaseSettingsTSMItem_Click(object s, EventArgs e) { new BenchesDlg().ShowDialog(); } - private void usersTSMItem_Click(object s, EventArgs e) { new Users.Forms.EditUsers().ShowDialog(); } + private void usersTSMItem_Click(object s, EventArgs e) { new Users.Forms.UserManagementDlg().ShowDialog(); } private void aboutTSMItem_Click(object s, EventArgs e) { new Forms.AboutDlg().ShowDialog(); } /// diff --git a/UserManagement/Program.cs b/UserManagement/Program.cs index 36e33855d..77dd22867 100644 --- a/UserManagement/Program.cs +++ b/UserManagement/Program.cs @@ -16,7 +16,7 @@ namespace UserManagement { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Users.Forms.EditUsers()); + Application.Run(new Users.Forms.UserManagementDlg()); } } } diff --git a/Users/Forms/EditUsers.cs b/Users/Forms/UserManagementDlg.cs similarity index 90% rename from Users/Forms/EditUsers.cs rename to Users/Forms/UserManagementDlg.cs index 6cfe8e205..538cff66b 100644 --- a/Users/Forms/EditUsers.cs +++ b/Users/Forms/UserManagementDlg.cs @@ -11,13 +11,13 @@ using Users.Resources; namespace Users.Forms { - public partial class EditUsers: Form + public partial class UserManagementDlg: Form { NHibernate.ISession session; IList ListOfUsers; int LastSelectedIndex; - public EditUsers() + public UserManagementDlg() { InitializeComponent(); } @@ -29,8 +29,10 @@ namespace Users.Forms btnEdit.Text = Strings.EditBtnText; btnDelete.Text = Strings.RemoveBtnText; btnOk.Text = Strings.OkBtnText; - columnHeader1.Text = Strings.Name; - columnHeader2.Text = Strings.ID; + + listViewUsers.Columns.Add(Strings.User_name, 120); + listViewUsers.Columns.Add(Strings.User_code, 80); + listViewUsers.Columns.Add(Strings.Full_name, 250); } private void EditUsers_Activated(object sender, EventArgs e) @@ -60,8 +62,9 @@ namespace Users.Forms foreach (var person in ListOfUsers) { ListViewItem item = new ListViewItem(person.UserName); - item.SubItems.Add(person.Id.ToString()); - item.Tag = person; + item.SubItems.Add(person.Number.ToString()); + item.SubItems.Add(person.FullName); + item.Tag = person; this.listViewUsers.Items.Add(item); } this.listViewUsers.Refresh(); @@ -126,5 +129,3 @@ namespace Users.Forms } } } - - diff --git a/Users/Forms/EditUsers.Designer.cs b/Users/Forms/UserManagementDlg.designer.cs similarity index 71% rename from Users/Forms/EditUsers.Designer.cs rename to Users/Forms/UserManagementDlg.designer.cs index 4a1a35a7b..3ab30681d 100644 --- a/Users/Forms/EditUsers.Designer.cs +++ b/Users/Forms/UserManagementDlg.designer.cs @@ -3,7 +3,7 @@ /// namespace Users.Forms { - partial class EditUsers + partial class UserManagementDlg { /// /// Required designer variable. @@ -31,24 +31,24 @@ namespace Users.Forms /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditUsers)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserManagementDlg)); this.listViewUsers = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.btnAdd = new System.Windows.Forms.Button(); this.btnEdit = new System.Windows.Forms.Button(); this.btnDelete = new System.Windows.Forms.Button(); this.btnOk = new System.Windows.Forms.Button(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); this.SuspendLayout(); // // listViewUsers // - this.listViewUsers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1, - this.columnHeader2}); - this.listViewUsers.FullRowSelect = true; resources.ApplyResources(this.listViewUsers, "listViewUsers"); + this.listViewUsers.FullRowSelect = true; this.listViewUsers.MultiSelect = false; this.listViewUsers.Name = "listViewUsers"; this.listViewUsers.UseCompatibleStateImageBehavior = false; @@ -56,14 +56,6 @@ namespace Users.Forms this.listViewUsers.SelectedIndexChanged += new System.EventHandler(this.listViewUsers_SelectedIndexChanged); this.listViewUsers.DoubleClick += new System.EventHandler(this.listViewUsers_DoubleClick); // - // columnHeader1 - // - resources.ApplyResources(this.columnHeader1, "columnHeader1"); - // - // columnHeader2 - // - resources.ApplyResources(this.columnHeader2, "columnHeader2"); - // // btnAdd // resources.ApplyResources(this.btnAdd, "btnAdd"); @@ -97,19 +89,36 @@ namespace Users.Forms resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; // - // EditUsers + // splitContainer1 + // + resources.ApplyResources(this.splitContainer1, "splitContainer1"); + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.listViewUsers); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.btnAdd); + this.splitContainer1.Panel2.Controls.Add(this.btnEdit); + this.splitContainer1.Panel2.Controls.Add(this.btnOk); + this.splitContainer1.Panel2.Controls.Add(this.btnDelete); + // + // UserManagementDlg // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainer1); this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.btnOk); - this.Controls.Add(this.btnDelete); - this.Controls.Add(this.btnEdit); - this.Controls.Add(this.btnAdd); - this.Controls.Add(this.listViewUsers); - this.Name = "EditUsers"; + this.Name = "UserManagementDlg"; this.Activated += new System.EventHandler(this.EditUsers_Activated); this.Load += new System.EventHandler(this.EditUsers_Load); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -122,8 +131,7 @@ namespace Users.Forms private System.Windows.Forms.Button btnEdit; private System.Windows.Forms.Button btnDelete; private System.Windows.Forms.Button btnOk; - private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ColumnHeader columnHeader1; - private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.SplitContainer splitContainer1; } } \ No newline at end of file diff --git a/Users/Forms/EditUsers.resx b/Users/Forms/UserManagementDlg.resx similarity index 78% rename from Users/Forms/EditUsers.resx rename to Users/Forms/UserManagementDlg.resx index a6e7b7768..2ed939a43 100644 --- a/Users/Forms/EditUsers.resx +++ b/Users/Forms/UserManagementDlg.resx @@ -117,12 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + - 12, 12 + 0, 0 - 357, 399 + 480, 502 @@ -135,25 +139,16 @@ System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + splitContainer1.Panel1 - 5 - - - Name - - - 162 - - - ID + 0 - 388, 42 + 23, 84 - 75, 23 + 85, 40 1 @@ -168,16 +163,16 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + splitContainer1.Panel2 - 4 + 0 - 388, 71 + 23, 129 - 75, 23 + 85, 40 1 @@ -192,16 +187,16 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + splitContainer1.Panel2 - 3 + 1 - 388, 100 + 23, 174 - 75, 23 + 85, 40 1 @@ -216,16 +211,16 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + splitContainer1.Panel2 - 2 + 3 - 388, 388 + 23, 18 - 75, 23 + 85, 40 1 @@ -240,19 +235,19 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + splitContainer1.Panel2 - 1 + 2 17, 17 - 0, 442 + 0, 502 - 475, 22 + 615, 22 2 @@ -270,6 +265,60 @@ $this + 1 + + + Fill + + + True + + + 0, 0 + + + splitContainer1.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 0 + + + splitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 1 + + + 615, 502 + + + 480 + + + 3 + + + splitContainer1 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -279,25 +328,13 @@ 6, 13 - 475, 464 + 615, 524 User Management - - columnHeader1 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - columnHeader2 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - EditUsers + UserManagementDlg System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Users/Users.csproj b/Users/Users.csproj index 824bd31fb..27030def8 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -66,11 +66,11 @@ EditSelectedUser.cs - + Form - - EditUsers.cs + + UserManagementDlg.cs Form @@ -98,8 +98,8 @@ EditSelectedUser.cs - - EditUsers.cs + + UserManagementDlg.cs LoginDlg.cs