diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs index ebcabb54b..fe5bd67ce 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs @@ -92,6 +92,7 @@ namespace TBF.BenchControl.DataEntry.Standard label5.Text = Strings.Serial_Number; label6.Text = Strings.Serial_Number; okButton.Text = Strings.OkBtnText; + clearButton.Text = Strings.ClearBtnText; } /// diff --git a/TestBenchFramework/Forms/AboutDlg.cs b/TestBenchFramework/Forms/AboutDlg.cs index 04f613f12..00ae6f9c0 100644 --- a/TestBenchFramework/Forms/AboutDlg.cs +++ b/TestBenchFramework/Forms/AboutDlg.cs @@ -25,25 +25,16 @@ namespace TBF.Forms { InitializeComponent(); - Localize(); - - versionLabel.Text = versionLabel.Text.Replace("_VERSION_", Program.Version); - /// - buildDateLabel.Text = buildDateLabel.Text.Replace("_BUILD_DATE_", Program.BuildDateTime.ToShortDateString()); + Text = Strings.About_Test_Bench_Framework; + copyrightLabel.Text = string.Format(Strings.CopyrightStr, DateTime.Now.Year); + versionLabel.Text = String.Format(Strings.VersionStr, Program.Version); + buildDateLabel.Text = String.Format(Strings.BuildDateStr, Program.BuildDateTime.ToShortDateString()); + closeButton.Text = Strings.CloseBtnText; byte[] sha1 = (new SHA1CryptoServiceProvider()).ComputeHash(Encoding.Default.GetBytes("nejaky text")); /// TODO: calculate SHA1 of real data StringBuilder sb = new StringBuilder(); foreach (byte oneByte in sha1) { sb.Append(oneByte.ToString("X2")); } secureHashLabel.Text = string.Format("SHA1: {0}", sb); } - - void Localize() - { - Text = Strings.About_Test_Bench_Framework; - copyrightLabel.Text = string.Format(Strings.CopyrightStr, DateTime.Now.Year); - versionLabel.Text = Strings.VersionStr; - buildDateLabel.Text = Strings.BuildDateStr; - closeButton.Text = Strings.CloseBtnText; - } } } \ No newline at end of file diff --git a/TestBenchFramework/Forms/EditUsers.cs b/TestBenchFramework/Forms/EditUsers.cs index 6b3954d68..f1239a8ef 100644 --- a/TestBenchFramework/Forms/EditUsers.cs +++ b/TestBenchFramework/Forms/EditUsers.cs @@ -29,6 +29,8 @@ namespace TBF.Forms btnEdit.Text = Strings.EditBtnText; btnDelete.Text = Strings.RemoveBtnText; btnOk.Text = Strings.OkBtnText; + columnHeader1.Text = Strings.Name; + columnHeader2.Text = Strings.ID; } private void EditUsers_Activated(object sender, EventArgs e) diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 7f3a44319..99e6bd968 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -38,36 +38,36 @@ namespace TBF private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)); - this.verticalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); this.topVerticalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.topHorizontalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.descriptionGroupBox = new System.Windows.Forms.GroupBox(); - this.descriptionLabel = new System.Windows.Forms.Label(); - this.progressGroupBox = new System.Windows.Forms.GroupBox(); - this.mainProgressBar = new System.Windows.Forms.ProgressBar(); - this.procedureGroupBox = new System.Windows.Forms.GroupBox(); - this.procedureComboBox = new System.Windows.Forms.ComboBox(); this.activityGroupBox = new System.Windows.Forms.GroupBox(); this.messageLabel = new System.Windows.Forms.Label(); this.activityLabel = new System.Windows.Forms.Label(); + this.topHorizontalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.procedureGroupBox = new System.Windows.Forms.GroupBox(); + this.procedureComboBox = new System.Windows.Forms.ComboBox(); + this.progressGroupBox = new System.Windows.Forms.GroupBox(); + this.mainProgressBar = new System.Windows.Forms.ProgressBar(); + this.descriptionGroupBox = new System.Windows.Forms.GroupBox(); + this.descriptionLabel = new System.Windows.Forms.Label(); + this.verticalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.homeTabPage = new System.Windows.Forms.TabPage(); this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6(); - this.measurementTabPage = new System.Windows.Forms.TabPage(); - this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); this.insertTabPage = new System.Windows.Forms.TabPage(); - this.picturesTabPage = new System.Windows.Forms.TabPage(); - this.picturesTabPageCtrl1 = new TBF.Screens.PicturesTabPageCtrl(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl(); this.logsTabPage = new System.Windows.Forms.TabPage(); this.logsTabPageCtrl = new TBF.Screens.LogsTabPageCtrl(); + this.picturesTabPage = new System.Windows.Forms.TabPage(); + this.picturesTabPageCtrl1 = new TBF.Screens.PicturesTabPageCtrl(); this.rightHorizSplitContainer = new System.Windows.Forms.SplitContainer(); this.progressFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.measurementTabPage = new System.Windows.Forms.TabPage(); + this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.userInfoStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.activityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -138,19 +138,19 @@ 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; // @@ -172,10 +172,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 @@ -186,16 +188,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; // @@ -208,8 +212,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; // @@ -220,8 +224,8 @@ 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; // @@ -238,10 +242,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 @@ -252,95 +258,97 @@ 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); this.mainTabControl.Controls.Add(this.resultsTabPage); 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.Name = "homeTabPage"; // // 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.Name = "processTabPage"; 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.Name = "insertTabPage"; // // resultsTabPage // - this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); + this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); this.resultsTabPage.Name = "resultsTabPage"; 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"; // // logsTabPage // - this.logsTabPage.Controls.Add(this.logsTabPageCtrl); resources.ApplyResources(this.logsTabPage, "logsTabPage"); + this.logsTabPage.Controls.Add(this.logsTabPageCtrl); this.logsTabPage.Name = "logsTabPage"; 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.picturesTabPageCtrl1); resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); + this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl1); this.picturesTabPage.Name = "picturesTabPage"; this.picturesTabPage.UseVisualStyleBackColor = true; // // picturesTabPageCtrl1 // - this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver; resources.ApplyResources(this.picturesTabPageCtrl1, "picturesTabPageCtrl1"); + this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver; this.picturesTabPageCtrl1.Name = "picturesTabPageCtrl1"; // // rightHorizSplitContainer @@ -351,8 +359,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"); @@ -361,37 +374,38 @@ namespace TBF // // measurementTabPage // - this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); resources.ApplyResources(this.measurementTabPage, "measurementTabPage"); + this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); this.measurementTabPage.Name = "measurementTabPage"; 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.activityStatusLabel}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; // // userInfoStatusLabel // - this.userInfoStatusLabel.Name = "userInfoStatusLabel"; resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); + this.userInfoStatusLabel.Name = "userInfoStatusLabel"; // // 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, @@ -400,108 +414,108 @@ 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.passwortToolStripMenuItem}); 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); // // passwortToolStripMenuItem // - this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem"); + this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; // // 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, @@ -512,31 +526,30 @@ 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); // // printToolStripMenuItem // - this.printToolStripMenuItem.Name = "printToolStripMenuItem"; resources.ApplyResources(this.printToolStripMenuItem, "printToolStripMenuItem"); + this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); // // MainWnd diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx index 3a3f12e5b..8769be126 100644 --- a/TestBenchFramework/MainWnd.resx +++ b/TestBenchFramework/MainWnd.resx @@ -117,836 +117,107 @@ 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=1.6.154.1, 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=1.6.154.1, 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 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=1.6.154.1, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 21 - - - Logs - - - logsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 4 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 1012, 523 - - - 0 - - - picturesTabPageCtrl1 - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.6.154.1, Culture=neutral, PublicKeyToken=null - - - 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 - 5 - + + 65 + + + Fill - - 0, 1 + + benchTSMenuItem - - 0, 0 + + 6, 13 - - 1020, 532 + + NoControl - - 1 + + Verdana, 15.75pt - - mainTabControl + + logsTabPage - - System.Windows.Forms.TabControl, 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 - - horizontalSplitContainer.Panel2 + + 1020 - - 0 + + Exit - - 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 + + + $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 + + + 1012, 523 + + + 0, 680 True @@ -954,152 +225,974 @@ Fill - - TopDown + + picturesTabPage - + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - 230, 240 + + Print - + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + topVerticalSplitContainer.Panel1 + + + procedureGroupBox + + + 8, 15 + + + 1012, 523 + + + 1012, 523 + + + 0 + + + exitToolStripMenuItem + + + TBF.Screens.LogsTabPageCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + descriptionGroupBox + + + 52, 20 + + + mainTabControl + + + 1254, 22 + + + 59, 20 + + + splitContainer1.Panel2 + + + 152, 22 + + + 340 + + + 1012, 523 + + + 1012, 523 + + + Test Bench Framework + + + toolStripSeparator1 + + 1 - - False + + 0, 25 - - progressFlowLayoutPanel + + True - - System.Windows.Forms.FlowLayoutPanel, 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 + + + Measurement + + + 0 + + + Fill + + + 0, 0 + + + activityGroupBox + + + True + + + Verdana, 12pt + + + horizontalSplitContainer + + + messageLabel + + + 0 + + + Fill + + + 1 + + + 143, 22 + + + activityGroupBox + + + splitContainer1 + + + 0 + + + Database + + + Verdana, 15.75pt rightHorizSplitContainer.Panel1 + + topHorizontalSplitContainer + + + 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 + + + topHorizontalSplitContainer + + + 0 + + + activityStatusLabel + + + 2 + + + 1012, 523 + + + Fill + + + 0 + + + 4, 5 + + + 0 + + + 0 + + + 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 + + + System.Windows.Forms.ToolStripMenuItem, 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 + + + measurementTabPage + + + rightHorizSplitContainer + + + 20 + + + printToolStripMenuItem + + + Microsoft Sans Serif, 8.25pt + + + procedureGroupBox + + + NoControl + + + TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityLabel + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityGroupBox + + + verticalSplitContainer + + + 1020, 532 + + + 0, 0 + + + processTabPage + + + 1012, 523 + + + Fill + + + splitContainer1 + + + Fill + + + progressFlowLayoutPanel + + + homeTabPage + + + MeasurementTabPageCtrl + + + horizontalSplitContainer + + + progressGroupBox + + + 1 + + + 0, 0 + + + 1020, 120 + + + 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 + + + Bench + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + resultsTabPageCtrl + + + benchComponentsTSMenuItem + + + 1012, 523 + + + 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 + 0 + + 1012, 523 + + + 78, 20 + + + 0 + + + 15 + + + topVerticalSplitContainer.Panel1 + + + resultsTSMenuItem + + + verticalSplitContainer + + + logsTabPage + + + resultsTabPage + + + 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 + + + topHorizontalSplitContainer.Panel2 + + + statusStrip1 + + + 0, 0 + + + descriptionGroupBox + + + 56, 20 + + + 23, 3, 3, 3 + + + 4, 5 + + + 4, 5 + + + 0 + + + 0, 0 + + + 120 + + + horizontalSplitContainer.Panel1 + + + ctrlBrdComponent + + + Help + + + 0 + + + 0 + + + 4, 5 + + + topVerticalSplitContainer + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + picturesTabPage + + + 1254, 702 + + + 140, 6 + + + 671, 115 + + + TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + topVerticalSplitContainer.Panel2 + + + Fill + + + 0, 0 + + + 3 + + + 2 + + + rightHorizSplitContainer.Panel2 + + + homeTSMenuItem + + + 44, 20 + + + logsTSMenuItem + + + Paths + + + 0 + + + Fill + + + 52, 20 + + + verticalSplitContainer.Panel2 + + + 4, 5 + + + 5, 5 + + + 143, 22 + + + Microsoft Sans Serif, 8.25pt + + + 44, 20 + + + 0 + + + Verdana, 11.25pt + + + 1 + + + 671, 65 + + + proceduresToolStripMenuItem + + + Language + + + Process + + + userInfoStatusLabel + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 6, 28 + + + 1 + + + 671, 46 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 25 + + + 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.3.244.1, Culture=neutral, PublicKeyToken=null + + + 19 + + + databaseSettingsTSMenuItem + + + Fill + + + 1254, 24 + + + TopDown + + + 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 + + + Password + + + 21 + + + 6, 68 + + + 18 + + + 4, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Fill + + + 230, 240 + + + topVerticalSplitContainer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + Microsoft Sans Serif, 8.25pt + + + 152, 22 + + + 230, 656 + + + 1 + + + 389, 33 + + + 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 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + topHorizontalSplitContainer.Panel2 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 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 + + Horizontal - - rightHorizSplitContainer + + mainTabControl - + + mainProgressBar + + 0 - - rightHorizSplitContainer.Panel2 + + Pictures - + + 0, 0 + + + 0 + + + Verdana, 15.75pt + + + Logs + + + 44, 20 + + + picturesTabPageCtrl1 + + + 0 + + + False + + + Microsoft Sans Serif, 8.25pt + + + descriptionLabel + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - rightHorizSplitContainer + + 5, 5, 0, 0 - - 1 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 230, 656 + + 0, 1 - - 240 + + 0, 0 - - 0 + + 152, 22 + + + 1012, 523 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 rightHorizSplitContainer - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - verticalSplitContainer.Panel2 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - verticalSplitContainer.Panel2 + + Fill - + + topHorizontalSplitContainer + + + Settings + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - verticalSplitContainer + + procedureComboBox - + + helpTSMenuItem + + 1 - - 1254, 656 + + True - - 1020 - - - 3 - - - verticalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - + 0 + + resultsTabPage + + + Transitions + + + 1 + + + 0, 0 + Fill - - Verdana, 11.25pt + + About - - 0, 0 + + Procedures - - 4, 4, 4, 4 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1012, 523 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + editTSMenuItem + + + 2 + + + Insert + + + 1 + + + Horizontal + + + 1254, 656 + + + 5, 5, 0, 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 30 + + + statusStrip1 + + + homeTabPage + + 0 - - MeasurementTabPageCtrl + + mainTabControl - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.6.154.1, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - measurementTabPage + + processToolStripMenuItem - - 0 + + 107, 22 - - 4, 5 - - - 1012, 523 - - - 25 - - - Measurement + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 measurementTabPage @@ -1107,346 +1200,253 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 152, 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 - - - 143, 22 + + 0, 0 Components - - 143, 22 + + processTabPageCtrl - - Paths + + Fill - - 143, 22 - - - Transitions - - - 143, 22 - - - Metrology - - - 140, 6 - - - 143, 22 - - - Exit - - - 52, 20 - - - Bench - - - 52, 20 - - - Home - - - 56, 20 - - - Results - - - 44, 20 - - - Logs - - - 126, 22 - - - Users - - - 126, 22 - - - Language - - - 126, 22 - - - Database - - - 126, 22 - - - Password - - - 61, 20 - - - Settings - - - 107, 22 - - - About - - - 44, 20 - - - Help - - - 17, 17 - - - 78, 20 - - - Procedures - - - 59, 20 - - - Process - - - 56, 20 - - - Results - - - 44, 20 - - - Print - - - 0, 0 - - - 1254, 24 - - - 0 + + 13, 3, 13, 3 mainMenuStrip - - mainMenuStrip + + 0 - - 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 + + + Fill + + + 335, 115 + + + 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 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + 0 + + + 1020, 656 + + + aboutTSMenuItem + + + 415, 65 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 4, 4, 4 + + + progressGroupBox + + + True + + + 1 + + + 0, 24 + + + 1 + + + logsTabPageCtrl + + + 0, 0 + + + 240 $this - + + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + resultsToolStripMenuItem + + + Procedure + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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.SplitContainer, 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 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + Results + + + 0 + + + 0 + + + Verdana, 12pt + + + splitContainer1.Panel1 + + + 152, 22 + + + 0 + + + 1 + + + usersTSMenuItem + + + 1012, 523 + + + horizontalSplitContainer.Panel2 + + + 4, 4, 4, 4 + + + 0 + + + 0, 17 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 0, 0 + + + Fill + + + mainTabControl + + + 1012, 523 + + + 6 + True 25 - - 6, 13 - - - 1254, 702 - - - Test Bench Framework - - - userInfoStatusLabel - - - 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 - - - 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 - - - printToolStripMenuItem - - - 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/TestBenchFramework/MainWnd.zh-CN.resx b/TestBenchFramework/MainWnd.zh-CN.resx new file mode 100644 index 000000000..3609482d5 --- /dev/null +++ b/TestBenchFramework/MainWnd.zh-CN.resx @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 活动 + + + 程序 + + + 进度 + + + 液压 + + + 过程 + + + 插入 + + + 结果 + + + 日志 + + + 图片 + + + 测量 + + + 状态栏1 + + + + 55, 20 + + + 工作台 + + + 98, 22 + + + 组件 + + + 98, 22 + + + 路径 + + + 98, 22 + + + 转换 + + + 98, 22 + + + 测量 + + + 95, 6 + + + 98, 22 + + + 退出 + + + 55, 20 + + + 主页面 + + + 结果 + + + 43, 20 + + + 日志 + + + 88, 20 + + + 设置 Settings + + + 153, 22 + + + 用户 + + + 153, 22 + + + 语言 Language + + + 153, 22 + + + 数据库 + + + 153, 22 + + + 密码 + + + 43, 20 + + + 帮助 + + + 98, 22 + + + 关于 + + + 维护菜单状态栏 + + + 43, 20 + + + 程序 + + + 43, 20 + + + 过程 + + + 43, 20 + + + 结果 + + + 43, 20 + + + 打印 + + + 校验台框架 + + \ No newline at end of file diff --git a/TestBenchFramework/PathsDlg.Designer.cs b/TestBenchFramework/PathsDlg.Designer.cs index fdd4542aa..9fdc28050 100644 --- a/TestBenchFramework/PathsDlg.Designer.cs +++ b/TestBenchFramework/PathsDlg.Designer.cs @@ -31,150 +31,150 @@ namespace TBF /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PathsDlg)); - this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.pathsTabControl = new System.Windows.Forms.TabControl(); - this.feedingTabPage = new System.Windows.Forms.TabPage(); - this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl(); - this.benchTabPage = new System.Windows.Forms.TabPage(); - this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl(); - this.outputTabPage = new System.Windows.Forms.TabPage(); - this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl(); - this.metersTabPage = new System.Windows.Forms.TabPage(); - this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); - this.splitContainer.Panel1.SuspendLayout(); - this.splitContainer.Panel2.SuspendLayout(); - this.splitContainer.SuspendLayout(); - this.pathsTabControl.SuspendLayout(); - this.feedingTabPage.SuspendLayout(); - this.benchTabPage.SuspendLayout(); - this.outputTabPage.SuspendLayout(); - this.metersTabPage.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer - // - resources.ApplyResources(this.splitContainer, "splitContainer"); - this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer.Name = "splitContainer"; - // - // splitContainer.Panel1 - // - resources.ApplyResources(this.splitContainer.Panel1, "splitContainer.Panel1"); - this.splitContainer.Panel1.Controls.Add(this.pathsTabControl); - // - // splitContainer.Panel2 - // - resources.ApplyResources(this.splitContainer.Panel2, "splitContainer.Panel2"); - this.splitContainer.Panel2.Controls.Add(this.sharedButtons); - // - // pathsTabControl - // - resources.ApplyResources(this.pathsTabControl, "pathsTabControl"); - this.pathsTabControl.Controls.Add(this.feedingTabPage); - this.pathsTabControl.Controls.Add(this.benchTabPage); - this.pathsTabControl.Controls.Add(this.outputTabPage); - this.pathsTabControl.Controls.Add(this.metersTabPage); - this.pathsTabControl.Name = "pathsTabControl"; - this.pathsTabControl.SelectedIndex = 0; - this.pathsTabControl.SelectedIndexChanged += new System.EventHandler(this.pathsTabControl_SelectedIndexChanged); - // - // feedingTabPage - // - resources.ApplyResources(this.feedingTabPage, "feedingTabPage"); - this.feedingTabPage.Controls.Add(this.pathsFeedingCtrl); - this.feedingTabPage.Name = "feedingTabPage"; - this.feedingTabPage.UseVisualStyleBackColor = true; - // - // pathsFeedingCtrl - // - resources.ApplyResources(this.pathsFeedingCtrl, "pathsFeedingCtrl"); - this.pathsFeedingCtrl.DoubleClickActivation = false; - this.pathsFeedingCtrl.FullRowSelect = true; - this.pathsFeedingCtrl.GridLines = true; - this.pathsFeedingCtrl.Name = "pathsFeedingCtrl"; - this.pathsFeedingCtrl.UseCompatibleStateImageBehavior = false; - this.pathsFeedingCtrl.View = System.Windows.Forms.View.Details; - this.pathsFeedingCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // benchTabPage - // - resources.ApplyResources(this.benchTabPage, "benchTabPage"); - this.benchTabPage.Controls.Add(this.pathsBenchCtrl); - this.benchTabPage.Name = "benchTabPage"; - this.benchTabPage.UseVisualStyleBackColor = true; - // - // pathsBenchCtrl - // - resources.ApplyResources(this.pathsBenchCtrl, "pathsBenchCtrl"); - this.pathsBenchCtrl.DoubleClickActivation = false; - this.pathsBenchCtrl.FullRowSelect = true; - this.pathsBenchCtrl.GridLines = true; - this.pathsBenchCtrl.Name = "pathsBenchCtrl"; - this.pathsBenchCtrl.UseCompatibleStateImageBehavior = false; - this.pathsBenchCtrl.View = System.Windows.Forms.View.Details; - this.pathsBenchCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // outputTabPage - // - resources.ApplyResources(this.outputTabPage, "outputTabPage"); - this.outputTabPage.Controls.Add(this.pathsOutputCtrl); - this.outputTabPage.Name = "outputTabPage"; - this.outputTabPage.UseVisualStyleBackColor = true; - // - // pathsOutputCtrl - // - resources.ApplyResources(this.pathsOutputCtrl, "pathsOutputCtrl"); - this.pathsOutputCtrl.DoubleClickActivation = false; - this.pathsOutputCtrl.FullRowSelect = true; - this.pathsOutputCtrl.GridLines = true; - this.pathsOutputCtrl.Name = "pathsOutputCtrl"; - this.pathsOutputCtrl.UseCompatibleStateImageBehavior = false; - this.pathsOutputCtrl.View = System.Windows.Forms.View.Details; - this.pathsOutputCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // metersTabPage - // - resources.ApplyResources(this.metersTabPage, "metersTabPage"); - this.metersTabPage.Controls.Add(this.pathsMetersCtrl); - this.metersTabPage.Name = "metersTabPage"; - this.metersTabPage.UseVisualStyleBackColor = true; - // - // pathsMetersCtrl - // - resources.ApplyResources(this.pathsMetersCtrl, "pathsMetersCtrl"); - this.pathsMetersCtrl.DoubleClickActivation = false; - this.pathsMetersCtrl.FullRowSelect = true; - this.pathsMetersCtrl.GridLines = true; - this.pathsMetersCtrl.Name = "pathsMetersCtrl"; - this.pathsMetersCtrl.UseCompatibleStateImageBehavior = false; - this.pathsMetersCtrl.View = System.Windows.Forms.View.Details; - this.pathsMetersCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // sharedButtons - // - resources.ApplyResources(this.sharedButtons, "sharedButtons"); - this.sharedButtons.Name = "sharedButtons"; - // - // PathsDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.splitContainer); - this.Name = "PathsDlg"; - this.Load += new System.EventHandler(this.PathsDlg_Load); - this.splitContainer.Panel1.ResumeLayout(false); - this.splitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); - this.splitContainer.ResumeLayout(false); - this.pathsTabControl.ResumeLayout(false); - this.feedingTabPage.ResumeLayout(false); - this.benchTabPage.ResumeLayout(false); - this.outputTabPage.ResumeLayout(false); - this.metersTabPage.ResumeLayout(false); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PathsDlg)); + this.splitContainer = new System.Windows.Forms.SplitContainer(); + this.pathsTabControl = new System.Windows.Forms.TabControl(); + this.feedingTabPage = new System.Windows.Forms.TabPage(); + this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl(); + this.benchTabPage = new System.Windows.Forms.TabPage(); + this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl(); + this.outputTabPage = new System.Windows.Forms.TabPage(); + this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl(); + this.metersTabPage = new System.Windows.Forms.TabPage(); + this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl(); + this.sharedButtons = new TBF.UiControls.SharedButtons(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); + this.splitContainer.Panel1.SuspendLayout(); + this.splitContainer.Panel2.SuspendLayout(); + this.splitContainer.SuspendLayout(); + this.pathsTabControl.SuspendLayout(); + this.feedingTabPage.SuspendLayout(); + this.benchTabPage.SuspendLayout(); + this.outputTabPage.SuspendLayout(); + this.metersTabPage.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer + // + resources.ApplyResources(this.splitContainer, "splitContainer"); + this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer.Name = "splitContainer"; + // + // splitContainer.Panel1 + // + resources.ApplyResources(this.splitContainer.Panel1, "splitContainer.Panel1"); + this.splitContainer.Panel1.Controls.Add(this.pathsTabControl); + // + // splitContainer.Panel2 + // + resources.ApplyResources(this.splitContainer.Panel2, "splitContainer.Panel2"); + this.splitContainer.Panel2.Controls.Add(this.sharedButtons); + // + // pathsTabControl + // + resources.ApplyResources(this.pathsTabControl, "pathsTabControl"); + this.pathsTabControl.Controls.Add(this.feedingTabPage); + this.pathsTabControl.Controls.Add(this.benchTabPage); + this.pathsTabControl.Controls.Add(this.outputTabPage); + this.pathsTabControl.Controls.Add(this.metersTabPage); + this.pathsTabControl.Name = "pathsTabControl"; + this.pathsTabControl.SelectedIndex = 0; + this.pathsTabControl.SelectedIndexChanged += new System.EventHandler(this.pathsTabControl_SelectedIndexChanged); + // + // feedingTabPage + // + resources.ApplyResources(this.feedingTabPage, "feedingTabPage"); + this.feedingTabPage.Controls.Add(this.pathsFeedingCtrl); + this.feedingTabPage.Name = "feedingTabPage"; + this.feedingTabPage.UseVisualStyleBackColor = true; + // + // pathsFeedingCtrl + // + resources.ApplyResources(this.pathsFeedingCtrl, "pathsFeedingCtrl"); + this.pathsFeedingCtrl.DoubleClickActivation = false; + this.pathsFeedingCtrl.FullRowSelect = true; + this.pathsFeedingCtrl.GridLines = true; + this.pathsFeedingCtrl.Name = "pathsFeedingCtrl"; + this.pathsFeedingCtrl.UseCompatibleStateImageBehavior = false; + this.pathsFeedingCtrl.View = System.Windows.Forms.View.Details; + this.pathsFeedingCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // benchTabPage + // + resources.ApplyResources(this.benchTabPage, "benchTabPage"); + this.benchTabPage.Controls.Add(this.pathsBenchCtrl); + this.benchTabPage.Name = "benchTabPage"; + this.benchTabPage.UseVisualStyleBackColor = true; + // + // pathsBenchCtrl + // + resources.ApplyResources(this.pathsBenchCtrl, "pathsBenchCtrl"); + this.pathsBenchCtrl.DoubleClickActivation = false; + this.pathsBenchCtrl.FullRowSelect = true; + this.pathsBenchCtrl.GridLines = true; + this.pathsBenchCtrl.Name = "pathsBenchCtrl"; + this.pathsBenchCtrl.UseCompatibleStateImageBehavior = false; + this.pathsBenchCtrl.View = System.Windows.Forms.View.Details; + this.pathsBenchCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // outputTabPage + // + resources.ApplyResources(this.outputTabPage, "outputTabPage"); + this.outputTabPage.Controls.Add(this.pathsOutputCtrl); + this.outputTabPage.Name = "outputTabPage"; + this.outputTabPage.UseVisualStyleBackColor = true; + // + // pathsOutputCtrl + // + resources.ApplyResources(this.pathsOutputCtrl, "pathsOutputCtrl"); + this.pathsOutputCtrl.DoubleClickActivation = false; + this.pathsOutputCtrl.FullRowSelect = true; + this.pathsOutputCtrl.GridLines = true; + this.pathsOutputCtrl.Name = "pathsOutputCtrl"; + this.pathsOutputCtrl.UseCompatibleStateImageBehavior = false; + this.pathsOutputCtrl.View = System.Windows.Forms.View.Details; + this.pathsOutputCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // metersTabPage + // + resources.ApplyResources(this.metersTabPage, "metersTabPage"); + this.metersTabPage.Controls.Add(this.pathsMetersCtrl); + this.metersTabPage.Name = "metersTabPage"; + this.metersTabPage.UseVisualStyleBackColor = true; + // + // pathsMetersCtrl + // + resources.ApplyResources(this.pathsMetersCtrl, "pathsMetersCtrl"); + this.pathsMetersCtrl.DoubleClickActivation = false; + this.pathsMetersCtrl.FullRowSelect = true; + this.pathsMetersCtrl.GridLines = true; + this.pathsMetersCtrl.Name = "pathsMetersCtrl"; + this.pathsMetersCtrl.UseCompatibleStateImageBehavior = false; + this.pathsMetersCtrl.View = System.Windows.Forms.View.Details; + this.pathsMetersCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // sharedButtons + // + resources.ApplyResources(this.sharedButtons, "sharedButtons"); + this.sharedButtons.Name = "sharedButtons"; + // + // PathsDlg + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainer); + this.Name = "PathsDlg"; + this.Load += new System.EventHandler(this.PathsDlg_Load); + this.splitContainer.Panel1.ResumeLayout(false); + this.splitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); + this.splitContainer.ResumeLayout(false); + this.pathsTabControl.ResumeLayout(false); + this.feedingTabPage.ResumeLayout(false); + this.benchTabPage.ResumeLayout(false); + this.outputTabPage.ResumeLayout(false); + this.metersTabPage.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/TestBenchFramework/PathsDlg.cs b/TestBenchFramework/PathsDlg.cs index e94a197ef..8bd60b6d9 100644 --- a/TestBenchFramework/PathsDlg.cs +++ b/TestBenchFramework/PathsDlg.cs @@ -75,6 +75,7 @@ namespace TBF private void PathsDlg_Load(object sender, EventArgs e) { + Localize(); TBF.LocalSettings ls = Program.LocalSettings; Width = (ls.PathsDlgWidth > 0) ? ls.PathsDlgWidth : 1050; Height = (ls.PathsDlgHeight > 0) ? ls.PathsDlgHeight : 360; @@ -82,6 +83,15 @@ namespace TBF Top = (ls.PathsDlgTop != 0) ? ls.PathsDlgTop : 150; } + private void Localize() + { + Text = Strings.PathsDlgTitle; + pathsTabControl.TabPages[(int)PathsDlgTabs.Feeding].Text = Strings.FeedingTabPageTitle; + pathsTabControl.TabPages[(int)PathsDlgTabs.Bench].Text = Strings.BenchTabPageTitle; + pathsTabControl.TabPages[(int)PathsDlgTabs.Output].Text = Strings.OutputTabPageTitle; + pathsTabControl.TabPages[(int)PathsDlgTabs.Meters].Text = Strings.MetersTabPageTitle; + } + private void Unlocked(object sender, EventArgs e) { foreach (TabPage tab in pathsTabControl.TabPages) diff --git a/TestBenchFramework/PathsDlg.resx b/TestBenchFramework/PathsDlg.resx index 190a266c5..101a526ee 100644 --- a/TestBenchFramework/PathsDlg.resx +++ b/TestBenchFramework/PathsDlg.resx @@ -162,7 +162,7 @@ benchTabPage - TBF.UiControls.PathsBenchCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + TBF.UiControls.PathsBenchCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null @@ -208,13 +208,13 @@ CenterParent - TBF.UiControls.PathsFeedingCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + TBF.UiControls.PathsFeedingCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null pathsTabControl - TBF.UiControls.PathsMetersCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + TBF.UiControls.PathsMetersCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null Bench @@ -298,7 +298,7 @@ 0 - TBF.UiControls.SharedButtons, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -355,7 +355,7 @@ 1 - TBF.UiControls.PathsOutputCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + TBF.UiControls.PathsOutputCtrl, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 14cca9ada..32c549a5e 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -97,27 +97,30 @@ namespace TBF // // mainSplitContainer.Panel1 // + resources.ApplyResources(this.mainSplitContainer.Panel1, "mainSplitContainer.Panel1"); this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); // // mainSplitContainer.Panel2 // + resources.ApplyResources(this.mainSplitContainer.Panel2, "mainSplitContainer.Panel2"); this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); // // tabControl // + resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Controls.Add(this.generalTabPage); this.tabControl.Controls.Add(this.historyTabPage); this.tabControl.Controls.Add(this.metrology1TabPage); this.tabControl.Controls.Add(this.metrology2TabPage); this.tabControl.Controls.Add(this.processTabPage); this.tabControl.Controls.Add(this.parametersTabPage); - resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // // generalTabPage // + resources.ApplyResources(this.generalTabPage, "generalTabPage"); this.generalTabPage.Controls.Add(this.protocolTitleTextBox); this.generalTabPage.Controls.Add(this.protocolTitleLabel); this.generalTabPage.Controls.Add(this.metersKindRadioButton2); @@ -148,9 +151,7 @@ namespace TBF this.generalTabPage.Controls.Add(this.label12); this.generalTabPage.Controls.Add(this.procNameTextBox); this.generalTabPage.Controls.Add(this.label1); - resources.ApplyResources(this.generalTabPage, "generalTabPage"); this.generalTabPage.Name = "generalTabPage"; - this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.generalTabPage.UseVisualStyleBackColor = true; // // protocolTitleTextBox @@ -180,62 +181,57 @@ namespace TBF // // transitionEndComboBox // - this.transitionEndComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); + this.transitionEndComboBox.FormattingEnabled = true; this.transitionEndComboBox.Name = "transitionEndComboBox"; // // transitionEndLabel // resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); - this.transitionEndLabel.ImageKey = global::TBF.Resources.Strings.String1; this.transitionEndLabel.Name = "transitionEndLabel"; // // transitionStartComboBox // - this.transitionStartComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); + this.transitionStartComboBox.FormattingEnabled = true; this.transitionStartComboBox.Name = "transitionStartComboBox"; // // transitionStartLabel // resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); - this.transitionStartLabel.ImageKey = global::TBF.Resources.Strings.String1; this.transitionStartLabel.Name = "transitionStartLabel"; // // resultsWriterComboBox // - this.resultsWriterComboBox.FormattingEnabled = true; resources.ApplyResources(this.resultsWriterComboBox, "resultsWriterComboBox"); + this.resultsWriterComboBox.FormattingEnabled = true; this.resultsWriterComboBox.Name = "resultsWriterComboBox"; // // resultsPrinterComboBox // - this.resultsPrinterComboBox.FormattingEnabled = true; resources.ApplyResources(this.resultsPrinterComboBox, "resultsPrinterComboBox"); + this.resultsPrinterComboBox.FormattingEnabled = true; this.resultsPrinterComboBox.Name = "resultsPrinterComboBox"; // // dataEntryComboBox // - this.dataEntryComboBox.FormattingEnabled = true; resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); + this.dataEntryComboBox.FormattingEnabled = true; this.dataEntryComboBox.Name = "dataEntryComboBox"; // // resultsWriterLabel // resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); - this.resultsWriterLabel.ImageKey = global::TBF.Resources.Strings.String1; this.resultsWriterLabel.Name = "resultsWriterLabel"; // // resultsPrinterLabel // resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); - this.resultsPrinterLabel.ImageKey = global::TBF.Resources.Strings.String1; this.resultsPrinterLabel.Name = "resultsPrinterLabel"; // // dataEntryLabel // resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); - this.dataEntryLabel.ImageKey = global::TBF.Resources.Strings.String1; this.dataEntryLabel.Name = "dataEntryLabel"; // // notesTextBox @@ -246,7 +242,6 @@ namespace TBF // label18 // resources.ApplyResources(this.label18, "label18"); - this.label18.ImageKey = global::TBF.Resources.Strings.String1; this.label18.Name = "label18"; // // watermetersTextBox @@ -257,7 +252,6 @@ namespace TBF // watermetersLabel // resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); - this.watermetersLabel.ImageKey = global::TBF.Resources.Strings.String1; this.watermetersLabel.Name = "watermetersLabel"; // // lastChangedOnTextBox @@ -268,7 +262,6 @@ namespace TBF // label15 // resources.ApplyResources(this.label15, "label15"); - this.label15.ImageKey = global::TBF.Resources.Strings.String1; this.label15.Name = "label15"; // // lastChangedByTextBox @@ -279,7 +272,6 @@ namespace TBF // label16 // resources.ApplyResources(this.label16, "label16"); - this.label16.ImageKey = global::TBF.Resources.Strings.String1; this.label16.Name = "label16"; // // createdOnTextBox @@ -290,7 +282,6 @@ namespace TBF // label14 // resources.ApplyResources(this.label14, "label14"); - this.label14.ImageKey = global::TBF.Resources.Strings.String1; this.label14.Name = "label14"; // // createdByTextBox @@ -301,7 +292,6 @@ namespace TBF // label13 // resources.ApplyResources(this.label13, "label13"); - this.label13.ImageKey = global::TBF.Resources.Strings.String1; this.label13.Name = "label13"; // // descriptionTextBox @@ -312,7 +302,6 @@ namespace TBF // label12 // resources.ApplyResources(this.label12, "label12"); - this.label12.ImageKey = global::TBF.Resources.Strings.String1; this.label12.Name = "label12"; // // procNameTextBox @@ -323,21 +312,19 @@ namespace TBF // label1 // resources.ApplyResources(this.label1, "label1"); - this.label1.ImageKey = global::TBF.Resources.Strings.String1; this.label1.Name = "label1"; // // historyTabPage // - this.historyTabPage.Controls.Add(this.historyListViewEx); resources.ApplyResources(this.historyTabPage, "historyTabPage"); + this.historyTabPage.Controls.Add(this.historyListViewEx); this.historyTabPage.Name = "historyTabPage"; - this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.historyTabPage.UseVisualStyleBackColor = true; // // historyListViewEx // - this.historyListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); + this.historyListViewEx.AllowColumnReorder = true; this.historyListViewEx.DoubleClickActivation = false; this.historyListViewEx.FullRowSelect = true; this.historyListViewEx.GridLines = true; @@ -347,16 +334,15 @@ namespace TBF // // metrology1TabPage // - this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); + this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); this.metrology1TabPage.Name = "metrology1TabPage"; - this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.metrology1TabPage.UseVisualStyleBackColor = true; // // metrology1ListViewEx // - this.metrology1ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); + this.metrology1ListViewEx.AllowColumnReorder = true; this.metrology1ListViewEx.DoubleClickActivation = false; this.metrology1ListViewEx.FullRowSelect = true; this.metrology1ListViewEx.GridLines = true; @@ -367,16 +353,15 @@ namespace TBF // // metrology2TabPage // - this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); + this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); this.metrology2TabPage.Name = "metrology2TabPage"; - this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.metrology2TabPage.UseVisualStyleBackColor = true; // // metrology2ListViewEx // - this.metrology2ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); + this.metrology2ListViewEx.AllowColumnReorder = true; this.metrology2ListViewEx.DoubleClickActivation = false; this.metrology2ListViewEx.FullRowSelect = true; this.metrology2ListViewEx.GridLines = true; @@ -387,16 +372,15 @@ namespace TBF // // processTabPage // - this.processTabPage.Controls.Add(this.processListViewEx); resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Controls.Add(this.processListViewEx); this.processTabPage.Name = "processTabPage"; - this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.processTabPage.UseVisualStyleBackColor = true; // // processListViewEx // - this.processListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.processListViewEx, "processListViewEx"); + this.processListViewEx.AllowColumnReorder = true; this.processListViewEx.DoubleClickActivation = false; this.processListViewEx.FullRowSelect = true; this.processListViewEx.GridLines = true; @@ -407,15 +391,15 @@ namespace TBF // // parametersTabPage // - this.parametersTabPage.Controls.Add(this.parametersListViewEx); resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); + this.parametersTabPage.Controls.Add(this.parametersListViewEx); this.parametersTabPage.Name = "parametersTabPage"; this.parametersTabPage.UseVisualStyleBackColor = true; // // parametersListViewEx // - this.parametersListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); + this.parametersListViewEx.AllowColumnReorder = true; this.parametersListViewEx.DoubleClickActivation = false; this.parametersListViewEx.FullRowSelect = true; this.parametersListViewEx.Name = "parametersListViewEx"; diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index bc0f17202..39ee10bcd 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -118,1182 +118,1182 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + NoControl - - - True + + Metrology I. - - 0, 0 + + 121, 20 - - 139, 156 + + 344, 204 - - 522, 20 + + 24, 73 - - 33 - - - protocolTitleTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - + + 0 - - True + + tabControl - - NoControl + + 0 - - 24, 159 - - - 65, 13 - - - 32 - - - Protocol title - - - protocolTitleLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 1 - - - True - - - NoControl - - - 98, 184 - - - 72, 17 - - - 31 - - - Combined - - - metersKindRadioButton2 + + 12 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - - 2 + + 139, 70 - - True + + 31 - - 27, 184 + + label15 - - 54, 17 + + 923, 352 - - 30 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Single + + 22 - - metersKindRadioButton1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 3 - - - 139, 318 - - - 121, 21 - - - 29 - - - transitionEndComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 4 - - - True - - - NoControl - - - 24, 323 - - - 63, 13 - - - 28 - - - Purge - End - - - transitionEndLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 5 - - - 139, 291 - - - 121, 21 - - - 27 - - - transitionStartComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 6 - - - True - - - NoControl - - - 27, 294 - - - 71, 13 - - - 26 - - - Purge - Begin - - - transitionStartLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 7 - - - 139, 264 - - - 121, 21 - - - 25 - - - resultsWriterComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 8 - - - 139, 236 - - - 121, 21 - - - 24 - - - resultsPrinterComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 generalTabPage + + Results printer + + + generalTabPage + + + 0 + + + metrology2TabPage + + + 24, 130 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 931, 390 + 9 - - 139, 208 + + 70, 13 - - 121, 21 + + 1 - - 23 + + Protocol title - - dataEntryComboBox + + 13 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + metrology2ListViewEx - + + 344, 70 + + + 86, 13 + + + 3, 3 + + + 923, 352 + + + 22 + + + 16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 344, 98 + + + 28 + + + 4, 34 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procNameTextBox + + + History of Changes + + + metersKindRadioButton1 + + + 139, 264 + + + Single + + + resultsPrinterLabel + + + 139, 41 + + + 317, 135 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + historyTabPage + + + Fill + + + Procedure + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + 2 + + generalTabPage - - 10 - - - True - - + NoControl 24, 269 - - 70, 13 + + 139, 291 - - 22 - - - Results writer - - - resultsWriterLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage - - 11 + + System.Windows.Forms.TextBox, 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 + + + 1 + + + 0 + + + lastChangedOnTextBox + + True + + NoControl + + + 139, 13 + + + Combined + + + -1, 0 + + + True + + + generalTabPage + + + 6 + + + 3, 3, 3, 3 + + + 57, 13 + + + 6, 13 + + + mainSplitContainer + + + 14 + + + mainSplitContainer.Panel1 + + + transitionEndLabel + + + 4, 34 + + + 3 + + + 0, 0 + + + transitionStartComboBox + + + 30, 13 + + + TBF.UiControls.ListViewEx, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + Fill + + + transitionStartLabel + + + 18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 94, 13 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + parametersTabPage + + + generalTabPage + + + 923, 352 + + + historyListViewEx + + + tabControl + + + 923, 352 + + + 98, 184 + + + 0 + + + protocolTitleTextBox + + + notesTextBox + + + metrology1TabPage + + + metersKindRadioButton2 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 139, 318 + + + generalTabPage + + + createdOnTextBox + + + metrology1ListViewEx + + + 17 + + + label12 + + + Fill + + + watermetersTextBox + + + 24, 44 + + + 23 + + + 923, 352 + + + Parameters + + + generalTabPage + + + 28 + + + 0 + + + generalTabPage + + + generalTabPage + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + metrology1TabPage + + + 85, 13 + + + 11 + NoControl - - 24, 241 + + 8 - - 74, 13 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21 + + label13 - - Results printer + + 19 - - resultsPrinterLabel + + 27, 294 - + + 24 + + + 0 + + + generalTabPage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + 291, 73 + + + 86, 13 + + + 931 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label18 + + + 16 + + + 3 + + + 23 + + + label1 + + + generalTabPage + + + True + + + generalTabPage + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 25, 211 + + + 0 + + + Fill + + + 1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Procedure name + + + TBF.UiControls.ListViewEx, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + True + + + 7 + + + Fill + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 100, 400 + + + resultsWriterLabel + + + NoControl + + + 13 + + + 30 + + + 0, 0 + + + NoControl + + + 139, 98 + + + NoControl + + + mainSplitContainer + + + Fill + + + 17 + + + 5 + + + resultsPrinterComboBox + + + 97, 20 + + + 30, 13 + + + 0 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processTabPage + + + 139, 208 + + + 917, 346 + + + 26 + + + generalTabPage + + + 24, 159 + + + 0, 0 + + + transitionEndComboBox + + + 58, 13 + + + 14 + + + 522, 20 + + + NoControl + + + 139, 156 + + + historyTabPage + + + 29 + + + 121, 21 + + + 71, 13 + + generalTabPage 12 - - True - - - NoControl - - - 25, 211 - - - 57, 13 - - - 20 - - - Data Entry - - - dataEntryLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 13 - - - 344, 204 - - - True - - - 317, 135 - - - 17 - - - notesTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 14 - - - True - - - NoControl - - - 291, 207 - - - 35, 13 - - - 16 - - - Notes - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 15 - - - 139, 127 - - - 522, 20 - - - 15 - - - watermetersTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 16 - - - True - - - NoControl - - - 24, 130 - - - 94, 13 - - - 14 - - - Meter types tested - - - watermetersLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 17 - - - 344, 98 - - - 97, 20 - - - 13 - - - lastChangedOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 18 - - - True - NoControl - - 291, 101 - - - 30, 13 - - - 12 - - - Date - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 19 - - - 139, 98 - - - 121, 20 - - - 11 - - - lastChangedByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 20 - - - True - - - NoControl - - - 24, 101 - - - 86, 13 - - - 10 - - - Last changed by - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 21 - - - 344, 70 - - - 97, 20 - - - 9 - - - createdOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 22 - - - True - - - NoControl - - - 291, 73 - - - 30, 13 - - - 8 - - - Date - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 23 - - - 139, 70 - - - 121, 20 - - - 7 - - - createdByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 24 - - - True - - - NoControl - - - 24, 73 - - - 58, 13 - - - 6 - - - Created by - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 25 - - - 139, 41 - - - 522, 20 - - - 5 - - - descriptionTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage 26 - - True + + Process - - NoControl + + 21 - - 24, 44 + + watermetersLabel - - 86, 13 - - - 4 - - - Short description - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage - - 27 + + 54, 17 - - 139, 13 - - - 217, 20 - - - 3 - - - procNameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 28 - - - True - - - NoControl - - - 24, 16 - - - 85, 13 - - - 2 - - - Procedure name - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 29 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 352 - - - 0 - - - General - - - generalTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 0 - - - Fill - - - 3, 3 - - + 917, 346 - - 0 - - - historyListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null - - - historyTabPage - - - 0 + + protocolTitleLabel 4, 34 - - 3, 3, 3, 3 - - - 923, 352 - - - 1 - - - History of Changes - - - historyTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tabControl - - 1 + + 33 - - Fill + + 20 + + + 27 + + + Purge - Begin + + + 8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 24 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + resultsWriterComboBox + + + $this + + + True + + + mainSplitContainer.Panel2 + + + 15 + + + 20 + + + mainSplitContainer.Panel1 3, 3 + + 10 + + + generalTabPage + + + 917, 346 + + + 6 + + + mainSplitContainer.Panel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 24, 16 + + + 217, 20 + + + tabControl + + + 63, 13 + 917, 346 - + + 3 + + + generalTabPage + + + NoControl + + + generalTabPage + + 0 - - metrology1ListViewEx + + generalTabPage - - TBF.UiControls.ListViewEx, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null + + True - - metrology1TabPage + + 121, 21 - - 0 + + 27, 184 - - 4, 34 + + ProcedureDlg - - 3, 3, 3, 3 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 923, 352 + + Purge - End - - 2 - - - Metrology I. - - - metrology1TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + tabControl - - 2 + + generalTabPage - - Fill + + generalTabPage - + + 24, 101 + + + Metrology II. + + + 139, 127 + + + parametersTabPage + + + True + + 3, 3 - - 917, 346 + + True - + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataEntryComboBox + + + Notes + + + 97, 20 + + + 74, 13 + + + 139, 236 + + + 27 + + 0 - - metrology2ListViewEx + + 65, 13 - - TBF.UiControls.ListViewEx, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - metrology2TabPage + + 25 - - 0 + + generalTabPage - + + Created by + + + createdByTextBox + + + True + + + 25 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + 4, 34 3, 3, 3, 3 - - 923, 352 - - - 3 - - - Metrology II. - - - metrology2TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 3 - - - Fill + + 21 3, 3 - - 917, 346 + + TBF.UiControls.ListViewEx, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null - - 0 + + NoControl - - processListViewEx + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TBF.UiControls.ListViewEx, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null + + 1 - - processTabPage + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + generalTabPage - - 4, 34 + + 121, 21 + + + 291, 207 + + + 15 + + + 24, 241 + + + 5 + + + Data Entry 3, 3, 3, 3 - - 923, 352 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 4 - - Process + + Date - - processTabPage + + generalTabPage - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Results writer - - tabControl + + 7 - - 4 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + 9 - - 0, 0 - - - 923, 352 - - - 0 - - - parametersListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null - - - parametersTabPage - - - 0 - - - 4, 34 - - - 923, 352 - - - 5 - - - Parameters - - - parametersTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 5 - - - Fill - - - 58, 30 - - - 0, 0 - - - 931, 390 - - - 1 - - - tabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer.Panel1 - - - 0 - - - mainSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer - - - 0 - - - -1, 0 - - - 100, 400 - - - 0 - - - sharedButtons - - - TBF.UiControls.SharedButtons, TBF, Version=1.5.146.1, Culture=neutral, PublicKeyToken=null - - - mainSplitContainer.Panel2 - - - 0 - - - mainSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer - - - 1 - - - 1034, 390 - - - 931 - - - 1 + + generalTabPage mainSplitContainer + + generalTabPage + + + 29 + + + lastChangedByTextBox + + + 2 + + + 0 + + + 0 + + + 24, 323 + + + metrology2TabPage + + + sharedButtons + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - 0 - - - True - - - 6, 13 - - - 1034, 390 + + 10 CenterParent - - Procedure + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ProcedureDlg + + 1034, 390 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + generalTabPage + + 2 + + + 522, 20 + + + tabControl + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + processTabPage + + + TBF.UiControls.ListViewEx, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + 3, 3, 3, 3 + + + 4 + + + processListViewEx + + + 1 + + + 4 + + + 1034, 390 + + + parametersListViewEx + + + 121, 20 + + + True + + + 291, 101 + + + 4, 34 + + + Meter types tested + + + 0 + + + True + + + descriptionTextBox + + + generalTabPage + + + 0 + + + label16 + + + 522, 20 + + + 5 + + + 2 + + + 72, 17 + + + Last changed by + + + dataEntryLabel + + + NoControl + + + 4, 34 + + + 32 + + + True + + + 923, 352 + + + General + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 58, 30 + + + Short description + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + Date + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + TBF.UiControls.ListViewEx, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + 11 + + + True + + + 121, 21 + + + 35, 13 + + + TBF.UiControls.SharedButtons, TBF, Version=2.3.244.1, Culture=neutral, PublicKeyToken=null + + + 923, 352 + + + tabControl + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 121, 21 + + + True + + + 0 + + + label14 + + + True + \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.zh-CN.resx b/TestBenchFramework/ProcedureDlg.zh-CN.resx new file mode 100644 index 000000000..4984190b9 --- /dev/null +++ b/TestBenchFramework/ProcedureDlg.zh-CN.resx @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 79, 13 + + + 程序 + + + 输入数据 + + + 总体情况 + + + 变更历史记录 + + + 程序名 + + + 简短描述 + + + 创建者 + + + 日期 + + + 日期 + + + 最后修改者 + + + 记录 + + + 单个的 + + + 组合的 + + + 计量 I. + + + 计量 II. + + + 参数 + + + 进程 + + + 方案标题 + + + 打印结果 + + + 写入结果 + + + 清除 - 结束 + + + 清除 - 开始 + + + 测试仪表型号 + + \ No newline at end of file diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 518f43e51..e6f1cc2d7 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.243.1")] -[assembly: AssemblyFileVersion("2.3.243.1")] +[assembly: AssemblyVersion("2.3.244.1")] +[assembly: AssemblyFileVersion("2.3.244.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index a96d6bf04..34e7432f2 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -358,7 +358,16 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Build date _BUILD_DATE_. + /// Looks up a localized string similar to Bench. + /// + internal static string BenchTabPageTitle { + get { + return ResourceManager.GetString("BenchTabPageTitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Build date {0}. /// internal static string BuildDateStr { get { @@ -375,6 +384,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to . + /// + internal static string Camera { + get { + return ResourceManager.GetString("Camera", resourceCulture); + } + } + /// /// Looks up a localized string similar to Camera error. /// @@ -1023,6 +1041,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Feeding. + /// + internal static string FeedingTabPageTitle { + get { + return ResourceManager.GetString("FeedingTabPageTitle", resourceCulture); + } + } + /// /// Looks up a localized string similar to Fill the test bench with water?. /// @@ -1068,6 +1095,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Focus. + /// + internal static string Focus { + get { + return ResourceManager.GetString("Focus", resourceCulture); + } + } + /// /// Looks up a localized string similar to Get mass of water in the tank. /// @@ -1077,6 +1113,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Grab. + /// + internal static string Grab { + get { + return ResourceManager.GetString("Grab", resourceCulture); + } + } + /// /// Looks up a localized string similar to Groups. /// @@ -1113,6 +1158,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to ID. + /// + internal static string ID { + get { + return ResourceManager.GetString("ID", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ignore. /// @@ -1185,6 +1239,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Live. + /// + internal static string Live { + get { + return ResourceManager.GetString("Live", resourceCulture); + } + } + /// /// Looks up a localized string similar to Loading the procedure. /// @@ -1320,6 +1383,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Sensors. + /// + internal static string MetersTabPageTitle { + get { + return ResourceManager.GetString("MetersTabPageTitle", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test method. /// @@ -1581,6 +1653,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Output. + /// + internal static string OutputTabPageTitle { + get { + return ResourceManager.GetString("OutputTabPageTitle", resourceCulture); + } + } + /// /// Looks up a localized string similar to P up. /// @@ -1689,6 +1770,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Paths. + /// + internal static string PathsDlgTitle { + get { + return ResourceManager.GetString("PathsDlgTitle", resourceCulture); + } + } + /// /// Looks up a localized string similar to PID. /// @@ -3070,7 +3160,7 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Version _VERSION_. + /// Looks up a localized string similar to Version {0}. /// internal static string VersionStr { get { diff --git a/TestBenchFramework/Resources/Strings.cs.Designer.cs b/TestBenchFramework/Resources/Strings.cs.Designer.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 3bddb0f44..ca1bcd756 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -147,7 +147,7 @@ Benutzername - + Warnung @@ -973,13 +973,13 @@ Über Test Bench Framework - erstellt am _BUILD_DATE_ + erstellt am {0} © 2013 - {0} Sensus GmbH - Version _VERSION_ + Version {0} Benutzer einrichten @@ -1002,4 +1002,22 @@ Unsicherheit [%] + + Bank + + + Speisung + + + Messsensoren + + + Ausgabe + + + Pfade + + + Kamera + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index 59ce6d910..2fb1a9b3d 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -1026,9 +1026,6 @@ Ostrzeżenie - - Ostrzeżenie - Wodomierz diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 6c11d0806..262395bfd 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1127,13 +1127,13 @@ About Test Bench Framework - Build date _BUILD_DATE_ + Build date {0} Copyright © 2013 - {0} - Version _VERSION_ + Version {0} Edit User @@ -1171,4 +1171,34 @@ Previous results + + Bench + + + Feeding + + + Sensors + + + Output + + + Paths + + + ID + + + Focus + + + Grab + + + Live + + + + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TestBenchFramework/Resources/Strings.ro.resx index 366d9f032..9f880e1db 100644 --- a/TestBenchFramework/Resources/Strings.ro.resx +++ b/TestBenchFramework/Resources/Strings.ro.resx @@ -795,9 +795,6 @@ Volum [l] - atentie - - Atentie diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx index 5d4eb7d21..295a9b852 100644 --- a/TestBenchFramework/Resources/Strings.zh-CN.resx +++ b/TestBenchFramework/Resources/Strings.zh-CN.resx @@ -117,34 +117,1069 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <无> + + + （离线） + + + 关于校验台框架 + - 活动 / Activity + 活动 + + + 加入 Add> + + + 添加 Add + + + 地址 + + + 调整正在进行 + + + 管理员 - 空气温度 / Ambient humidity : + 环境湿度： - 大气压强 / Ambient pressure : + 环境压力： - 空气温度 / Ambient temperature : + 环境温度： + + + 未处理的错误发生 - 审核 / Approval : + 批准： + + + 批准日期 + + + 认证身份 + + + 审批信息 + + + 批准人 + + + 已测试水表安排 + + + 测试安排 + + + 温度[°C] + + + 辅助： + + + 辅助水表 + + + 辅助水表状态 + + + 辅助水表序列号 + + + 可用组件： + + + 可用的结果： + + + <Back 返回 + + + 平衡 + + + 工作台 + + + 校验台不在运行，但你可以更改设置来解决问题。 + + + 试验台名称冲突，请使用其他名称 + + + 工作台参数 + + + 构建日期 {0} + + + 校准专员 + + + 相机错误 + + + 取消 Cancel + + + 清除结果 + + + 清除 Clear + + + close + + + 关闭放空阀 + + + 关闭 Close + + + 关闭输入阀，关闭水泵 + + + 冷 + + + 组合水表 + + + 组合的 + + + 通讯 + + + 部件 + + + 配置 + + + 设置 + + + 设置校验台（需要密码） + + + 确认 + + + 连接字符串 + + + 复制 Copy + + + 版权所有 ©2013 - {0} + + + 更正 + + + 更正[g] + + + 更正[l/h] + + + 更正[mbar] + + + 创建数据库 + + + 数据 + + + 数据库设置 + + + 数据库类型 - 日期及时间 / Date and time : + 日期和时间： + + + 数据库创建成功！ + + + 该数据库将被覆盖 + + + 密度 + + + 密度[kg/m3] + + + 描述 + + + 检测完成 + + + 检测不合格 + + + 检测阈值[％] + + + 设备 + + + 错误 + + + 分流 + + + 要继续吗？ + + + 是否要保存该程序？ + + + 向下 Down + + + 泄漏持续时间[秒] + + + 最大压力持续时间[秒] + + + 持续时间[秒] + + + 编辑用户 + + + 编辑 Edit + + + 紧急停止 + + + 排空 + + + 排空（{0}：步骤 {1}/{2}） + + + 排空水箱 + + + 排空阀门 + + + 结束 + + + 结束条件 + + + 结束状态 + + + 输入密码 + + + 错误 修正 - [％] + + + 错误 修正 - [％] + + + 错误范围 - [％] + + + 错误范围 + [%] + + + 错误 Error + + + 从数据库加载用户错误： + + + 错误[％] + + + 建立数据库出错。原因： + + + 评估 + + + 退出 Exit + + + NOK + + + 无法创建一个数据库样例： + + + 无法导出数据库： + + + 进料 + + + 将校验台装满水？ + + + 完成 Finish + + + 流量[m3/h] + + + 流量选择 + + + 流量计 + + + 从水箱中获取水的质量 + + + 组别 + + + 实验室负责人 + + + 横向 + + + 热 + + + 更改将丢失。想继续吗？ + + + 忽略 + + + 忽略 Ignore + + + 无效的密码 + + + 无效的用户名，密码，或工作台 + + + 无效的用户名或密码 + + + 正在进行Iperl通信 + + + 语言 + + + 少 Less + + + 加载程序 + + + 锁定 Lock + + + 日志 + + + 主要的 + + + 主要水表 + + + 主要水表状态 + + + 主要水表序列号 + + + 维护专员 + + + 排空水箱 + + + 质量[kg] + + + （最大_X_字母数字字符） + + + 测量质量 + + + 已测量的 + + + 测量重量 + + + 信息 + + + 测试方法 + + + 测试方法选择 + + + 计量等级 + + + 计量者 + + + 计量 + + + 模式 + + + 更多 More + + + 名称 + + + 压力台 + + + 压力输入 + + + - 复制 + + + PQ + + + 程序 Procedure + + + pSENS + + + 测试 Test + + + 新的转换名 + + + 新标签 New + + + 下一页 Next> + + + 没有 no + + + 程序中未设置校验台。 + + + 没有 No + + + 无法连接到数据库。 + + + <未设置> + + + 通知 Notification + + + 数量 + + + 一组中的水表数量： + + + 好 OK + + + open + + + 输出 + + + 升高压力 + + + 结束升高压力 + + + 开始升高压力 + + + 降低压力 + + + 结束降低压力 + + + 开始降低压力 - 页面 / Page + 页 + + + 参数 + + + 主体 + + + 部分 + + + 好 OK + + + 密码 + + + PID + + + 请更改以下设置： + + + 请选择一个周期，测试或放空 + + + 请选择一个过程 + + + 请选择一个测试 + + + 请选择一个校验台 + + + 功率[％] + + + 压力[bar] + + + 压力高值[bar] + + + 压力低值[bar] + + + 压力表 + + + 压力选择 + + + 压力高值[bar] + + + 压力低值[bar] + + + 以前的结果 + + + 打印机 + + + 打印机 Printer + + + 程序 - 测试程序 / Procedure : + 程序： + + + 程序{0}添加。 + + + 程序{0}修改。 + + + 程序 + + + 制造者 + + + 产品名称 + + + 程序需要重新启动以应用某些设置 + + + 进度 + + + 属性 + + + 协议 + + + 发布 + + + 每升脉冲 + + + 水泵 + + + 水泵功率[％] + + + 将校验台装满水？ + + + 净化 + + + 净化（{0}：步骤{1}/{2}） + + + 采购订单 - 采购订单 / Purchase order : + 采购订单： + + + Q起始点 [l/h] + + + Q起始点 [m3/h] + + + Q-设置方法 + + + Q终止点 [l/h] + + + Q终止 [m3/h] + + + Q下降 + + + Qmin + + + Qn + + + Q上升 + + + Qt + + + 问题 + + + 变化率[％] + + + 准备完毕 + + + 完成类型 + + + 参考 + + + 调节阀门 + + + Q相对值起始点 + + + Q相对值终止点 + + + 剩余时间 + + + <＆删除 + + + << 删除所有 + + + 删除 Remove + + + 删除标签 Remove Tab + + + 重命名标签 Rename Tab + + + 重复次数 + + + 必须重新启动以使改变生效 + + + 重试 + + + 重试数据库连接 Retry + + + 修改 + + + 进行中的ROI检测 + + + 屏幕 Screen + + + 秒 + + + 选择组件 + + + 已选结果： + + + 传感器 + + + 传感器 + + + 传感器 + + + 序列号 + + + 设置流量 + + + 设置路径 + + + 设置流量 + + + 设置水压 + + + 展示循环和形态 + + + 同时进行以下步骤 + + + 同时进行之前步骤 + + + 单个的 + + + 启动 + + + 启动水泵 + + + 开始测试 + + + 启动系统 + + + 启动相机 + + + 启动水泵 + + + 开启阀门 + + + 状态 + + + 停止水泵 + + + 停止测试 + + + 停止 + + + 设定的开始测试前停止水流 + + + 抑制水表颤音 + + + 切换流量检测 + + + 切换点 + + + T转换 + + + T 入 + + + T出 + + + 目标Q值[m3/h] + + + 涂上焦油 + + + 测试 + + + 校验台 + + + 校验台组件配置 + + + 校验台数据 + + + 校验台数据库说明 + + + 校验台由该计算机控制 + + + 校验台名称 + + + 测试台编号 + + + 校验台： + + + 测试完成 + + + 测试连接 + + + 测试 + + + 测试进行中 + + + 测试 + + + 测试方法 + + + 测试名称 + + + 测试准备 + + + 测试开始（{0}：步{1}/{2}） + + + 测试停止（{0}：步{1}/{2}） + + + 测试时间[秒] + + + 测试仪 - 测试者 / Tester : + 测试者： + + + 测试专员 + + + 测试列 + + + 测试行 + + + T停止 - [秒] + + + T - 启动[秒] + + + 超时 + + + 弦误差。红色。 [％] + + + 转换 - 结束 + + + 转换 + + + 转换 - 启动 + + + 类型 + + + 不确定性[%] + + + 未处理的错误发生在 + + + 解锁 Unlock + + + 向上 Up + + + 用户： + + + 用户登录 + + + 用户管理 + + + 用户名 + + + 用户名 + + + 此用户名已被占用。请选择另外一个。 + + + 用户和组别 + + + 版本 + + + 版本 {0} + + + 垂直 + + + 音量和误差区间选择 + + + 体积[L] + + + 警告 Warning + + + 水 + + + 水表 Water Meter + + + 水表数据 + + + 水表序列号和状态 + + + 水表状态 + + + 水表类型 + + + 水表 + + + 序列号： + + + 状态[升] + + + 是的 yes + + + 是的 Yes + + + 归零 + + + 工作台 Bench + + + 供给 Feeding + + + 传感器 Sensors + + + 输出 Output + + + 工作台 - 路径 + + + 重点 + + + 抓取 + + + 现场的 + + + 相机 \ No newline at end of file diff --git a/TestBenchFramework/Screens/PicturesTabPageCtrl.cs b/TestBenchFramework/Screens/PicturesTabPageCtrl.cs index ba9ddb3e7..0d4c967e4 100644 --- a/TestBenchFramework/Screens/PicturesTabPageCtrl.cs +++ b/TestBenchFramework/Screens/PicturesTabPageCtrl.cs @@ -13,7 +13,8 @@ namespace TBF.Screens public PicturesTabPageCtrl() { InitializeComponent(); - configureButton.Text = Strings.Configure; + + Localize(); Bridge.CameraStateChangedHandler += delegate(object sender, CameraStateChangedEventArgs args) { @@ -34,6 +35,14 @@ namespace TBF.Screens }; } + private void Localize() + { + configureButton.Text = Strings.Configure; + grabButton.Text = Strings.Grab; + liveButton.Text = Strings.Live; + focusButton.Text = Strings.Focus; + } + void OnCameraStateChanged(object sender, CameraStateChangedEventArgs args) { switch (args.CameraIdx) diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index 97cbc8474..1631f0708 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -1020,10 +1020,10 @@ TabNameDlg.cs - + True True - Strings.cs.resx + Strings.de.resx True @@ -1218,11 +1218,6 @@ - - True - True - Strings.de.resx - True True @@ -1692,9 +1687,15 @@ TabNameDlg.cs + + MainWnd.cs + PrintOrderDocument.cs + + ProcedureDlg.cs + ResXFileCodeGenerator Strings.cs.Designer.cs @@ -1773,9 +1774,6 @@ MetrologyDlg.cs - - PathsDlg.cs - PathsDlg.cs @@ -1848,6 +1846,9 @@ BenchControlPanel.cs + + BenchControlPanel.cs + CameraPictureCtrl.cs diff --git a/TestBenchFramework/TransitionsDlg.cs b/TestBenchFramework/TransitionsDlg.cs index 78a38024f..ab14445aa 100644 --- a/TestBenchFramework/TransitionsDlg.cs +++ b/TestBenchFramework/TransitionsDlg.cs @@ -86,6 +86,8 @@ namespace TBF private void TransitionsDlg_Load(object sender, EventArgs e) { + Localize(); + TBF.LocalSettings ls = Program.LocalSettings; Width = (ls.TransitionsDlgWidth > 0) ? ls.TransitionsDlgWidth : 1050; Height = (ls.TransitionsDlgHeight > 0) ? ls.TransitionsDlgHeight : 360; diff --git a/TestBenchFramework/UiControls/BenchControlPanel.resx b/TestBenchFramework/UiControls/BenchControlPanel.resx index 365e495a3..0f58db681 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.resx @@ -156,21 +156,15 @@ 4, 4, 4, 4 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 2 - - 5 + + 92, 42 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8, 117 - cameraTestBtn @@ -186,15 +180,21 @@ Auxiliary - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 190, 33 + Camera test 0 + + 60, 45 + Reset @@ -207,8 +207,8 @@ sensitivityTestBtn - - NoControl + + 91, 25 Verdana, 11.25pt @@ -216,6 +216,12 @@ 17 + + 7, 253 + + + Verdana, 12pt + Lucida Console, 8.25pt @@ -237,8 +243,11 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Tank 1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + testGroupBox 60, 45 @@ -249,30 +258,24 @@ groupBox1 - - testGroupBox + + purgeBeginBtn 7, 397 - - startCycleBtn - - - NoControl + + startQ3Btn emptyGroupBox - - startQ3Btn + + Verdana, 12pt testGroupBox - - groupBox1 - 4 @@ -285,9 +288,6 @@ breakBtn - - $this - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -315,11 +315,14 @@ Q3 + + 92, 70 + 22 - - Tank 2 + + 8, 20 207, 128 @@ -330,6 +333,9 @@ otherGroupBox + + 2 + Q1 @@ -351,8 +357,11 @@ nextButton - - 1 + + Verdana, 12pt + + + Tank 1 92, 35 @@ -366,9 +375,6 @@ 92, 70 - - Sensi- tivity - 20 @@ -393,8 +399,8 @@ 14 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 92, 35 @@ -402,17 +408,17 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - 0 + + 1 + 92, 42 - - Verdana, 12pt + + acceptResultsBtn NoControl @@ -438,11 +444,8 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - - - 7, 3 + + testGroupBox startQ1Btn @@ -450,12 +453,18 @@ 0 + + NoControl + 13 Verdana, 15.75pt + + 7 + 3 @@ -474,18 +483,6 @@ resetResultsBtn - - Verdana, 15.75pt - - - Next - - - stopBtn - - - 92, 42 - Test @@ -513,8 +510,8 @@ False - - 11 + + NoControl 9 @@ -531,24 +528,27 @@ 4 - - 9 + + Q2 224, 736 - - purgeBeginBtn + + startCycleBtn - - Verdana, 12pt + + 8, 23 + + + emptyTank2Btn + + + 207, 68 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 - emptyGroupBox @@ -558,8 +558,8 @@ 8, 25 - - testGroupBox + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -567,8 +567,8 @@ 138, 117 - - NoControl + + $this Verdana, 12pt @@ -579,8 +579,8 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + 8, 117 Verdana, 15.75pt @@ -591,14 +591,11 @@ 3 - - 207, 68 - Stop - - acceptResultsBtn + + Tank 2 NoControl @@ -612,8 +609,11 @@ 106, 168 - - 190, 33 + + 190, 45 + + + groupBox1 NoControl @@ -645,11 +645,11 @@ 5 - - 190, 45 + + NoControl - - 207, 68 + + testGroupBox $this @@ -666,8 +666,8 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + stopBtn Verdana, 15.75pt @@ -675,14 +675,14 @@ emptyGroupBox - - emptyTank2Btn + + NoControl 7, 469 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Results 8, 26 @@ -693,17 +693,17 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 91, 25 + + 207, 68 92, 45 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Accept - - 7, 253 + + 7, 3 1 @@ -720,11 +720,11 @@ 8, 26 - - 8, 20 + + 11 - - Q2 + + Sensi- tivity 92, 45 @@ -741,32 +741,32 @@ False - - NoControl + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Verdana, 15.75pt - - testGroupBox + + NoControl 106, 26 - - Verdana, 12pt + + Next System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Results + + 9 - - 92, 70 + + Verdana, 15.75pt - - 8, 23 + + 1 15 @@ -774,11 +774,11 @@ 207, 246 - - Accept + + 6 - - 60, 45 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True diff --git a/TestBenchFramework/PathsDlg.de.resx b/TestBenchFramework/UiControls/BenchControlPanel.zh-CN.resx similarity index 77% rename from TestBenchFramework/PathsDlg.de.resx rename to TestBenchFramework/UiControls/BenchControlPanel.zh-CN.resx index 71b5d6fe8..ff7ebe98f 100644 --- a/TestBenchFramework/PathsDlg.de.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.zh-CN.resx @@ -117,19 +117,58 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Speisung + + 停止 - - Bank + + 开始测试 - - Ausgabe + + 启动循环 - - Messsensoren + + 开始 - - Pfade + + 结束 + + + 断开 + + + 重置 + + + 相机测试 + + + 水箱 1 + + + 灵敏度 + + + 水箱 2 + + + 测试 + + + 清除 + + + 清空 + + + 下一个 + + + 辅助的 + + + 接受 + + + 结果 \ No newline at end of file diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl.cs b/TestBenchFramework/UiControls/CameraPictureCtrl.cs index 96138d2fa..3c7b476bd 100644 --- a/TestBenchFramework/UiControls/CameraPictureCtrl.cs +++ b/TestBenchFramework/UiControls/CameraPictureCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Drawing; using System.Windows.Forms; using TBF.BenchControl.Cameras.IdcCamera; +using TBF.Resources; namespace TBF.UiControls { @@ -41,6 +42,11 @@ namespace TBF.UiControls public CameraPictureCtrl() { InitializeComponent(); + + groupBox.Text = Strings.Camera; + grabButton.Text = Strings.Grab; + liveButton.Text = Strings.Live; + focusButton.Text = Strings.Focus; } private void grabButton_Click(object sender, EventArgs e)