diff --git a/Config/Utils.cs b/Config/Utils.cs index 8a60bdd87..a8840f40d 100644 --- a/Config/Utils.cs +++ b/Config/Utils.cs @@ -82,5 +82,53 @@ namespace Config else return "F5"; } } + + + /// + /// Extract and return a database name from a MySQL connection string. + /// + public static string GetDBName(string connectionString) + { + return GetFromConnectionString(connectionString, new string[] { "DATABASE=" }); + } + + /// + /// Extract and return a username from a MySQL connection string + /// + public static string GetDBUser(string connectionString) + { + return GetFromConnectionString(connectionString, new string[] { "USER=", "UID=" }); + } + + /// + /// Extract and return a password from a MySQL connection string + /// + public static string GetDBPassword(string connectionString) + { + return GetFromConnectionString(connectionString, new string[] { "PASSWORD=" }); + } + + /// + /// Extract and return an element of a MySQL connection string + /// (a host, a database, a user name or a password). + /// Return an empty string on any error. + /// + public static string GetFromConnectionString(string connectionString, string[] patterns) + { + foreach (var pattern in patterns) + { + int startIx = connectionString.IndexOf(pattern); + if (startIx >= 0) + { + /// pattern found, extract the subsequent element + startIx += pattern.Length; + int endIx = connectionString.IndexOf(';', startIx); + return (endIx > 0) ? connectionString.Substring(startIx, endIx - startIx) : string.Empty; + } + } + + /// pattern NOT found + return string.Empty; + } } } diff --git a/TBF/Forms/DatabaseSettingsDlg.Designer.cs b/TBF/Forms/DatabaseSettingsDlg.Designer.cs index ad78a78be..bae975c1c 100644 --- a/TBF/Forms/DatabaseSettingsDlg.Designer.cs +++ b/TBF/Forms/DatabaseSettingsDlg.Designer.cs @@ -49,25 +49,26 @@ namespace TBF.Forms 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.importResultsDbBtn = new System.Windows.Forms.Button(); + this.importConfigDbBtn = new System.Windows.Forms.Button(); this.SuspendLayout(); // // okButton // - this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; resources.ApplyResources(this.okButton, "okButton"); + this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; 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.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.Name = "cancelButton"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); @@ -132,48 +133,40 @@ namespace TBF.Forms // // testConnConfigDbBtn // - this.testConnConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; resources.ApplyResources(this.testConnConfigDbBtn, "testConnConfigDbBtn"); + this.testConnConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; 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.DialogResult = System.Windows.Forms.DialogResult.Cancel; 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.DialogResult = System.Windows.Forms.DialogResult.Cancel; 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.DialogResult = System.Windows.Forms.DialogResult.Cancel; 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.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.testConnUsersDbBtn.Name = "testConnUsersDbBtn"; this.testConnUsersDbBtn.UseVisualStyleBackColor = true; this.testConnUsersDbBtn.Click += new System.EventHandler(this.testConnUsersDbBtn_Click); @@ -194,11 +187,28 @@ namespace TBF.Forms resources.ApplyResources(this.usersDbConnectionStringTextBox, "usersDbConnectionStringTextBox"); this.usersDbConnectionStringTextBox.Name = "usersDbConnectionStringTextBox"; // + // importResultsDbBtn + // + resources.ApplyResources(this.importResultsDbBtn, "importResultsDbBtn"); + this.importResultsDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.importResultsDbBtn.Name = "importResultsDbBtn"; + this.importResultsDbBtn.UseVisualStyleBackColor = true; + this.importResultsDbBtn.Click += new System.EventHandler(this.importResultsDbBtn_Click); + // + // importConfigDbBtn + // + resources.ApplyResources(this.importConfigDbBtn, "importConfigDbBtn"); + this.importConfigDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.importConfigDbBtn.Name = "importConfigDbBtn"; + this.importConfigDbBtn.UseVisualStyleBackColor = true; + this.importConfigDbBtn.Click += new System.EventHandler(this.importConfigDbBtn_Click); + // // DatabaseSettingsDlg // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.createUsersDbBtn); + this.Controls.Add(this.importResultsDbBtn); + this.Controls.Add(this.importConfigDbBtn); this.Controls.Add(this.testConnUsersDbBtn); this.Controls.Add(this.usersDbTypeComboBox); this.Controls.Add(this.usersLabel); @@ -249,10 +259,11 @@ 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; + private System.Windows.Forms.Button importResultsDbBtn; + private System.Windows.Forms.Button importConfigDbBtn; } } \ No newline at end of file diff --git a/TBF/Forms/DatabaseSettingsDlg.cs b/TBF/Forms/DatabaseSettingsDlg.cs index b3a528b2e..f958f142f 100644 --- a/TBF/Forms/DatabaseSettingsDlg.cs +++ b/TBF/Forms/DatabaseSettingsDlg.cs @@ -1,8 +1,12 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Metering Systems /// using System; using System.Windows.Forms; +using System.Drawing; +using System.IO; +using System.Diagnostics; +using log4net; using TBF.Resources; namespace TBF.Forms @@ -12,6 +16,8 @@ namespace TBF.Forms /// public partial class DatabaseSettingsDlg : Form { + static readonly ILog log = LogManager.GetLogger(typeof(DatabaseSettingsDlg)); + // Reference to bench DB settins (not a local copy) Config.DatabaseSettings bench; @@ -44,7 +50,6 @@ namespace TBF.Forms createConfigDbBtn.Text = Strings.Create_DB; createResultsDbBtn.Text = Strings.Create_DB; - createUsersDbBtn.Text = Strings.Create_DB; okButton.Text = Strings.OkBtnText; cancelButton.Text = Strings.CancelBtnText; @@ -130,70 +135,61 @@ namespace TBF.Forms Close(); } + + private void testConnConfigDbBtn_Click(object sender, EventArgs e) + { + } + + private void testConnResultsDbBtn_Click(object sender, EventArgs e) + { + } + + private void testConnUsersDbBtn_Click(object sender, EventArgs e) + { + + } + + private void createConfigDbBtn_Click(object sender, EventArgs e) { + /// Update database connection strings 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; - Config.FluentCommon.CreateEmptyConfigDB(bench.ProceduresDBSettings.DbType, bench.ProceduresDBSettings.ConnectionString); - MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification); - Cursor.Current = Cursors.Default; - DialogResult = DialogResult.None; - } - catch (Exception exception) - { - Cursor.Current = Cursors.Default; - MessageBox.Show(Strings.Error_while_creating_DB_Reason + exception.Message, Strings.Error); + try + { + Cursor.Current = Cursors.WaitCursor; + Config.FluentCommon.CreateEmptyConfigDB(bench.ProceduresDBSettings.DbType, bench.ProceduresDBSettings.ConnectionString); + MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification); + Cursor.Current = Cursors.Default; + DialogResult = DialogResult.None; + } + catch (Exception exception) + { + Cursor.Current = Cursors.Default; + MessageBox.Show(Strings.Error_while_creating_DB_Reason + exception.Message, Strings.Error); + } } } private void createResultsDbBtn_Click(object sender, EventArgs e) { + /// Update database connection strings 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; - Results.DB.DbType = bench.WaterMetersDBSettings.DbType; - Results.DB.ConnectionString = bench.WaterMetersDBSettings.ConnectionString; - Results.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 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.UsersDBSettings.DbType; - Users.DB.ConnectionString = bench.UsersDBSettings.ConnectionString; - Users.DB.CreateEmptyDB(); + Results.DB.DbType = bench.WaterMetersDBSettings.DbType; + Results.DB.ConnectionString = bench.WaterMetersDBSettings.ConnectionString; + Results.DB.CreateEmptyDB(); MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification); Cursor.Current = Cursors.Default; DialogResult = DialogResult.None; @@ -208,19 +204,159 @@ namespace TBF.Forms } MessageBox.Show(msg, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); } + } } - private void testConnConfigDbBtn_Click(object sender, EventArgs e) + //private void createUsersDbBtn_Click(object sender, EventArgs e) + //{ + // /// Update database connection strings + // 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.UsersDBSettings.DbType; + // Users.DB.ConnectionString = bench.UsersDBSettings.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); + // } + // } + //} + + + /// + /// Configuration database import (UI) + /// + private void importConfigDbBtn_Click(object sender, EventArgs e) { + /// Update database connection strings + if (!UpdateBenchFromUIControls()) return; + + if (MessageBox.Show(Strings.Do_you_want_to_restore_configuration_qm, + string.Empty, + MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + OpenFileDialog dlg = new OpenFileDialog(); + dlg.InitialDirectory = string.Format(@"C:\TBF\DbBackups\"); + if (dlg.ShowDialog() != DialogResult.OK) return; + + DBImportMessageStart("Importing database with configuration"); + ImportDatabase(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, dlg.FileName); + DBImportMessageEnd(); + } + } - private void testConnResultsDbBtn_Click(object sender, EventArgs e) + /// + /// Results database import (UI) + /// + private void importResultsDbBtn_Click(object sender, EventArgs e) { + /// Update database connection strings + if (!UpdateBenchFromUIControls()) return; + + if (MessageBox.Show(Strings.Do_you_want_to_restore_results_qm, + string.Empty, + MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + OpenFileDialog dlg = new OpenFileDialog(); + dlg.InitialDirectory = string.Format(@"C:\TBF\DbBackups\"); + if (dlg.ShowDialog() != DialogResult.OK) return; + + DBImportMessageStart("Importing database with results"); + ImportDatabase(Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString, dlg.FileName); + DBImportMessageEnd(); + } } - private void testConnUsersDbBtn_Click(object sender, EventArgs e) + TBF.Forms.ModelessActivityForm form; + System.Threading.Thread formThread; + /// + void DBImportMessageStart(string message) { + form = new TBF.Forms.ModelessActivityForm() + { + Message = message, + FontFamily = "Arial", + FontSize = 24, + FontStyle = FontStyle.Regular, + BackgroundColor = Color.RoyalBlue, + }; + formThread = new System.Threading.Thread(() => form.ShowDialog()); + formThread.Start(); + } + /// + void DBImportMessageEnd() + { + if (form != null && formThread != null) + { + form.CloseForm(null, new EventArgs()); + formThread.Join(); + } + form = null; + formThread = null; + } + + /// + /// Database import (functionality) + /// Invokes: + /// mysql -u[userName] --default-character-set=utf8 --database [databaseName] + /// SOURCE {SQL file name] + /// + /// DB connection string + /// Output file name + void ImportDatabase(string connectionString, string inputFileName) + { + string databaseName = Config.Utils.GetDBName(connectionString); + string userName = Config.Utils.GetDBUser(connectionString); + string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password + + try + { + Process proc = new Process(); + proc.StartInfo.FileName = @"C:\xampp\mysql\bin\mysql.exe"; + proc.StartInfo.Arguments = string.Format("--user={0} --default-character-set=utf8 --database={2}", userName, password, databaseName); + proc.StartInfo.UseShellExecute = false; /// Must be false to redirect standard input or standard output + proc.StartInfo.RedirectStandardOutput = false; + proc.StartInfo.RedirectStandardInput = true; + proc.StartInfo.CreateNoWindow = false; + //proc.StartInfo.Verb = "runas"; /// To run mysql.exe as administrator + Debug.WriteLine("Ideme na to."); + proc.Start(); + + string command = string.Format("SOURCE {0}{1}", inputFileName, Environment.NewLine); + proc.StandardInput.Write(command); + Debug.Write(command); + + proc.StandardInput.Write(string.Format("exit{0}", Environment.NewLine)); + Debug.WriteLine("exit"); + + proc.WaitForExit(); + log.ErrorFormat("Database {0} imported from file {1}", databaseName, inputFileName); + } + catch (Exception exc) + { + log.FatalFormat("Failed to import database {0} from file {1}: {2}", databaseName, inputFileName, exc.Message); + } } } } \ No newline at end of file diff --git a/TBF/Forms/DatabaseSettingsDlg.resx b/TBF/Forms/DatabaseSettingsDlg.resx index 17640030d..7bd558698 100644 --- a/TBF/Forms/DatabaseSettingsDlg.resx +++ b/TBF/Forms/DatabaseSettingsDlg.resx @@ -117,12 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Right + - 614, 15 + 801, 15 - 225, 28 + 312, 28 @@ -141,13 +145,16 @@ $this - 20 + 21 + + + Top, Right - 614, 49 + 801, 49 - 225, 28 + 312, 28 13 @@ -165,7 +172,7 @@ $this - 21 + 22 True @@ -192,7 +199,7 @@ $this - 19 + 20 116, 15 @@ -213,7 +220,7 @@ $this - 18 + 19 True @@ -240,13 +247,13 @@ $this - 17 + 18 202, 107 - 406, 20 + 589, 20 20 @@ -261,13 +268,13 @@ $this - 16 + 17 202, 137 - 406, 20 + 589, 20 22 @@ -282,7 +289,7 @@ $this - 15 + 16 True @@ -309,7 +316,7 @@ $this - 14 + 15 True @@ -336,7 +343,7 @@ $this - 13 + 14 True @@ -363,7 +370,7 @@ $this - 12 + 13 True @@ -390,7 +397,7 @@ $this - 11 + 12 116, 107 @@ -411,7 +418,7 @@ $this - 10 + 11 116, 137 @@ -432,17 +439,19 @@ $this - 9 + 10 + + + Top, Right - NoControl - 614, 105 + 801, 105 - 95, 23 + 100, 23 62 @@ -460,16 +469,19 @@ $this - 8 + 9 + + + Top, Right NoControl - 614, 135 + 801, 135 - 95, 23 + 100, 23 64 @@ -487,22 +499,25 @@ $this - 7 + 8 + + + Top, Right NoControl - 715, 104 + 907, 104 - 124, 23 + 100, 23 66 - Create DB + Create new DB createConfigDbBtn @@ -514,22 +529,25 @@ $this - 6 + 7 + + + Top, Right NoControl - 715, 134 + 907, 134 - 124, 23 + 100, 23 68 - Create DB + Create new DB createResultsDbBtn @@ -541,43 +559,19 @@ $this - 5 + 6 - - 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 + + Top, Right NoControl - 614, 165 + 801, 165 - 95, 23 + 100, 23 72 @@ -595,7 +589,7 @@ $this - 1 + 2 116, 167 @@ -616,7 +610,7 @@ $this - 2 + 3 True @@ -646,13 +640,13 @@ $this - 3 + 4 202, 167 - 406, 20 + 589, 20 69 @@ -667,7 +661,67 @@ $this - 4 + 5 + + + Top, Right + + + NoControl + + + 1013, 134 + + + 100, 23 + + + 75 + + + Import DB + + + importResultsDbBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + Top, Right + + + NoControl + + + 1013, 104 + + + 100, 23 + + + 74 + + + Import DB + + + importConfigDbBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 True @@ -676,7 +730,7 @@ 6, 13 - 853, 202 + 1125, 202 CenterParent diff --git a/TBF/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index 093345c42..5123cf3b1 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -89,9 +89,13 @@ namespace TBF this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.localSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpConfigurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpResultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.passwortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.iPerlHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainMenuStrip = new System.Windows.Forms.MenuStrip(); @@ -99,7 +103,6 @@ namespace TBF this.processToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.graphsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).BeginInit(); this.topVerticalSplitContainer.Panel1.SuspendLayout(); this.topVerticalSplitContainer.Panel2.SuspendLayout(); @@ -146,30 +149,32 @@ namespace TBF // // topVerticalSplitContainer.Panel1 // - this.topVerticalSplitContainer.Panel1.Controls.Add(this.activityGroupBox); resources.ApplyResources(this.topVerticalSplitContainer.Panel1, "topVerticalSplitContainer.Panel1"); + this.topVerticalSplitContainer.Panel1.Controls.Add(this.activityGroupBox); // // topVerticalSplitContainer.Panel2 // - this.topVerticalSplitContainer.Panel2.Controls.Add(this.topHorizontalSplitContainer); resources.ApplyResources(this.topVerticalSplitContainer.Panel2, "topVerticalSplitContainer.Panel2"); + this.topVerticalSplitContainer.Panel2.Controls.Add(this.topHorizontalSplitContainer); // // activityGroupBox // + resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); this.activityGroupBox.Controls.Add(this.messageLabel); this.activityGroupBox.Controls.Add(this.activityLabel); - resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); this.activityGroupBox.Name = "activityGroupBox"; this.activityGroupBox.TabStop = false; // // messageLabel // resources.ApplyResources(this.messageLabel, "messageLabel"); + this.messageLabel.ImageKey = global::TBF.Resources.Strings.String1; this.messageLabel.Name = "messageLabel"; // // activityLabel // resources.ApplyResources(this.activityLabel, "activityLabel"); + this.activityLabel.ImageKey = global::TBF.Resources.Strings.String1; this.activityLabel.Name = "activityLabel"; // // topHorizontalSplitContainer @@ -180,10 +185,12 @@ namespace TBF // // topHorizontalSplitContainer.Panel1 // + resources.ApplyResources(this.topHorizontalSplitContainer.Panel1, "topHorizontalSplitContainer.Panel1"); this.topHorizontalSplitContainer.Panel1.Controls.Add(this.splitContainer1); // // topHorizontalSplitContainer.Panel2 // + resources.ApplyResources(this.topHorizontalSplitContainer.Panel2, "topHorizontalSplitContainer.Panel2"); this.topHorizontalSplitContainer.Panel2.Controls.Add(this.descriptionGroupBox); // // splitContainer1 @@ -194,16 +201,18 @@ namespace TBF // // splitContainer1.Panel1 // + resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1"); this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); // // splitContainer1.Panel2 // + resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2"); this.splitContainer1.Panel2.Controls.Add(this.progressGroupBox); // // procedureGroupBox // - this.procedureGroupBox.Controls.Add(this.procedureComboBox); resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox"); + this.procedureGroupBox.Controls.Add(this.procedureComboBox); this.procedureGroupBox.Name = "procedureGroupBox"; this.procedureGroupBox.TabStop = false; // @@ -216,8 +225,8 @@ namespace TBF // // progressGroupBox // - this.progressGroupBox.Controls.Add(this.mainProgressBar); resources.ApplyResources(this.progressGroupBox, "progressGroupBox"); + this.progressGroupBox.Controls.Add(this.mainProgressBar); this.progressGroupBox.Name = "progressGroupBox"; this.progressGroupBox.TabStop = false; // @@ -228,14 +237,15 @@ namespace TBF // // descriptionGroupBox // - this.descriptionGroupBox.Controls.Add(this.descriptionLabel); resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox"); + this.descriptionGroupBox.Controls.Add(this.descriptionLabel); this.descriptionGroupBox.Name = "descriptionGroupBox"; this.descriptionGroupBox.TabStop = false; // // descriptionLabel // resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); + this.descriptionLabel.ImageKey = global::TBF.Resources.Strings.String1; this.descriptionLabel.Name = "descriptionLabel"; // // verticalSplitContainer @@ -246,10 +256,12 @@ namespace TBF // // verticalSplitContainer.Panel1 // + resources.ApplyResources(this.verticalSplitContainer.Panel1, "verticalSplitContainer.Panel1"); this.verticalSplitContainer.Panel1.Controls.Add(this.horizontalSplitContainer); // // verticalSplitContainer.Panel2 // + resources.ApplyResources(this.verticalSplitContainer.Panel2, "verticalSplitContainer.Panel2"); this.verticalSplitContainer.Panel2.Controls.Add(this.rightHorizSplitContainer); // // horizontalSplitContainer @@ -260,15 +272,18 @@ namespace TBF // // horizontalSplitContainer.Panel1 // + resources.ApplyResources(this.horizontalSplitContainer.Panel1, "horizontalSplitContainer.Panel1"); this.horizontalSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; this.horizontalSplitContainer.Panel1.Controls.Add(this.topVerticalSplitContainer); // // horizontalSplitContainer.Panel2 // + resources.ApplyResources(this.horizontalSplitContainer.Panel2, "horizontalSplitContainer.Panel2"); this.horizontalSplitContainer.Panel2.Controls.Add(this.mainTabControl); // // mainTabControl // + resources.ApplyResources(this.mainTabControl, "mainTabControl"); this.mainTabControl.Controls.Add(this.homeTabPage); this.mainTabControl.Controls.Add(this.processTabPage); this.mainTabControl.Controls.Add(this.insertTabPage); @@ -276,93 +291,106 @@ namespace TBF this.mainTabControl.Controls.Add(this.graphsTabPage); this.mainTabControl.Controls.Add(this.logsTabPage); this.mainTabControl.Controls.Add(this.picturesTabPage); - resources.ApplyResources(this.mainTabControl, "mainTabControl"); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; this.mainTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; // // homeTabPage // + resources.ApplyResources(this.homeTabPage, "homeTabPage"); this.homeTabPage.BackColor = System.Drawing.SystemColors.Control; this.homeTabPage.Controls.Add(this.ctrlBrdComponent); - resources.ApplyResources(this.homeTabPage, "homeTabPage"); + this.homeTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.homeTabPage.Name = "homeTabPage"; + this.homeTabPage.ToolTipText = global::TBF.Resources.Strings.String1; // // ctrlBrdComponent // - this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent"); + this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.ctrlBrdComponent.Name = "ctrlBrdComponent"; // // processTabPage // - this.processTabPage.Controls.Add(this.processTabPageCtrl); resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Controls.Add(this.processTabPageCtrl); + this.processTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.processTabPage.Name = "processTabPage"; + this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.processTabPage.UseVisualStyleBackColor = true; // // processTabPageCtrl // - this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl"); + this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; this.processTabPageCtrl.Name = "processTabPageCtrl"; // // insertTabPage // - this.insertTabPage.BackColor = System.Drawing.Color.Silver; resources.ApplyResources(this.insertTabPage, "insertTabPage"); + this.insertTabPage.BackColor = System.Drawing.Color.Silver; + this.insertTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.insertTabPage.Name = "insertTabPage"; + this.insertTabPage.ToolTipText = global::TBF.Resources.Strings.String1; // // resultsTabPage // - this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); + this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); + this.resultsTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.resultsTabPage.Name = "resultsTabPage"; + this.resultsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.resultsTabPage.UseVisualStyleBackColor = true; // // resultsTabPageCtrl // - this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl"); + this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; this.resultsTabPageCtrl.Name = "resultsTabPageCtrl"; // // graphsTabPage // - this.graphsTabPage.Controls.Add(this.graphsTabPageCtrl); resources.ApplyResources(this.graphsTabPage, "graphsTabPage"); + this.graphsTabPage.Controls.Add(this.graphsTabPageCtrl); + this.graphsTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.graphsTabPage.Name = "graphsTabPage"; + this.graphsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.graphsTabPage.UseVisualStyleBackColor = true; // // graphsTabPageCtrl // - this.graphsTabPageCtrl.BackColor = System.Drawing.Color.Silver; resources.ApplyResources(this.graphsTabPageCtrl, "graphsTabPageCtrl"); + this.graphsTabPageCtrl.BackColor = System.Drawing.Color.Silver; this.graphsTabPageCtrl.Name = "graphsTabPageCtrl"; // // logsTabPage // - this.logsTabPage.Controls.Add(this.logsTabPageCtrl); resources.ApplyResources(this.logsTabPage, "logsTabPage"); + this.logsTabPage.Controls.Add(this.logsTabPageCtrl); + this.logsTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.logsTabPage.Name = "logsTabPage"; + this.logsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.logsTabPage.UseVisualStyleBackColor = true; // // logsTabPageCtrl // - this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl"); + this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; this.logsTabPageCtrl.Name = "logsTabPageCtrl"; // // picturesTabPage // - this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl); resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); + this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl); + this.picturesTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.picturesTabPage.Name = "picturesTabPage"; + this.picturesTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.picturesTabPage.UseVisualStyleBackColor = true; // // picturesTabPageCtrl // - this.picturesTabPageCtrl.BackColor = System.Drawing.Color.Silver; resources.ApplyResources(this.picturesTabPageCtrl, "picturesTabPageCtrl"); + this.picturesTabPageCtrl.BackColor = System.Drawing.Color.Silver; this.picturesTabPageCtrl.Name = "picturesTabPageCtrl"; // // rightHorizSplitContainer @@ -373,8 +401,13 @@ namespace TBF // // rightHorizSplitContainer.Panel1 // + resources.ApplyResources(this.rightHorizSplitContainer.Panel1, "rightHorizSplitContainer.Panel1"); this.rightHorizSplitContainer.Panel1.Controls.Add(this.progressFlowLayoutPanel); // + // rightHorizSplitContainer.Panel2 + // + resources.ApplyResources(this.rightHorizSplitContainer.Panel2, "rightHorizSplitContainer.Panel2"); + // // progressFlowLayoutPanel // resources.ApplyResources(this.progressFlowLayoutPanel, "progressFlowLayoutPanel"); @@ -383,50 +416,55 @@ namespace TBF // // measurementTabPage // - this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); resources.ApplyResources(this.measurementTabPage, "measurementTabPage"); + this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); + this.measurementTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.measurementTabPage.Name = "measurementTabPage"; + this.measurementTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.measurementTabPage.UseVisualStyleBackColor = true; // // MeasurementTabPageCtrl // - this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); resources.ApplyResources(this.MeasurementTabPageCtrl, "MeasurementTabPageCtrl"); + this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); this.MeasurementTabPageCtrl.Name = "MeasurementTabPageCtrl"; // // statusStrip1 // + resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userInfoStatusLabel, this.statusPStatusLabel, this.routeStatusLabel, this.activityStatusLabel}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.DoubleClick += new System.EventHandler(this.statusStrip1_DoubleClick); // // userInfoStatusLabel // - this.userInfoStatusLabel.Name = "userInfoStatusLabel"; resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); + this.userInfoStatusLabel.Name = "userInfoStatusLabel"; // // statusPStatusLabel // - this.statusPStatusLabel.Name = "statusPStatusLabel"; resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); + this.statusPStatusLabel.Name = "statusPStatusLabel"; + this.statusPStatusLabel.Text = global::TBF.Resources.Strings.String1; // // routeStatusLabel // - this.routeStatusLabel.Name = "routeStatusLabel"; resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); + this.routeStatusLabel.Name = "routeStatusLabel"; + this.routeStatusLabel.Text = global::TBF.Resources.Strings.String1; // // activityStatusLabel // - this.activityStatusLabel.Name = "activityStatusLabel"; resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); + this.activityStatusLabel.Name = "activityStatusLabel"; // // benchTSMenuItem // + resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); this.benchTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchComponentsTSMenuItem, this.benchPathsTSMenuItem, @@ -435,123 +473,150 @@ namespace TBF this.toolStripSeparator1, this.exitToolStripMenuItem}); this.benchTSMenuItem.Name = "benchTSMenuItem"; - resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); // // benchComponentsTSMenuItem // - this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem"; resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem"); + this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem"; this.benchComponentsTSMenuItem.Click += new System.EventHandler(this.benchComponentsTSMItem_Click); // // benchPathsTSMenuItem // - this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem"; resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem"); + this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem"; this.benchPathsTSMenuItem.Click += new System.EventHandler(this.benchPathsTSMItem_Click); // // benchTransitionsToolStripMenuItem // - this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem"; resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem"); + this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem"; this.benchTransitionsToolStripMenuItem.Click += new System.EventHandler(this.benchTransitionsTSMItem_Click); // // benchMetrologyTSMenuItem // - this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem"; resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem"); + this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem"; this.benchMetrologyTSMenuItem.Click += new System.EventHandler(this.benchMetrologyTSMItem_Click); // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); + this.toolStripSeparator1.Name = "toolStripSeparator1"; // // exitToolStripMenuItem // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // homeTSMenuItem // - this.homeTSMenuItem.Name = "homeTSMenuItem"; resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem"); + this.homeTSMenuItem.Name = "homeTSMenuItem"; this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click); // // resultsTSMenuItem // - this.resultsTSMenuItem.Name = "resultsTSMenuItem"; resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem"); + this.resultsTSMenuItem.Name = "resultsTSMenuItem"; // // logsTSMenuItem // - this.logsTSMenuItem.Name = "logsTSMenuItem"; resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem"); + this.logsTSMenuItem.Name = "logsTSMenuItem"; this.logsTSMenuItem.Click += new System.EventHandler(this.logsTSMenuItem_Click); // // editTSMenuItem // + resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); this.editTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.usersTSMenuItem, this.localSettingsTSMenuItem, this.databaseSettingsTSMenuItem, + this.backUpToolStripMenuItem, this.passwortToolStripMenuItem, this.upgradeTSMenuItem, this.iPerlHeadsToolStripMenuItem, this.clearCountersToolStripMenuItem}); this.editTSMenuItem.Name = "editTSMenuItem"; - resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); // // usersTSMenuItem // - this.usersTSMenuItem.Name = "usersTSMenuItem"; resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem"); + this.usersTSMenuItem.Name = "usersTSMenuItem"; this.usersTSMenuItem.Click += new System.EventHandler(this.usersTSMItem_Click); // // localSettingsTSMenuItem // - this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem"; resources.ApplyResources(this.localSettingsTSMenuItem, "localSettingsTSMenuItem"); + this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem"; this.localSettingsTSMenuItem.Click += new System.EventHandler(this.localSettingsTSMItem_Click); // // databaseSettingsTSMenuItem // - this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem"; resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem"); + this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem"; this.databaseSettingsTSMenuItem.Click += new System.EventHandler(this.databaseSettingsTSMItem_Click); // + // backUpToolStripMenuItem + // + resources.ApplyResources(this.backUpToolStripMenuItem, "backUpToolStripMenuItem"); + this.backUpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.backUpConfigurationToolStripMenuItem, + this.backUpResultsToolStripMenuItem}); + this.backUpToolStripMenuItem.Name = "backUpToolStripMenuItem"; + // + // backUpConfigurationToolStripMenuItem + // + resources.ApplyResources(this.backUpConfigurationToolStripMenuItem, "backUpConfigurationToolStripMenuItem"); + this.backUpConfigurationToolStripMenuItem.Name = "backUpConfigurationToolStripMenuItem"; + this.backUpConfigurationToolStripMenuItem.Click += new System.EventHandler(this.backUpConfigurationToolStripMenuItem_Click); + // + // backUpResultsToolStripMenuItem + // + resources.ApplyResources(this.backUpResultsToolStripMenuItem, "backUpResultsToolStripMenuItem"); + this.backUpResultsToolStripMenuItem.Name = "backUpResultsToolStripMenuItem"; + this.backUpResultsToolStripMenuItem.Click += new System.EventHandler(this.backUpResultsToolStripMenuItem_Click); + // // passwortToolStripMenuItem // - this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem"); + this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; // // upgradeTSMenuItem // - this.upgradeTSMenuItem.Name = "upgradeTSMenuItem"; resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem"); + this.upgradeTSMenuItem.Name = "upgradeTSMenuItem"; this.upgradeTSMenuItem.Click += new System.EventHandler(this.upgradeTSMenuItem_Click); // // iPerlHeadsToolStripMenuItem // - this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem"; resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem"); + this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem"; this.iPerlHeadsToolStripMenuItem.Click += new System.EventHandler(this.iPerlHeadsToolStripMenuItem_Click); // + // clearCountersToolStripMenuItem + // + resources.ApplyResources(this.clearCountersToolStripMenuItem, "clearCountersToolStripMenuItem"); + this.clearCountersToolStripMenuItem.Name = "clearCountersToolStripMenuItem"; + this.clearCountersToolStripMenuItem.Click += new System.EventHandler(this.clearCountersToolStripMenuItem_Click); + // // helpTSMenuItem // + resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aboutTSMenuItem}); this.helpTSMenuItem.Name = "helpTSMenuItem"; - resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); // // aboutTSMenuItem // - this.aboutTSMenuItem.Name = "aboutTSMenuItem"; resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem"); + this.aboutTSMenuItem.Name = "aboutTSMenuItem"; this.aboutTSMenuItem.Click += new System.EventHandler(this.aboutTSMItem_Click); // // mainMenuStrip // + resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchTSMenuItem, this.proceduresToolStripMenuItem, @@ -562,39 +627,32 @@ namespace TBF this.logsTSMenuItem, this.editTSMenuItem, this.helpTSMenuItem}); - resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); this.mainMenuStrip.Name = "mainMenuStrip"; // // proceduresToolStripMenuItem // - this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem"; resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem"); + this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem"; this.proceduresToolStripMenuItem.Click += new System.EventHandler(this.proceduresTSMItem_Click); // // processToolStripMenuItem // - this.processToolStripMenuItem.Name = "processToolStripMenuItem"; resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem"); + this.processToolStripMenuItem.Name = "processToolStripMenuItem"; this.processToolStripMenuItem.Click += new System.EventHandler(this.processTSMenuItem_Click); // // resultsToolStripMenuItem // - this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem"; resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem"); + this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem"; this.resultsToolStripMenuItem.Click += new System.EventHandler(this.resultsTSMenuItem_Click); // // graphsToolStripMenuItem // - this.graphsToolStripMenuItem.Name = "graphsToolStripMenuItem"; resources.ApplyResources(this.graphsToolStripMenuItem, "graphsToolStripMenuItem"); + this.graphsToolStripMenuItem.Name = "graphsToolStripMenuItem"; this.graphsToolStripMenuItem.Click += new System.EventHandler(this.graphsToolStripMenuItem_Click); // - // clearCountersToolStripMenuItem - // - this.clearCountersToolStripMenuItem.Name = "clearCountersToolStripMenuItem"; - resources.ApplyResources(this.clearCountersToolStripMenuItem, "clearCountersToolStripMenuItem"); - this.clearCountersToolStripMenuItem.Click += new System.EventHandler(this.clearCountersToolStripMenuItem_Click); - // // MainWnd // resources.ApplyResources(this, "$this"); @@ -744,6 +802,9 @@ namespace TBF private Screens.GraphsTabPageCtrl graphsTabPageCtrl; private System.Windows.Forms.ToolStripMenuItem iPerlHeadsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backUpToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backUpConfigurationToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backUpResultsToolStripMenuItem; } } diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs index eb6aedce6..87fef3e33 100644 --- a/TBF/MainWnd.cs +++ b/TBF/MainWnd.cs @@ -10,6 +10,8 @@ using Config.Entities; using TBF.UiBridge; using TBF.Resources; using System.Threading; +using System.Diagnostics; +using System.IO; namespace TBF { @@ -828,5 +830,119 @@ namespace TBF } } } + + + /// + /// Configuration database export (UI) + /// + private void backUpConfigurationToolStripMenuItem_Click(object sender, EventArgs e) + { + string connectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; + + if (MessageBox.Show(Strings.Do_you_want_to_back_up_configuration_qm, + string.Empty, + MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + SaveFileDialog dlg = new SaveFileDialog(); + dlg.InitialDirectory = string.Format(@"C:\TBF\DbBackups\"); + dlg.FileName = string.Format(@"C:\TBF\DbBackups\{0}-{1:yyMMdd-HHmm}.sql",Config.Utils.GetDBName(connectionString), DateTime.Now); + if (dlg.ShowDialog() != DialogResult.OK) return; + + DBExportMessageStart(Strings.Saving_configuration); + bool successful = ExportDatabase(connectionString, dlg.FileName); + DBExportMessageEnd(); + + if (!successful) MessageBox.Show(Strings.Saving_configuration_failed); + } + } + + /// + /// Results database export (UI) + /// + private void backUpResultsToolStripMenuItem_Click(object sender, EventArgs e) + { + string connectionString = Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString; + + if (MessageBox.Show(Strings.Do_you_want_to_back_up_results_qm, + string.Empty, + MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + SaveFileDialog dlg = new SaveFileDialog(); + dlg.InitialDirectory = string.Format(@"C:\TBF\DbBackups\"); + dlg.FileName = string.Format(@"C:\TBF\DbBackups\{0}-{1:yyMMdd-HHmm}.sql", Config.Utils.GetDBName(connectionString), DateTime.Now); + if (dlg.ShowDialog() != DialogResult.OK) return; + + DBExportMessageStart(Strings.Saving_all_results); + bool successful = ExportDatabase(connectionString, dlg.FileName); + DBExportMessageEnd(); + + if (!successful) MessageBox.Show(Strings.Saving_results_failed); + } + } + + TBF.Forms.ModelessActivityForm form; + System.Threading.Thread formThread; + /// + void DBExportMessageStart(string message) + { + form = new TBF.Forms.ModelessActivityForm() + { + Message = message, + FontFamily = "Arial", + FontSize = 24, + FontStyle = FontStyle.Regular, + BackgroundColor = Color.RoyalBlue, + }; + formThread = new System.Threading.Thread(() => form.ShowDialog()); + formThread.Start(); + } + /// + void DBExportMessageEnd() + { + if (form != null && formThread != null) + { + form.CloseForm(null, new EventArgs()); + formThread.Join(); + } + form = null; + formThread = null; + } + + + /// + /// Database export (functionality) + /// Invokes: mysqldump --user [userName] --default-character-set=utf8 [databaseName] -r [outputFileName] + /// + /// DB connection string + /// Output file name + bool ExportDatabase(string connectionString, string outputFileName) + { + string databaseName = Config.Utils.GetDBName(connectionString); + string userName = Config.Utils.GetDBUser(connectionString); + string password = Config.Utils.GetDBPassword(connectionString); /// TODO: Use password + + try + { + Process proc = new Process(); + proc.StartInfo.FileName = @"C:\xampp\mysql\bin\mysqldump"; + proc.StartInfo.Arguments = string.Format("--user {0} --quick --default-character-set=utf8 {2} -r {3}", userName, password, databaseName, outputFileName); + proc.StartInfo.RedirectStandardOutput = true; + proc.StartInfo.UseShellExecute = false; + proc.StartInfo.CreateNoWindow = true; + //proc.StartInfo.Verb = "runas"; /// To run mysqldump.exe as administrator + proc.Start(); + proc.WaitForExit(); + + log.ErrorFormat("Database {0} exported into file {1}", databaseName, outputFileName); + return true; + } + catch (Exception exc) + { + log.FatalFormat("Failed to export database {0} to file {1}: {2}", databaseName, outputFileName, exc.Message); + return false; + } + } } } diff --git a/TBF/MainWnd.cs.resx b/TBF/MainWnd.cs.resx index 2b9610157..1facc4366 100644 --- a/TBF/MainWnd.cs.resx +++ b/TBF/MainWnd.cs.resx @@ -117,119 +117,182 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 57, 20 - - - Testovací stolice Framework - - - O - Proces + + Postup + + + Probíhá + + + Hydraulika + + + Proces + + + Vložit + + + Výsledky + + + Záznamy + + + Obrázky + + + Měření + + + Stavový pruh 1 + + + + 91, 17 + + + Uživatel : admin + + + 147, 17 + Prosím, spusťte proceduru + + 54, 20 + + + Stolice + Komponenty - - Metrologie - Cesty Přechody - - Stolice - - - Databáze - - - Nastavení + + Metrologie Ukončit - - Pomoc - - - Hydraulika - Domů - - Vložit - - - Jazyk - - - Záznamy - - - Záznamy - - - Záhlaví hlavního menu - - - Měření - - - Měření - - - Heslo - - - Obrázky - - - Obrázky - - - Vytisknout - - - Postup - - - Postupy - - - Proces - - - Proces - - - Probíhá - - - Výsledky - - - Výsledky - Výsledky - - Stavový pruh 1 + + 67, 20 - - Uživatel : admin + + Záznamy + + + 71, 20 + + + Nastavení + + + 179, 22 Uživatelé + + 179, 22 + + + Jazyk + + + 179, 22 + + + Profily + + + 179, 22 + + + Zálohovat + + + 152, 22 + + + Konfiguraci + + + 152, 22 + + + Výsledky testů + + + 179, 22 + + + Heslo + + + 179, 22 + + + 179, 22 + + + Hlavice iPerl + + + 179, 22 + + + Vynulovat počítadla + + + 57, 20 + + + Pomoc + + + 83, 22 + + + O + + + Záhlaví hlavního menu + + + 62, 20 + + + Postupy + + + 54, 20 + + + Proces + + + 65, 20 + + + Výsledky + + + Testovací stolice Framework + \ No newline at end of file diff --git a/TBF/MainWnd.resx b/TBF/MainWnd.resx index 32990f739..5fe745fac 100644 --- a/TBF/MainWnd.resx +++ b/TBF/MainWnd.resx @@ -117,887 +117,128 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 0, 0 + + 1012, 523 - - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 68 - - - 0, 25 - - - 1 - - - messageLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 0 - - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 28 - - - 0, 25 - - - 0 - - - activityLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 1 - - - Fill - - - Verdana, 12pt - - - 5, 5 - - - 335, 115 - - - 18 - - - Activity - - - activityGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topVerticalSplitContainer.Panel1 - - - 0 - - - 5, 5, 0, 0 - - - topVerticalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topVerticalSplitContainer - - - 0 - - - Fill - - - True - - - 5, 5 - - - Horizontal - - - Fill - - - True - - - 0, 0 - - - Fill - - - False - - - Verdana, 15.75pt - - - 13, 23 - - - 23, 3, 3, 3 - - - 389, 33 - - - 6 - - - procedureComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - procedureGroupBox - - - 0 - - - Fill - - - Verdana, 12pt - - - 0, 0 - - - 13, 3, 13, 3 - - - 415, 65 - - - 17 - - - Procedure - - - procedureGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel1 - - - 0 - - - splitContainer1.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 - - - 0 - - - NoControl - - - 6, 23 - - - 237, 33 - - - 0 - - - mainProgressBar - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - progressGroupBox - - - 0 - - - Fill - - - Verdana, 12pt - - - 0, 0 - - - 252, 65 - - - 19 + + verticalSplitContainer Progress - - progressGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel2 - - - 0 - - - splitContainer1.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 - - - 1 - - - 671, 65 - - - 415 - - - 0 - - - splitContainer1 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topHorizontalSplitContainer.Panel1 - - - 0 - - - topHorizontalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topHorizontalSplitContainer - - - 0 - - - True - - - NoControl - - - 8, 15 - - - 0, 13 - - - 0 - - - descriptionLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - descriptionGroupBox - - - 0 - - - Fill - - - 0, 0 - - - 671, 46 - - - 20 - - - descriptionGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topHorizontalSplitContainer.Panel2 - - - 0 - - - topHorizontalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topHorizontalSplitContainer - - - 1 - - - 671, 115 - - - 65 - - - 0 - - - topHorizontalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topVerticalSplitContainer.Panel2 - - - 0 - - - 5, 5, 0, 0 - - - topVerticalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topVerticalSplitContainer - - - 1 - - - 1020, 120 - - - 340 - - - 21 - - - topVerticalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel1 - - - 0 - - - Fill - - - True - - - 0, 24 - - - Fill - - - True - - - 0, 0 - - - Horizontal - - - horizontalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer - - - 0 - - - Fill - - - 0, 0 - - - 1012, 523 - - - 1 - - - ctrlBrdComponent - - - ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 29 - - - Hydraulics - - - homeTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 0 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 1 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 30 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + mainTabControl 1 - - 4, 5 - - - 1012, 523 - - - 22 - - - Insert - - - insertTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 2 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 15 - - - Results - - - resultsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 3 - - - Fill - - + Microsoft Sans Serif, 8.25pt 0, 0 - - 1012, 523 + + + 65 - - 0 - - - graphsTabPageCtrl - - - TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null - - - graphsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 32 - - - Graphs - - - graphsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 4 - - + + Fill - - Microsoft Sans Serif, 8.25pt + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + benchTSMenuItem - - 4, 4, 4, 4 + + Clear Counters - - 1012, 523 + + NoControl - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 21 - - - Logs + + Verdana, 15.75pt logsTabPage - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mainTabControl - - - 5 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - + 1012, 523 - - 0 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - picturesTabPageCtrl + + 1020 - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null + + Exit - - picturesTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 31 - - - Pictures - - - picturesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 6 - - - Fill - - - 0, 1 - - - 0, 0 - - - 1020, 532 - - - 1 - - - mainTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel2 - - - 0 - - - horizontalSplitContainer.Panel2 - - + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - horizontalSplitContainer - - - 1 - - - 1020, 656 - - - 120 - - - 2 - - - horizontalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer.Panel1 - - - 0 - verticalSplitContainer.Panel1 - + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - verticalSplitContainer + + True - - 0 + + passwortToolStripMenuItem - - Fill - - + 0, 0 - - Horizontal + + Hydraulics + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 152, 22 + + + $this + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Logs + + + benchMetrologyTSMenuItem + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 0, 17 + + + 0 + + + 1012, 523 + + + 0, 680 True @@ -1005,152 +246,1076 @@ Fill - - TopDown + + splitContainer1.Panel1 - + + picturesTabPageCtrl + + + picturesTabPage + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - 230, 240 + + 0 - + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + upgradeTSMenuItem + + + topVerticalSplitContainer.Panel1 + + + procedureGroupBox + + + 8, 15 + + + 1012, 523 + + + 1012, 523 + + + 0 + + + exitToolStripMenuItem + + + TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + descriptionGroupBox + + + 52, 20 + + + mainTabControl + + + 1254, 22 + + + Configuration + + + splitContainer1.Panel2 + + + 152, 22 + + + 340 + + + 0 + + + 0, 0 + + + 1012, 523 + + + Test Bench Framework + + + toolStripSeparator1 + + 1 - - False + + True - - progressFlowLayoutPanel + + 0, 25 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Measurement + + + 0 + + + Fill + + + 140, 6 + + + activityGroupBox + + + True + + + Verdana, 12pt + + + horizontalSplitContainer + + + messageLabel + + + 0 + + + 0 + + + Fill + + + 1 + + + 143, 22 + + + Transitions + + + splitContainer1 + + + 0 + + + Profiles + + + Verdana, 15.75pt rightHorizSplitContainer.Panel1 + + topHorizontalSplitContainer + + + Verdana, 15.75pt + + + benchPathsTSMenuItem + + + 143, 22 + + + horizontalSplitContainer + + + 21 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 4, 4, 4 + + + insertTabPage + + + NoControl + + + 0 + + + activityStatusLabel + + + Language + + + 1012, 523 + + + Fill + + + 0 + + + 4, 5 + + + 0 + + + topHorizontalSplitContainer + + + 61, 20 + + + topHorizontalSplitContainer.Panel1 + + + 0 + + + Results + + + Process + + + 1 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + topHorizontalSplitContainer.Panel1 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 252, 65 + + + 0, 25 + + + mainMenuStrip + + + 4, 5 + + + 13, 23 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 17 + + + 148, 22 + + + rightHorizSplitContainer + + + 20 + + + 1254, 24 + + + Microsoft Sans Serif, 8.25pt + + + procedureGroupBox + + + 0 + + + TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + activityLabel + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityGroupBox + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer + + + 4, 4, 4, 4 + + + Upgrade + + + routeStatusLabel + + + 0, 0 + + + 0, 0 + + + 1012, 523 + + + processTabPage + + + 1012, 523 + + + Fill + + + splitContainer1 + + + 2 + + + progressFlowLayoutPanel + + + homeTabPage + + + MeasurementTabPageCtrl + + + horizontalSplitContainer + + + progressGroupBox + + + 1 + + + 0, 0 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 143, 22 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bench + + + NoControl + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + resultsTabPageCtrl + + + benchComponentsTSMenuItem + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 143, 22 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + backUpToolStripMenuItem + 0 + + 1012, 523 + + + 0 + + + 15 + + + mainTabControl + + + picturesTabPage + + + topVerticalSplitContainer.Panel1 + + + resultsTSMenuItem + + + 19 + + + verticalSplitContainer + + + logsTabPage + + + resultsTabPage + + + 32 + + + Graphs + + + Fill + + + horizontalSplitContainer.Panel2 + + + 0, 0 + + + 4, 4, 4, 4 + + + mainTabControl + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Metrology + + + splitContainer1.Panel1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + statusStrip1 + + + Microsoft Sans Serif, 8.25pt + + + descriptionGroupBox + + + 240 + + + 56, 20 + + + 23, 3, 3, 3 + + + 4, 5 + + + 4, 5 + + + 0 + + + 0, 0 + + + 120 + + + 1012, 523 + + + horizontalSplitContainer.Panel1 + + + ctrlBrdComponent + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 0 + + + 0 + + + 4, 5 + + + topVerticalSplitContainer + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6, 28 + + + 1254, 702 + + + TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + topVerticalSplitContainer.Panel2 + + + Fill + + + 0, 0 + + + 3 + + + 2 + + + 4, 5 + + + rightHorizSplitContainer.Panel2 + + + homeTSMenuItem + + + editTSMenuItem + + + logsTSMenuItem + + + backUpResultsToolStripMenuItem + + + Paths + + + 0 + + + Fill + + + 52, 20 + + + verticalSplitContainer.Panel2 + + + 1020, 120 + + + 0, 0 + + + 5, 5 + + + 143, 22 + + + topHorizontalSplitContainer.Panel2 + + + 44, 20 + + + 0 + + + measurementTabPage + + + Verdana, 11.25pt + + + 1 + + + graphsToolStripMenuItem + + + 671, 65 + + + proceduresToolStripMenuItem + + + Process + + + userInfoStatusLabel + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 1 + + + 671, 46 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 389, 33 + + + graphsTabPage + + + 0 + + + verticalSplitContainer.Panel1 + + + verticalSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Results + + + Activity + + + 3 + + + TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + Fill + + + databaseSettingsTSMenuItem + + + Fill + + + Graphs + + + TopDown + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Microsoft Sans Serif, 8.25pt + + + localSettingsTSMenuItem + + + 0, 13 + + + topVerticalSplitContainer + + + rightHorizSplitContainer + + + Verdana, 12pt + + + horizontalSplitContainer.Panel1 + + + processTabPage + + + System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 17 + + + 0 + + + 21 + + + 6, 68 + + + TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + 4, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Fill + + + 230, 240 + + + progressGroupBox + + + topVerticalSplitContainer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Test results + + + 78, 20 + + + 1020, 532 + + + 152, 22 + + + 230, 656 + + + 1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainWnd + + + topVerticalSplitContainer.Panel2 + + + 22 + + + 6, 23 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityGroupBox + + + Procedure + + + 18 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + Password + + + topHorizontalSplitContainer.Panel2 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6 + + + backUpConfigurationToolStripMenuItem + + + mainTabControl + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 0 + + + 0 + rightHorizSplitContainer.Panel1 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer - - - 0 - - - rightHorizSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer - - - 1 - - - 230, 656 - - - 240 - - - 0 - - - rightHorizSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer.Panel2 - - - 0 - - - verticalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer - - - 1 - - - 1254, 656 - - - 1020 - - - 3 - - - verticalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - Fill - - - Verdana, 11.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - MeasurementTabPageCtrl - - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null - - - measurementTabPage - - - 0 - - - 4, 5 - - - 1012, 523 + + Horizontal 25 - - Measurement + + mainProgressBar + + + 0 + + + 152, 22 + + + Pictures + + + 0, 0 + + + Back up + + + graphsTabPage + + + Logs + + + 44, 20 + + + 0 + + + False + + + Microsoft Sans Serif, 8.25pt + + + Insert + + + descriptionLabel + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5, 5, 0, 0 + + + 0 + + + 0, 1 + + + 0, 0 + + + 152, 22 + + + 1012, 523 + + + 0 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + rightHorizSplitContainer + + + Fill + + + 671, 115 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + topHorizontalSplitContainer + + + Settings + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procedureComboBox + + + helpTSMenuItem + + + 1 + + + True + + + 0 + + + resultsTabPage + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + 59, 20 + + + 0, 0 + + + graphsTabPageCtrl + + + Fill + + + About + + + Procedures + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + iPerl Heads + + + 1 + + + 6, 13 + + + 1254, 656 + + + Horizontal + + + 5, 5, 0, 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 30 + + + statusStrip1 + + + homeTabPage + + + mainTabControl + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processToolStripMenuItem + + + 107, 22 + + + 4, 5 measurementTabPage @@ -1158,400 +1323,271 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 152, 17 - - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 0, 680 - - - 1254, 22 - - - 2 - - - statusStrip1 - - - statusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - 152, 22 + + 0, 0 Components - - 152, 22 + + processTabPageCtrl - - Paths - - - 152, 22 - - - Transitions - - - 152, 22 - - - Metrology - - - 149, 6 - - - 152, 22 - - - Exit - - - 52, 20 - - - Bench - - - 52, 20 - - - Home - - - 56, 20 - - - Results - - - 44, 20 - - - Logs - - - 152, 22 - - - Users - - - 152, 22 - - - Language - - - 152, 22 - - - Database - - - 152, 22 - - - Password - - - 152, 22 - - - Upgrade - - - 152, 22 - - - iPerl Heads - - - 152, 22 - - - Clear Counters - - - 61, 20 - - - Settings - - - 152, 22 - - - About - - - 44, 20 + + Fill Help - - 17, 17 - - - 78, 20 + + mainMenuStrip - - Procedures + + 0 - - 59, 20 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Process + + Fill - - 56, 20 + + 335, 115 - - Results + + 0, 0 + + + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 415 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + statusPStatusLabel + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 152, 22 + + + 0 + + + 1020, 656 + + + aboutTSMenuItem + + + 415, 65 + + + iPerlHeadsToolStripMenuItem + + + 5, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 13, 3, 13, 3 56, 20 - - Graphs + + True - - 0, 0 + + 1 - - 1254, 24 + + 0, 24 - - 0 + + 1 - - mainMenuStrip + + logsTabPageCtrl - - mainMenuStrip + + 31 - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - + + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + + + resultsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 237, 33 + + + Horizontal + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 29 + + + 17 + + + 56, 20 + + + 0 + + 2 + + Users + + + Home + + + 0 + + + False + + + benchTransitionsToolStripMenuItem + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 148, 22 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + Results + + + 0 + + + 0 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verdana, 12pt + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 152, 22 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 1 + + + usersTSMenuItem + + + 1012, 523 + + + horizontalSplitContainer.Panel2 + + + 4, 4, 4, 4 + + + 152, 22 + + + 0 + + + clearCountersToolStripMenuItem + + + 0, 17 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1012, 523 + + + 0, 0 + + + Fill + + + mainTabControl + + + 1012, 523 + + + 6 + True 40 - - 6, 13 - - - 1254, 702 - - - Test Bench Framework - - - userInfoStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - statusPStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - routeStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchComponentsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchPathsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchTransitionsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchMetrologyTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - exitToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - homeTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - resultsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - logsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - editTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - usersTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - localSettingsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - databaseSettingsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - passwortToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - upgradeTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iPerlHeadsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - helpTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - aboutTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - proceduresToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - processToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - resultsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - graphsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - clearCountersToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainWnd - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 152, 17 + + + 17, 17 + \ No newline at end of file diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 025bf5682..e3b52aa82 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1274.0")] -[assembly: AssemblyFileVersion("2.18.1274.0")] +[assembly: AssemblyVersion("2.18.1275.0")] +[assembly: AssemblyFileVersion("2.18.1275.0")] diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index e0c8b8d5b..764f4cedd 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -1212,6 +1212,24 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Do you want to back up configuration?. + /// + internal static string Do_you_want_to_back_up_configuration_qm { + get { + return ResourceManager.GetString("Do_you_want_to_back_up_configuration_qm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Do you want to back up results?. + /// + internal static string Do_you_want_to_back_up_results_qm { + get { + return ResourceManager.GetString("Do_you_want_to_back_up_results_qm", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you want to copy this value to all cells below this cell?. /// @@ -1248,6 +1266,24 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Do you want to restore configuration?. + /// + internal static string Do_you_want_to_restore_configuration_qm { + get { + return ResourceManager.GetString("Do_you_want_to_restore_configuration_qm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Do you want to restore results?. + /// + internal static string Do_you_want_to_restore_results_qm { + get { + return ResourceManager.GetString("Do_you_want_to_restore_results_qm", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you want to save changes?. /// @@ -4128,6 +4164,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Saving all results. + /// + internal static string Saving_all_results { + get { + return ResourceManager.GetString("Saving_all_results", resourceCulture); + } + } + /// /// Looks up a localized string similar to Saving and printing results. /// @@ -4137,6 +4182,24 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Saving configuration. + /// + internal static string Saving_configuration { + get { + return ResourceManager.GetString("Saving_configuration", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Saving configuration failed. + /// + internal static string Saving_configuration_failed { + get { + return ResourceManager.GetString("Saving_configuration_failed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Saving results. /// @@ -4146,6 +4209,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Saving results failed. + /// + internal static string Saving_results_failed { + get { + return ResourceManager.GetString("Saving_results_failed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Scale communication error. /// diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx index 054dc46d0..120d9d379 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -1443,4 +1443,22 @@ Žádný vodoměr + + Chcete zálohovat konfiguraci? + + + Chcete zálohovat výsledky? + + + Ukládám všechny výsledky + + + Ukládám konfiguraci + + + Ukládání konfigurace zlyhalo + + + Ukládání výsledků zlyhalo + \ No newline at end of file diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 8a34ff94e..ce8eda8d2 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -2008,4 +2008,28 @@ More + + Do you want to back up configuration? + + + Do you want to back up results? + + + Do you want to restore configuration? + + + Do you want to restore results? + + + Saving all results + + + Saving configuration + + + Saving configuration failed + + + Saving results failed + \ No newline at end of file