diff --git a/Config/DatabaseSettings.cs b/Config/DatabaseSettings.cs index ea93aeb5e..9575b4dcc 100644 --- a/Config/DatabaseSettings.cs +++ b/Config/DatabaseSettings.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Text; @@ -17,14 +17,16 @@ namespace Config public bool IsRealBench; public DBSettings ProceduresDBSettings; /// Config database settings public DBSettings WaterMetersDBSettings; /// Results database settings + public DBSettings UsersDBSettings; /// Users database settings // Constructor public DatabaseSettings() { - BenchName = String.Empty; /// Empty string to avoid null + BenchName = String.Empty; /// Empty string (avoid null) IsRealBench = false; - ProceduresDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf_procedures; UID=root; PASSWORD=;"); - WaterMetersDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf_watermeters; UID=root; PASSWORD=;"); + ProceduresDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf; UID=root; PASSWORD=;"); + WaterMetersDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf-r; UID=root; PASSWORD=;"); + UsersDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf-u; UID=root; PASSWORD=;"); } public object Clone() @@ -33,15 +35,20 @@ namespace Config result.BenchName = BenchName; result.IsRealBench = IsRealBench; - result.ProceduresDBSettings = (DBSettings)ProceduresDBSettings.Clone(); + result.ProceduresDBSettings = (DBSettings)ProceduresDBSettings.Clone(); result.WaterMetersDBSettings = (DBSettings)WaterMetersDBSettings.Clone(); + result.UsersDBSettings = (DBSettings)ProceduresDBSettings.Clone(); return result; } public override string ToString() { - return string.Format("{0} conn.str.={1}", BenchName, ProceduresDBSettings.ConnectionString); + return string.Format("{0} config={1} results={2} users={3}", + BenchName, + ProceduresDBSettings.ConnectionString, + WaterMetersDBSettings.ConnectionString, + UsersDBSettings.ConnectionString); } } } diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs b/TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs index cacf230f8..ad78a78be 100644 --- a/TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs +++ b/TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs @@ -31,160 +31,202 @@ namespace TBF.Forms /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DatabaseSettingsDlg)); - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.benchNameTextBox = new System.Windows.Forms.TextBox(); - this.connectionStringLabel = new System.Windows.Forms.Label(); - this.configDbConnectionStringTextBox = new System.Windows.Forms.TextBox(); - this.resultsDbConnectionStringTextBox = new System.Windows.Forms.TextBox(); - this.configLabel = new System.Windows.Forms.Label(); - this.resultsLabel = new System.Windows.Forms.Label(); - this.realBenchCheckBox = new System.Windows.Forms.CheckBox(); - this.dbTypeLabel = new System.Windows.Forms.Label(); - this.configDbTypeComboBox = new System.Windows.Forms.ComboBox(); - this.resultsDbTypeComboBox = new System.Windows.Forms.ComboBox(); - this.testConnConfigDbBtn = new System.Windows.Forms.Button(); - this.testConnResultsDbBtn = new System.Windows.Forms.Button(); - this.createConfigDbBtn = new System.Windows.Forms.Button(); - this.createResultsDbBtn = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - resources.ApplyResources(this.okButton, "okButton"); - this.okButton.Name = "okButton"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // cancelButton - // - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.cancelButton, "cancelButton"); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.UseVisualStyleBackColor = true; - this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // benchNameTextBox - // - resources.ApplyResources(this.benchNameTextBox, "benchNameTextBox"); - this.benchNameTextBox.Name = "benchNameTextBox"; - // - // connectionStringLabel - // - resources.ApplyResources(this.connectionStringLabel, "connectionStringLabel"); - this.connectionStringLabel.Name = "connectionStringLabel"; - // - // configDbConnectionStringTextBox - // - resources.ApplyResources(this.configDbConnectionStringTextBox, "configDbConnectionStringTextBox"); - this.configDbConnectionStringTextBox.Name = "configDbConnectionStringTextBox"; - // - // resultsDbConnectionStringTextBox - // - resources.ApplyResources(this.resultsDbConnectionStringTextBox, "resultsDbConnectionStringTextBox"); - this.resultsDbConnectionStringTextBox.Name = "resultsDbConnectionStringTextBox"; - // - // label4 - // - resources.ApplyResources(this.configLabel, "label4"); - this.configLabel.Name = "label4"; - // - // label6 - // - resources.ApplyResources(this.resultsLabel, "label6"); - this.resultsLabel.Name = "label6"; - // - // realBenchCheckBox - // - resources.ApplyResources(this.realBenchCheckBox, "realBenchCheckBox"); - this.realBenchCheckBox.Name = "realBenchCheckBox"; - this.realBenchCheckBox.UseVisualStyleBackColor = true; - // - // dbTypeLabel - // - resources.ApplyResources(this.dbTypeLabel, "dbTypeLabel"); - this.dbTypeLabel.Name = "dbTypeLabel"; - // - // configDbTypeComboBox - // - this.configDbTypeComboBox.FormattingEnabled = true; - resources.ApplyResources(this.configDbTypeComboBox, "configDbTypeComboBox"); - this.configDbTypeComboBox.Name = "configDbTypeComboBox"; - // - // resultsDbTypeComboBox - // - this.resultsDbTypeComboBox.FormattingEnabled = true; - resources.ApplyResources(this.resultsDbTypeComboBox, "resultsDbTypeComboBox"); - this.resultsDbTypeComboBox.Name = "resultsDbTypeComboBox"; - // - // testConnConfigDbBtn - // - this.testConnConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.testConnConfigDbBtn, "testConnConfigDbBtn"); - this.testConnConfigDbBtn.Name = "testConnConfigDbBtn"; - this.testConnConfigDbBtn.UseVisualStyleBackColor = true; - this.testConnConfigDbBtn.Click += new System.EventHandler(this.testConnConfigDbBtn_Click); - // - // testConnResultsDbBtn - // - this.testConnResultsDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.testConnResultsDbBtn, "testConnResultsDbBtn"); - this.testConnResultsDbBtn.Name = "testConnResultsDbBtn"; - this.testConnResultsDbBtn.UseVisualStyleBackColor = true; - this.testConnResultsDbBtn.Click += new System.EventHandler(this.testConnResultsDbBtn_Click); - // - // createConfigDbBtn - // - this.createConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.createConfigDbBtn, "createConfigDbBtn"); - this.createConfigDbBtn.Name = "createConfigDbBtn"; - this.createConfigDbBtn.UseVisualStyleBackColor = true; - this.createConfigDbBtn.Click += new System.EventHandler(this.createConfigDbBtn_Click); - // - // createResultsDbBtn - // - this.createResultsDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.createResultsDbBtn, "createResultsDbBtn"); - this.createResultsDbBtn.Name = "createResultsDbBtn"; - this.createResultsDbBtn.UseVisualStyleBackColor = true; - this.createResultsDbBtn.Click += new System.EventHandler(this.createResultsDbBtn_Click); - // - // DatabaseSettingsDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.createResultsDbBtn); - this.Controls.Add(this.createConfigDbBtn); - this.Controls.Add(this.testConnResultsDbBtn); - this.Controls.Add(this.testConnConfigDbBtn); - this.Controls.Add(this.resultsDbTypeComboBox); - this.Controls.Add(this.configDbTypeComboBox); - this.Controls.Add(this.dbTypeLabel); - this.Controls.Add(this.realBenchCheckBox); - this.Controls.Add(this.resultsLabel); - this.Controls.Add(this.configLabel); - this.Controls.Add(this.resultsDbConnectionStringTextBox); - this.Controls.Add(this.configDbConnectionStringTextBox); - this.Controls.Add(this.connectionStringLabel); - this.Controls.Add(this.benchNameTextBox); - this.Controls.Add(this.label1); - this.Controls.Add(this.okButton); - this.Controls.Add(this.cancelButton); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MinimizeBox = false; - this.Name = "DatabaseSettingsDlg"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Load += new System.EventHandler(this.BenchSettingsDlg_Load); - this.ResumeLayout(false); - this.PerformLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DatabaseSettingsDlg)); + this.okButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.benchNameTextBox = new System.Windows.Forms.TextBox(); + this.connectionStringLabel = new System.Windows.Forms.Label(); + this.configDbConnectionStringTextBox = new System.Windows.Forms.TextBox(); + this.resultsDbConnectionStringTextBox = new System.Windows.Forms.TextBox(); + this.configLabel = new System.Windows.Forms.Label(); + this.resultsLabel = new System.Windows.Forms.Label(); + this.realBenchCheckBox = new System.Windows.Forms.CheckBox(); + this.dbTypeLabel = new System.Windows.Forms.Label(); + this.configDbTypeComboBox = new System.Windows.Forms.ComboBox(); + this.resultsDbTypeComboBox = new System.Windows.Forms.ComboBox(); + this.testConnConfigDbBtn = new System.Windows.Forms.Button(); + this.testConnResultsDbBtn = new System.Windows.Forms.Button(); + this.createConfigDbBtn = new System.Windows.Forms.Button(); + this.createResultsDbBtn = new System.Windows.Forms.Button(); + this.createUsersDbBtn = new System.Windows.Forms.Button(); + this.testConnUsersDbBtn = new System.Windows.Forms.Button(); + this.usersDbTypeComboBox = new System.Windows.Forms.ComboBox(); + this.usersLabel = new System.Windows.Forms.Label(); + this.usersDbConnectionStringTextBox = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // okButton + // + this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + resources.ApplyResources(this.okButton, "okButton"); + this.okButton.Name = "okButton"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // cancelButton + // + this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.cancelButton, "cancelButton"); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.UseVisualStyleBackColor = true; + this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // benchNameTextBox + // + resources.ApplyResources(this.benchNameTextBox, "benchNameTextBox"); + this.benchNameTextBox.Name = "benchNameTextBox"; + // + // connectionStringLabel + // + resources.ApplyResources(this.connectionStringLabel, "connectionStringLabel"); + this.connectionStringLabel.Name = "connectionStringLabel"; + // + // configDbConnectionStringTextBox + // + resources.ApplyResources(this.configDbConnectionStringTextBox, "configDbConnectionStringTextBox"); + this.configDbConnectionStringTextBox.Name = "configDbConnectionStringTextBox"; + // + // resultsDbConnectionStringTextBox + // + resources.ApplyResources(this.resultsDbConnectionStringTextBox, "resultsDbConnectionStringTextBox"); + this.resultsDbConnectionStringTextBox.Name = "resultsDbConnectionStringTextBox"; + // + // configLabel + // + resources.ApplyResources(this.configLabel, "configLabel"); + this.configLabel.Name = "configLabel"; + // + // resultsLabel + // + resources.ApplyResources(this.resultsLabel, "resultsLabel"); + this.resultsLabel.Name = "resultsLabel"; + // + // realBenchCheckBox + // + resources.ApplyResources(this.realBenchCheckBox, "realBenchCheckBox"); + this.realBenchCheckBox.Name = "realBenchCheckBox"; + this.realBenchCheckBox.UseVisualStyleBackColor = true; + // + // dbTypeLabel + // + resources.ApplyResources(this.dbTypeLabel, "dbTypeLabel"); + this.dbTypeLabel.Name = "dbTypeLabel"; + // + // configDbTypeComboBox + // + this.configDbTypeComboBox.FormattingEnabled = true; + resources.ApplyResources(this.configDbTypeComboBox, "configDbTypeComboBox"); + this.configDbTypeComboBox.Name = "configDbTypeComboBox"; + // + // resultsDbTypeComboBox + // + this.resultsDbTypeComboBox.FormattingEnabled = true; + resources.ApplyResources(this.resultsDbTypeComboBox, "resultsDbTypeComboBox"); + this.resultsDbTypeComboBox.Name = "resultsDbTypeComboBox"; + // + // testConnConfigDbBtn + // + this.testConnConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.testConnConfigDbBtn, "testConnConfigDbBtn"); + this.testConnConfigDbBtn.Name = "testConnConfigDbBtn"; + this.testConnConfigDbBtn.UseVisualStyleBackColor = true; + this.testConnConfigDbBtn.Click += new System.EventHandler(this.testConnConfigDbBtn_Click); + // + // testConnResultsDbBtn + // + this.testConnResultsDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.testConnResultsDbBtn, "testConnResultsDbBtn"); + this.testConnResultsDbBtn.Name = "testConnResultsDbBtn"; + this.testConnResultsDbBtn.UseVisualStyleBackColor = true; + this.testConnResultsDbBtn.Click += new System.EventHandler(this.testConnResultsDbBtn_Click); + // + // createConfigDbBtn + // + this.createConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.createConfigDbBtn, "createConfigDbBtn"); + this.createConfigDbBtn.Name = "createConfigDbBtn"; + this.createConfigDbBtn.UseVisualStyleBackColor = true; + this.createConfigDbBtn.Click += new System.EventHandler(this.createConfigDbBtn_Click); + // + // createResultsDbBtn + // + this.createResultsDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.createResultsDbBtn, "createResultsDbBtn"); + this.createResultsDbBtn.Name = "createResultsDbBtn"; + this.createResultsDbBtn.UseVisualStyleBackColor = true; + this.createResultsDbBtn.Click += new System.EventHandler(this.createResultsDbBtn_Click); + // + // createUsersDbBtn + // + this.createUsersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.createUsersDbBtn, "createUsersDbBtn"); + this.createUsersDbBtn.Name = "createUsersDbBtn"; + this.createUsersDbBtn.UseVisualStyleBackColor = true; + this.createUsersDbBtn.Click += new System.EventHandler(this.createUsersDbBtn_Click); + // + // testConnUsersDbBtn + // + this.testConnUsersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.testConnUsersDbBtn, "testConnUsersDbBtn"); + this.testConnUsersDbBtn.Name = "testConnUsersDbBtn"; + this.testConnUsersDbBtn.UseVisualStyleBackColor = true; + this.testConnUsersDbBtn.Click += new System.EventHandler(this.testConnUsersDbBtn_Click); + // + // usersDbTypeComboBox + // + this.usersDbTypeComboBox.FormattingEnabled = true; + resources.ApplyResources(this.usersDbTypeComboBox, "usersDbTypeComboBox"); + this.usersDbTypeComboBox.Name = "usersDbTypeComboBox"; + // + // usersLabel + // + resources.ApplyResources(this.usersLabel, "usersLabel"); + this.usersLabel.Name = "usersLabel"; + // + // usersDbConnectionStringTextBox + // + resources.ApplyResources(this.usersDbConnectionStringTextBox, "usersDbConnectionStringTextBox"); + this.usersDbConnectionStringTextBox.Name = "usersDbConnectionStringTextBox"; + // + // DatabaseSettingsDlg + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.createUsersDbBtn); + this.Controls.Add(this.testConnUsersDbBtn); + this.Controls.Add(this.usersDbTypeComboBox); + this.Controls.Add(this.usersLabel); + this.Controls.Add(this.usersDbConnectionStringTextBox); + this.Controls.Add(this.createResultsDbBtn); + this.Controls.Add(this.createConfigDbBtn); + this.Controls.Add(this.testConnResultsDbBtn); + this.Controls.Add(this.testConnConfigDbBtn); + this.Controls.Add(this.resultsDbTypeComboBox); + this.Controls.Add(this.configDbTypeComboBox); + this.Controls.Add(this.dbTypeLabel); + this.Controls.Add(this.realBenchCheckBox); + this.Controls.Add(this.resultsLabel); + this.Controls.Add(this.configLabel); + this.Controls.Add(this.resultsDbConnectionStringTextBox); + this.Controls.Add(this.configDbConnectionStringTextBox); + this.Controls.Add(this.connectionStringLabel); + this.Controls.Add(this.benchNameTextBox); + this.Controls.Add(this.label1); + this.Controls.Add(this.okButton); + this.Controls.Add(this.cancelButton); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MinimizeBox = false; + this.Name = "DatabaseSettingsDlg"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Load += new System.EventHandler(this.BenchSettingsDlg_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -207,5 +249,10 @@ namespace TBF.Forms private System.Windows.Forms.Button testConnResultsDbBtn; private System.Windows.Forms.Button createConfigDbBtn; private System.Windows.Forms.Button createResultsDbBtn; + private System.Windows.Forms.Button createUsersDbBtn; + private System.Windows.Forms.Button testConnUsersDbBtn; + private System.Windows.Forms.ComboBox usersDbTypeComboBox; + private System.Windows.Forms.Label usersLabel; + private System.Windows.Forms.TextBox usersDbConnectionStringTextBox; } } \ No newline at end of file diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.cs b/TestBenchFramework/Forms/DatabaseSettingsDlg.cs index e535a80f0..2b62bcfdd 100644 --- a/TestBenchFramework/Forms/DatabaseSettingsDlg.cs +++ b/TestBenchFramework/Forms/DatabaseSettingsDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Windows.Forms; @@ -33,17 +33,22 @@ namespace TBF.Forms realBenchCheckBox.Text = Strings.Test_bench_is_controlled_by_this_computer; dbTypeLabel.Text = Strings.Database_type; connectionStringLabel.Text = Strings.Connection_string; - configLabel.Text = Strings.Configuration; - resultsLabel.Text = Strings.Results; - okButton.Text = Strings.OkBtnText; - cancelButton.Text = Strings.CancelBtnText; + + configLabel.Text = Strings.Configuration; + resultsLabel.Text = Strings.Results; + usersLabel.Text = Strings.Users; testConnConfigDbBtn.Text = Strings.Test_connection; testConnResultsDbBtn.Text = Strings.Test_connection; + testConnUsersDbBtn.Text = Strings.Test_connection; createConfigDbBtn.Text = Strings.Create_DB; createResultsDbBtn.Text = Strings.Create_DB; - } + createUsersDbBtn.Text = Strings.Create_DB; + + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; + } private void BenchSettingsDlg_Load(object sender, EventArgs e) { @@ -171,6 +176,35 @@ namespace TBF.Forms } } + private void createUsersDbBtn_Click(object sender, EventArgs e) + { + if (!UpdateBenchFromUIControls()) return; + + if (DialogResult.OK == MessageBox.Show(Strings.DB_will_be_overwritten + Environment.NewLine + + Strings.Do_you_want_to_proceed, Strings.Warning, + MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation)) + try + { + Cursor.Current = Cursors.WaitCursor; + Users.DB.DbType = bench.WaterMetersDBSettings.DbType; + Users.DB.ConnectionString = bench.WaterMetersDBSettings.ConnectionString; + Users.DB.CreateEmptyDB(); + MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification); + Cursor.Current = Cursors.Default; + DialogResult = DialogResult.None; + } + catch (Exception exception) + { + Cursor.Current = Cursors.Default; + string msg = Strings.Error_while_creating_DB_Reason + Environment.NewLine + exception.Message; + if (exception.InnerException != null) + { + msg += Environment.NewLine + exception.InnerException.Message; + } + MessageBox.Show(msg, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void testConnConfigDbBtn_Click(object sender, EventArgs e) { } @@ -178,5 +212,10 @@ namespace TBF.Forms private void testConnResultsDbBtn_Click(object sender, EventArgs e) { } + + private void testConnUsersDbBtn_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.resx b/TestBenchFramework/Forms/DatabaseSettingsDlg.resx index 2aa06ff38..17640030d 100644 --- a/TestBenchFramework/Forms/DatabaseSettingsDlg.resx +++ b/TestBenchFramework/Forms/DatabaseSettingsDlg.resx @@ -141,7 +141,7 @@ $this - 15 + 20 614, 49 @@ -165,7 +165,7 @@ $this - 16 + 21 True @@ -192,7 +192,7 @@ $this - 14 + 19 116, 15 @@ -213,7 +213,7 @@ $this - 13 + 18 True @@ -240,7 +240,7 @@ $this - 12 + 17 202, 107 @@ -261,7 +261,7 @@ $this - 11 + 16 202, 137 @@ -282,61 +282,61 @@ $this - 10 + 15 - + True - + 12, 110 - + 69, 13 - + 49 - + Configuration - - label4 + + configLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 9 + + 14 - + True - + 12, 140 - + 42, 13 - + 51 - + Results - - label6 + + resultsLabel - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 8 + + 13 True @@ -363,7 +363,7 @@ $this - 7 + 12 True @@ -390,7 +390,7 @@ $this - 6 + 11 116, 107 @@ -411,7 +411,7 @@ $this - 5 + 10 116, 137 @@ -432,7 +432,7 @@ $this - 4 + 9 @@ -460,7 +460,7 @@ $this - 3 + 8 NoControl @@ -487,7 +487,7 @@ $this - 2 + 7 NoControl @@ -514,7 +514,7 @@ $this - 1 + 6 NoControl @@ -541,8 +541,134 @@ $this + 5 + + + NoControl + + + 715, 164 + + + 124, 23 + + + 73 + + + Create DB + + + createUsersDbBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 + + NoControl + + + 614, 165 + + + 95, 23 + + + 72 + + + Test Connection + + + testConnUsersDbBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 116, 167 + + + 80, 21 + + + 71 + + + usersDbTypeComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + NoControl + + + 12, 170 + + + 34, 13 + + + 70 + + + Users + + + usersLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 202, 167 + + + 406, 20 + + + 69 + + + usersDbConnectionStringTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + True @@ -550,7 +676,7 @@ 6, 13 - 853, 172 + 853, 202 CenterParent diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 4704e0006..3c7a6baef 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -4347,6 +4347,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Users. + /// + internal static string Users { + get { + return ResourceManager.GetString("Users", resourceCulture); + } + } + /// /// Looks up a localized string similar to Users and groups. /// diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 7f275d784..a4453473b 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1615,4 +1615,7 @@ Method {0} cannot be used + + Users + \ No newline at end of file