From a6a87cccae9de464419ba97fa1b3d1da59f263f2 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 Jul 2017 09:32:56 +0300 Subject: [PATCH] DB ver. 2. 15 consolidated, Procedure.ProtocolTitle removed --- Config/Entities/Procedure.cs | 13 +- Config/Mappings/ProcedureMap.cs | 1 - Results/BatchResults.cs | 2 +- .../Output/FileWriters/Enhanced/Writer.cs | 1 - .../FileWriters/OneFilePerMeter/Writer.cs | 1 - TestBenchFramework/ProcedureDlg.Designer.cs | 975 +++++++++--------- TestBenchFramework/ProcedureDlg.cs | 11 +- TestBenchFramework/ProcedureDlg.resx | 255 ++--- 8 files changed, 599 insertions(+), 660 deletions(-) diff --git a/Config/Entities/Procedure.cs b/Config/Entities/Procedure.cs index 4c787d7df..cc88bc52b 100644 --- a/Config/Entities/Procedure.cs +++ b/Config/Entities/Procedure.cs @@ -31,7 +31,6 @@ namespace Config.Entities /// public virtual MetersKind MetersKind { get; set; } /// single / compound / heat meters public virtual string Watermeters { get; set; } /// Water meter name or Id - public virtual string ProtocolTitle { get; set; } /// Title of the printed and saved protocol public virtual bool Protected { get; set; } /// true = procedure cannot be changed by a testing specialist public virtual bool MustBeComplete { get; set; } /// true = procedure can be finished just when all tests were finished public virtual bool ManualCtrlDisabled { get; set; } /// true = manual control of valves, etc. is disabled @@ -42,8 +41,8 @@ namespace Config.Entities public virtual string TransitionStart { get; set; } public virtual string TransitionEnd { get; set; } - public virtual string AltProcName { get; set; } /// Alternative procedure name (default = null = no alt. procedure) - public virtual int AltProcPeriod { get; set; } /// Period of alternative procedures (default = 0 = no alt. procedure) + public virtual string AltProcName { get; set; } /// Alternative procedure name (null or string.Empty = no alt. procedure) + public virtual int AltProcPeriod { get; set; } /// Period of alternative procedures (0 = no alt. procedure) public virtual IList MoreParams { get; set; } public virtual IList Tests { get; set; } @@ -63,7 +62,9 @@ namespace Config.Entities LastChgUser = CreationUser; LastChgTime = CreationTime; MetersKind = Entities.MetersKind.Single; - ProtocolTitle = "Watermeter test protocol"; + Watermeters = string.Empty; + Description = string.Empty; + LongDescription = string.Empty; } public Procedure(string name, int itemNr) @@ -93,7 +94,6 @@ namespace Config.Entities result.MetersKind = MetersKind; result.Watermeters = Watermeters; - result.ProtocolTitle = ProtocolTitle; result.Protected = Protected; result.MustBeComplete = MustBeComplete; result.ManualCtrlDisabled = ManualCtrlDisabled; @@ -120,7 +120,6 @@ namespace Config.Entities output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture)); output.WriteLine(MetersKind.ToString()); output.WriteLine(Watermeters); - output.WriteLine(ProtocolTitle); output.WriteLine(Protected.ToString()); output.WriteLine(MustBeComplete.ToString()); output.WriteLine(ManualCtrlDisabled.ToString()); @@ -153,7 +152,6 @@ namespace Config.Entities string line = input.ReadLine(); result.MetersKind = line.Equals(MetersKind.Single.ToString()) ? MetersKind.Single : (line.Equals(MetersKind.Combined.ToString()) ? MetersKind.Combined : MetersKind.HeatMeter); result.Watermeters = input.ReadLine(); - result.ProtocolTitle = input.ReadLine(); result.Protected = bool.Parse(input.ReadLine()); result.MustBeComplete = bool.Parse(input.ReadLine()); result.ManualCtrlDisabled = bool.Parse(input.ReadLine()); @@ -199,7 +197,6 @@ namespace Config.Entities ln = inp.ReadLine(); /// skip LastChgTime ln = inp.ReadLine(); if (ln != MetersKind.ToString()) { diff.AppendFormat(fmt, "MetersKind", MetersKind, ln); }; ln = inp.ReadLine(); if (ln != Watermeters) { diff.AppendFormat(fmt, "Watermeters", Watermeters, ln); }; - ln = inp.ReadLine(); if (ln != ProtocolTitle) { diff.AppendFormat(fmt, "ProtocolTitle", ProtocolTitle, ln); }; ln = inp.ReadLine(); if (ln != Protected.ToString()) { diff.AppendFormat(fmt, "Protected", Protected, ln); }; ln = inp.ReadLine(); if (ln != MustBeComplete.ToString()) { diff.AppendFormat(fmt, "MustBeComplete", MustBeComplete, ln); }; diff --git a/Config/Mappings/ProcedureMap.cs b/Config/Mappings/ProcedureMap.cs index b47c1a677..977d34c9e 100644 --- a/Config/Mappings/ProcedureMap.cs +++ b/Config/Mappings/ProcedureMap.cs @@ -28,7 +28,6 @@ namespace Config.Mappings Map(x => x.MetersKind); Map(x => x.Watermeters); - Map(x => x.ProtocolTitle); Map(x => x.Protected); Map(x => x.MustBeComplete); Map(x => x.ManualCtrlDisabled); diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index d4400625d..ac91fefd0 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -46,7 +46,7 @@ namespace Results ProcedureDescription = procedure.Description, WatermetersStr = procedure.Watermeters, ProcedureRevision = procedure.Revision, - ProtocolTitle = procedure.ProtocolTitle, + ProtocolTitle = string.Empty, StartTime = DateTime.Now, DensityCorr = (float)densityCorr, Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined), diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs b/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs index 9fa809ac0..8f3ac1965 100644 --- a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs +++ b/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs @@ -262,7 +262,6 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced /// Header ///---------- if (!string.IsNullOrEmpty(writerCfg.Header)) wrtr.Write(header); - wrtr.WriteLine(batch.ProtocolTitle); wrtr.WriteLine(string.Empty); ///---------------- diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs b/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs index 513718dbc..2f9004661 100644 --- a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs +++ b/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs @@ -262,7 +262,6 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter /// Header ///---------- if (!string.IsNullOrEmpty(writerCfg.Header)) wrtr.Write(header); - wrtr.WriteLine(batch.ProtocolTitle); wrtr.WriteLine(string.Empty); ///---------------- diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 90007fd49..0fa630f2d 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -31,498 +31,483 @@ namespace TBF /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcedureDlg)); - this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); - this.tabControl = new System.Windows.Forms.TabControl(); - this.generalTabPage = new System.Windows.Forms.TabPage(); - this.manualControlDisabledCheckBox = new System.Windows.Forms.CheckBox(); - this.mustBeCompleteCheckBox = new System.Windows.Forms.CheckBox(); - this.protectedCheckBox = new System.Windows.Forms.CheckBox(); - this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton(); - this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); - this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); - this.printer2ComboBox = new System.Windows.Forms.ComboBox(); - this.fileWriter2ComboBox = new System.Windows.Forms.ComboBox(); - this.protocolTitleTextBox = new System.Windows.Forms.TextBox(); - this.protocolTitleLabel = new System.Windows.Forms.Label(); - this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton(); - this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton(); - this.transitionEndComboBox = new System.Windows.Forms.ComboBox(); - this.transitionEndLabel = new System.Windows.Forms.Label(); - this.transitionStartComboBox = new System.Windows.Forms.ComboBox(); - this.transitionStartLabel = new System.Windows.Forms.Label(); - this.fileWriter1ComboBox = new System.Windows.Forms.ComboBox(); - this.printer1ComboBox = new System.Windows.Forms.ComboBox(); - this.dataEntryComboBox = new System.Windows.Forms.ComboBox(); - this.resultsWriterLabel = new System.Windows.Forms.Label(); - this.resultsPrinterLabel = new System.Windows.Forms.Label(); - this.dataEntryLabel = new System.Windows.Forms.Label(); - this.notesTextBox = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); - this.watermetersTextBox = new System.Windows.Forms.TextBox(); - this.watermetersLabel = new System.Windows.Forms.Label(); - this.lastChangedOnTextBox = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.lastChangedByTextBox = new System.Windows.Forms.TextBox(); - this.label16 = new System.Windows.Forms.Label(); - this.createdOnTextBox = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.createdByTextBox = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.descriptionTextBox = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.procNameTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.historyTabPage = new System.Windows.Forms.TabPage(); - this.historyListViewEx = new Results.Forms.ListViewEx(); - this.metrology1TabPage = new System.Windows.Forms.TabPage(); - this.metrology1ListViewEx = new Results.Forms.ListViewEx(); - this.metrology2TabPage = new System.Windows.Forms.TabPage(); - this.metrology2ListViewEx = new Results.Forms.ListViewEx(); - this.processTabPage = new System.Windows.Forms.TabPage(); - this.processListViewEx = new Results.Forms.ListViewEx(); - this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.parametersListViewEx = new Results.Forms.ListViewEx(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); - this.altProcNameTextBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); - ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); - this.mainSplitContainer.Panel1.SuspendLayout(); - this.mainSplitContainer.Panel2.SuspendLayout(); - this.mainSplitContainer.SuspendLayout(); - this.tabControl.SuspendLayout(); - this.generalTabPage.SuspendLayout(); - this.historyTabPage.SuspendLayout(); - this.metrology1TabPage.SuspendLayout(); - this.metrology2TabPage.SuspendLayout(); - this.processTabPage.SuspendLayout(); - this.parametersTabPage.SuspendLayout(); - this.SuspendLayout(); - // - // mainSplitContainer - // - resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer"); - this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.mainSplitContainer.Name = "mainSplitContainer"; - // - // mainSplitContainer.Panel1 - // - this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); - // - // mainSplitContainer.Panel2 - // - this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); - // - // 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 - // - this.generalTabPage.Controls.Add(this.altProcPeriodTextBox); - this.generalTabPage.Controls.Add(this.label3); - this.generalTabPage.Controls.Add(this.altProcNameTextBox); - this.generalTabPage.Controls.Add(this.label2); - this.generalTabPage.Controls.Add(this.manualControlDisabledCheckBox); - this.generalTabPage.Controls.Add(this.mustBeCompleteCheckBox); - this.generalTabPage.Controls.Add(this.protectedCheckBox); - this.generalTabPage.Controls.Add(this.metersKindRadioButton3); - this.generalTabPage.Controls.Add(this.fileWriter4ComboBox); - this.generalTabPage.Controls.Add(this.fileWriter3ComboBox); - this.generalTabPage.Controls.Add(this.printer2ComboBox); - this.generalTabPage.Controls.Add(this.fileWriter2ComboBox); - this.generalTabPage.Controls.Add(this.protocolTitleTextBox); - this.generalTabPage.Controls.Add(this.protocolTitleLabel); - this.generalTabPage.Controls.Add(this.metersKindRadioButton2); - this.generalTabPage.Controls.Add(this.metersKindRadioButton1); - this.generalTabPage.Controls.Add(this.transitionEndComboBox); - this.generalTabPage.Controls.Add(this.transitionEndLabel); - this.generalTabPage.Controls.Add(this.transitionStartComboBox); - this.generalTabPage.Controls.Add(this.transitionStartLabel); - this.generalTabPage.Controls.Add(this.fileWriter1ComboBox); - this.generalTabPage.Controls.Add(this.printer1ComboBox); - this.generalTabPage.Controls.Add(this.dataEntryComboBox); - this.generalTabPage.Controls.Add(this.resultsWriterLabel); - this.generalTabPage.Controls.Add(this.resultsPrinterLabel); - this.generalTabPage.Controls.Add(this.dataEntryLabel); - this.generalTabPage.Controls.Add(this.notesTextBox); - this.generalTabPage.Controls.Add(this.label18); - this.generalTabPage.Controls.Add(this.watermetersTextBox); - this.generalTabPage.Controls.Add(this.watermetersLabel); - this.generalTabPage.Controls.Add(this.lastChangedOnTextBox); - this.generalTabPage.Controls.Add(this.label15); - this.generalTabPage.Controls.Add(this.lastChangedByTextBox); - this.generalTabPage.Controls.Add(this.label16); - this.generalTabPage.Controls.Add(this.createdOnTextBox); - this.generalTabPage.Controls.Add(this.label14); - this.generalTabPage.Controls.Add(this.createdByTextBox); - this.generalTabPage.Controls.Add(this.label13); - this.generalTabPage.Controls.Add(this.descriptionTextBox); - 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.UseVisualStyleBackColor = true; - // - // manualControlDisabledCheckBox - // - resources.ApplyResources(this.manualControlDisabledCheckBox, "manualControlDisabledCheckBox"); - this.manualControlDisabledCheckBox.Name = "manualControlDisabledCheckBox"; - this.manualControlDisabledCheckBox.UseVisualStyleBackColor = true; - // - // mustBeCompleteCheckBox - // - resources.ApplyResources(this.mustBeCompleteCheckBox, "mustBeCompleteCheckBox"); - this.mustBeCompleteCheckBox.Name = "mustBeCompleteCheckBox"; - this.mustBeCompleteCheckBox.UseVisualStyleBackColor = true; - // - // protectedCheckBox - // - resources.ApplyResources(this.protectedCheckBox, "protectedCheckBox"); - this.protectedCheckBox.Name = "protectedCheckBox"; - this.protectedCheckBox.UseVisualStyleBackColor = true; - // - // metersKindRadioButton3 - // - resources.ApplyResources(this.metersKindRadioButton3, "metersKindRadioButton3"); - this.metersKindRadioButton3.Name = "metersKindRadioButton3"; - this.metersKindRadioButton3.TabStop = true; - this.metersKindRadioButton3.UseVisualStyleBackColor = true; - // - // fileWriter4ComboBox - // - this.fileWriter4ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); - this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; - // - // fileWriter3ComboBox - // - this.fileWriter3ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); - this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; - // - // printer2ComboBox - // - this.printer2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); - this.printer2ComboBox.Name = "printer2ComboBox"; - // - // fileWriter2ComboBox - // - this.fileWriter2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); - this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; - // - // protocolTitleTextBox - // - resources.ApplyResources(this.protocolTitleTextBox, "protocolTitleTextBox"); - this.protocolTitleTextBox.Name = "protocolTitleTextBox"; - // - // protocolTitleLabel - // - resources.ApplyResources(this.protocolTitleLabel, "protocolTitleLabel"); - this.protocolTitleLabel.ImageKey = global::TBF.Resources.Strings.Closing_the_tank; - this.protocolTitleLabel.Name = "protocolTitleLabel"; - // - // metersKindRadioButton2 - // - resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2"); - this.metersKindRadioButton2.Name = "metersKindRadioButton2"; - this.metersKindRadioButton2.TabStop = true; - this.metersKindRadioButton2.UseVisualStyleBackColor = true; - // - // metersKindRadioButton1 - // - resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1"); - this.metersKindRadioButton1.Name = "metersKindRadioButton1"; - this.metersKindRadioButton1.TabStop = true; - this.metersKindRadioButton1.UseVisualStyleBackColor = true; - // - // transitionEndComboBox - // - this.transitionEndComboBox.FormattingEnabled = true; - resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); - this.transitionEndComboBox.Name = "transitionEndComboBox"; - // - // transitionEndLabel - // - resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); - this.transitionEndLabel.Name = "transitionEndLabel"; - // - // transitionStartComboBox - // - this.transitionStartComboBox.FormattingEnabled = true; - resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); - this.transitionStartComboBox.Name = "transitionStartComboBox"; - // - // transitionStartLabel - // - resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); - this.transitionStartLabel.Name = "transitionStartLabel"; - // - // fileWriter1ComboBox - // - this.fileWriter1ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); - this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; - // - // printer1ComboBox - // - this.printer1ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); - this.printer1ComboBox.Name = "printer1ComboBox"; - // - // dataEntryComboBox - // - this.dataEntryComboBox.FormattingEnabled = true; - resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); - this.dataEntryComboBox.Name = "dataEntryComboBox"; - // - // resultsWriterLabel - // - resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); - this.resultsWriterLabel.Name = "resultsWriterLabel"; - // - // resultsPrinterLabel - // - resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); - this.resultsPrinterLabel.Name = "resultsPrinterLabel"; - // - // dataEntryLabel - // - resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); - this.dataEntryLabel.Name = "dataEntryLabel"; - // - // notesTextBox - // - resources.ApplyResources(this.notesTextBox, "notesTextBox"); - this.notesTextBox.Name = "notesTextBox"; - // - // label18 - // - resources.ApplyResources(this.label18, "label18"); - this.label18.Name = "label18"; - // - // watermetersTextBox - // - resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox"); - this.watermetersTextBox.Name = "watermetersTextBox"; - // - // watermetersLabel - // - resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); - this.watermetersLabel.Name = "watermetersLabel"; - // - // lastChangedOnTextBox - // - resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox"); - this.lastChangedOnTextBox.Name = "lastChangedOnTextBox"; - // - // label15 - // - resources.ApplyResources(this.label15, "label15"); - this.label15.Name = "label15"; - // - // lastChangedByTextBox - // - resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox"); - this.lastChangedByTextBox.Name = "lastChangedByTextBox"; - // - // label16 - // - resources.ApplyResources(this.label16, "label16"); - this.label16.Name = "label16"; - // - // createdOnTextBox - // - resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox"); - this.createdOnTextBox.Name = "createdOnTextBox"; - // - // label14 - // - resources.ApplyResources(this.label14, "label14"); - this.label14.Name = "label14"; - // - // createdByTextBox - // - resources.ApplyResources(this.createdByTextBox, "createdByTextBox"); - this.createdByTextBox.Name = "createdByTextBox"; - // - // label13 - // - resources.ApplyResources(this.label13, "label13"); - this.label13.Name = "label13"; - // - // descriptionTextBox - // - resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox"); - this.descriptionTextBox.Name = "descriptionTextBox"; - // - // label12 - // - resources.ApplyResources(this.label12, "label12"); - this.label12.Name = "label12"; - // - // procNameTextBox - // - resources.ApplyResources(this.procNameTextBox, "procNameTextBox"); - this.procNameTextBox.Name = "procNameTextBox"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // historyTabPage - // - this.historyTabPage.Controls.Add(this.historyListViewEx); - resources.ApplyResources(this.historyTabPage, "historyTabPage"); - this.historyTabPage.Name = "historyTabPage"; - this.historyTabPage.UseVisualStyleBackColor = true; - // - // historyListViewEx - // - this.historyListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); - this.historyListViewEx.DoubleClickActivation = false; - this.historyListViewEx.FullRowSelect = true; - this.historyListViewEx.GridLines = true; - this.historyListViewEx.Name = "historyListViewEx"; - this.historyListViewEx.UseCompatibleStateImageBehavior = false; - this.historyListViewEx.View = System.Windows.Forms.View.Details; - // - // metrology1TabPage - // - this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); - resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); - this.metrology1TabPage.Name = "metrology1TabPage"; - this.metrology1TabPage.UseVisualStyleBackColor = true; - // - // metrology1ListViewEx - // - this.metrology1ListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); - this.metrology1ListViewEx.DoubleClickActivation = false; - this.metrology1ListViewEx.FullRowSelect = true; - this.metrology1ListViewEx.GridLines = true; - this.metrology1ListViewEx.Name = "metrology1ListViewEx"; - this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false; - this.metrology1ListViewEx.View = System.Windows.Forms.View.Details; - this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged); - // - // metrology2TabPage - // - this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); - resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); - this.metrology2TabPage.Name = "metrology2TabPage"; - this.metrology2TabPage.UseVisualStyleBackColor = true; - // - // metrology2ListViewEx - // - this.metrology2ListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); - this.metrology2ListViewEx.DoubleClickActivation = false; - this.metrology2ListViewEx.FullRowSelect = true; - this.metrology2ListViewEx.GridLines = true; - this.metrology2ListViewEx.Name = "metrology2ListViewEx"; - this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false; - this.metrology2ListViewEx.View = System.Windows.Forms.View.Details; - this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged); - // - // processTabPage - // - this.processTabPage.Controls.Add(this.processListViewEx); - resources.ApplyResources(this.processTabPage, "processTabPage"); - this.processTabPage.Name = "processTabPage"; - this.processTabPage.UseVisualStyleBackColor = true; - // - // processListViewEx - // - this.processListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.processListViewEx, "processListViewEx"); - this.processListViewEx.DoubleClickActivation = false; - this.processListViewEx.FullRowSelect = true; - this.processListViewEx.GridLines = true; - this.processListViewEx.Name = "processListViewEx"; - this.processListViewEx.UseCompatibleStateImageBehavior = false; - this.processListViewEx.View = System.Windows.Forms.View.Details; - this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged); - // - // parametersTabPage - // - this.parametersTabPage.Controls.Add(this.parametersListViewEx); - resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); - this.parametersTabPage.Name = "parametersTabPage"; - this.parametersTabPage.UseVisualStyleBackColor = true; - // - // parametersListViewEx - // - this.parametersListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); - this.parametersListViewEx.DoubleClickActivation = false; - this.parametersListViewEx.FullRowSelect = true; - this.parametersListViewEx.GridLines = true; - this.parametersListViewEx.Name = "parametersListViewEx"; - this.parametersListViewEx.UseCompatibleStateImageBehavior = false; - this.parametersListViewEx.View = System.Windows.Forms.View.Details; - // - // sharedButtons - // - resources.ApplyResources(this.sharedButtons, "sharedButtons"); - this.sharedButtons.Name = "sharedButtons"; - // - // altProcNameTextBox - // - resources.ApplyResources(this.altProcNameTextBox, "altProcNameTextBox"); - this.altProcNameTextBox.Name = "altProcNameTextBox"; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // altProcPeriodTextBox - // - resources.ApplyResources(this.altProcPeriodTextBox, "altProcPeriodTextBox"); - this.altProcPeriodTextBox.Name = "altProcPeriodTextBox"; - // - // ProcedureDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.mainSplitContainer); - this.Name = "ProcedureDlg"; - this.Load += new System.EventHandler(this.ProcedureDlg_Load); - this.mainSplitContainer.Panel1.ResumeLayout(false); - this.mainSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit(); - this.mainSplitContainer.ResumeLayout(false); - this.tabControl.ResumeLayout(false); - this.generalTabPage.ResumeLayout(false); - this.generalTabPage.PerformLayout(); - this.historyTabPage.ResumeLayout(false); - this.metrology1TabPage.ResumeLayout(false); - this.metrology2TabPage.ResumeLayout(false); - this.processTabPage.ResumeLayout(false); - this.parametersTabPage.ResumeLayout(false); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcedureDlg)); + this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); + this.tabControl = new System.Windows.Forms.TabControl(); + this.generalTabPage = new System.Windows.Forms.TabPage(); + this.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); + this.altProcPeriodLabel = new System.Windows.Forms.Label(); + this.altProcNameTextBox = new System.Windows.Forms.TextBox(); + this.altProcNameLabel = new System.Windows.Forms.Label(); + this.manualControlDisabledCheckBox = new System.Windows.Forms.CheckBox(); + this.mustBeCompleteCheckBox = new System.Windows.Forms.CheckBox(); + this.protectedCheckBox = new System.Windows.Forms.CheckBox(); + this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton(); + this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); + this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); + this.printer2ComboBox = new System.Windows.Forms.ComboBox(); + this.fileWriter2ComboBox = new System.Windows.Forms.ComboBox(); + this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton(); + this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton(); + this.transitionEndComboBox = new System.Windows.Forms.ComboBox(); + this.transitionEndLabel = new System.Windows.Forms.Label(); + this.transitionStartComboBox = new System.Windows.Forms.ComboBox(); + this.transitionStartLabel = new System.Windows.Forms.Label(); + this.fileWriter1ComboBox = new System.Windows.Forms.ComboBox(); + this.printer1ComboBox = new System.Windows.Forms.ComboBox(); + this.dataEntryComboBox = new System.Windows.Forms.ComboBox(); + this.resultsWriterLabel = new System.Windows.Forms.Label(); + this.resultsPrinterLabel = new System.Windows.Forms.Label(); + this.dataEntryLabel = new System.Windows.Forms.Label(); + this.notesTextBox = new System.Windows.Forms.TextBox(); + this.label18 = new System.Windows.Forms.Label(); + this.watermetersTextBox = new System.Windows.Forms.TextBox(); + this.watermetersLabel = new System.Windows.Forms.Label(); + this.lastChangedOnTextBox = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.lastChangedByTextBox = new System.Windows.Forms.TextBox(); + this.label16 = new System.Windows.Forms.Label(); + this.createdOnTextBox = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.createdByTextBox = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.descriptionTextBox = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.procNameTextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.historyTabPage = new System.Windows.Forms.TabPage(); + this.historyListViewEx = new Results.Forms.ListViewEx(); + this.metrology1TabPage = new System.Windows.Forms.TabPage(); + this.metrology1ListViewEx = new Results.Forms.ListViewEx(); + this.metrology2TabPage = new System.Windows.Forms.TabPage(); + this.metrology2ListViewEx = new Results.Forms.ListViewEx(); + this.processTabPage = new System.Windows.Forms.TabPage(); + this.processListViewEx = new Results.Forms.ListViewEx(); + this.parametersTabPage = new System.Windows.Forms.TabPage(); + this.parametersListViewEx = new Results.Forms.ListViewEx(); + this.sharedButtons = new TBF.UiControls.SharedButtons(); + ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); + this.mainSplitContainer.Panel1.SuspendLayout(); + this.mainSplitContainer.Panel2.SuspendLayout(); + this.mainSplitContainer.SuspendLayout(); + this.tabControl.SuspendLayout(); + this.generalTabPage.SuspendLayout(); + this.historyTabPage.SuspendLayout(); + this.metrology1TabPage.SuspendLayout(); + this.metrology2TabPage.SuspendLayout(); + this.processTabPage.SuspendLayout(); + this.parametersTabPage.SuspendLayout(); + this.SuspendLayout(); + // + // mainSplitContainer + // + resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer"); + this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.mainSplitContainer.Name = "mainSplitContainer"; + // + // mainSplitContainer.Panel1 + // + this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); + // + // mainSplitContainer.Panel2 + // + this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); + // + // 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 + // + this.generalTabPage.Controls.Add(this.altProcPeriodTextBox); + this.generalTabPage.Controls.Add(this.altProcPeriodLabel); + this.generalTabPage.Controls.Add(this.altProcNameTextBox); + this.generalTabPage.Controls.Add(this.altProcNameLabel); + this.generalTabPage.Controls.Add(this.manualControlDisabledCheckBox); + this.generalTabPage.Controls.Add(this.mustBeCompleteCheckBox); + this.generalTabPage.Controls.Add(this.protectedCheckBox); + this.generalTabPage.Controls.Add(this.metersKindRadioButton3); + this.generalTabPage.Controls.Add(this.fileWriter4ComboBox); + this.generalTabPage.Controls.Add(this.fileWriter3ComboBox); + this.generalTabPage.Controls.Add(this.printer2ComboBox); + this.generalTabPage.Controls.Add(this.fileWriter2ComboBox); + this.generalTabPage.Controls.Add(this.metersKindRadioButton2); + this.generalTabPage.Controls.Add(this.metersKindRadioButton1); + this.generalTabPage.Controls.Add(this.transitionEndComboBox); + this.generalTabPage.Controls.Add(this.transitionEndLabel); + this.generalTabPage.Controls.Add(this.transitionStartComboBox); + this.generalTabPage.Controls.Add(this.transitionStartLabel); + this.generalTabPage.Controls.Add(this.fileWriter1ComboBox); + this.generalTabPage.Controls.Add(this.printer1ComboBox); + this.generalTabPage.Controls.Add(this.dataEntryComboBox); + this.generalTabPage.Controls.Add(this.resultsWriterLabel); + this.generalTabPage.Controls.Add(this.resultsPrinterLabel); + this.generalTabPage.Controls.Add(this.dataEntryLabel); + this.generalTabPage.Controls.Add(this.notesTextBox); + this.generalTabPage.Controls.Add(this.label18); + this.generalTabPage.Controls.Add(this.watermetersTextBox); + this.generalTabPage.Controls.Add(this.watermetersLabel); + this.generalTabPage.Controls.Add(this.lastChangedOnTextBox); + this.generalTabPage.Controls.Add(this.label15); + this.generalTabPage.Controls.Add(this.lastChangedByTextBox); + this.generalTabPage.Controls.Add(this.label16); + this.generalTabPage.Controls.Add(this.createdOnTextBox); + this.generalTabPage.Controls.Add(this.label14); + this.generalTabPage.Controls.Add(this.createdByTextBox); + this.generalTabPage.Controls.Add(this.label13); + this.generalTabPage.Controls.Add(this.descriptionTextBox); + 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.UseVisualStyleBackColor = true; + // + // altProcPeriodTextBox + // + resources.ApplyResources(this.altProcPeriodTextBox, "altProcPeriodTextBox"); + this.altProcPeriodTextBox.Name = "altProcPeriodTextBox"; + // + // altProcPeriodLabel + // + resources.ApplyResources(this.altProcPeriodLabel, "altProcPeriodLabel"); + this.altProcPeriodLabel.Name = "altProcPeriodLabel"; + // + // altProcNameTextBox + // + resources.ApplyResources(this.altProcNameTextBox, "altProcNameTextBox"); + this.altProcNameTextBox.Name = "altProcNameTextBox"; + // + // altProcNameLabel + // + resources.ApplyResources(this.altProcNameLabel, "altProcNameLabel"); + this.altProcNameLabel.Name = "altProcNameLabel"; + // + // manualControlDisabledCheckBox + // + resources.ApplyResources(this.manualControlDisabledCheckBox, "manualControlDisabledCheckBox"); + this.manualControlDisabledCheckBox.Name = "manualControlDisabledCheckBox"; + this.manualControlDisabledCheckBox.UseVisualStyleBackColor = true; + // + // mustBeCompleteCheckBox + // + resources.ApplyResources(this.mustBeCompleteCheckBox, "mustBeCompleteCheckBox"); + this.mustBeCompleteCheckBox.Name = "mustBeCompleteCheckBox"; + this.mustBeCompleteCheckBox.UseVisualStyleBackColor = true; + // + // protectedCheckBox + // + resources.ApplyResources(this.protectedCheckBox, "protectedCheckBox"); + this.protectedCheckBox.Name = "protectedCheckBox"; + this.protectedCheckBox.UseVisualStyleBackColor = true; + // + // metersKindRadioButton3 + // + resources.ApplyResources(this.metersKindRadioButton3, "metersKindRadioButton3"); + this.metersKindRadioButton3.Name = "metersKindRadioButton3"; + this.metersKindRadioButton3.TabStop = true; + this.metersKindRadioButton3.UseVisualStyleBackColor = true; + // + // fileWriter4ComboBox + // + this.fileWriter4ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); + this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; + // + // fileWriter3ComboBox + // + this.fileWriter3ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); + this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; + // + // printer2ComboBox + // + this.printer2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); + this.printer2ComboBox.Name = "printer2ComboBox"; + // + // fileWriter2ComboBox + // + this.fileWriter2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); + this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; + // + // metersKindRadioButton2 + // + resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2"); + this.metersKindRadioButton2.Name = "metersKindRadioButton2"; + this.metersKindRadioButton2.TabStop = true; + this.metersKindRadioButton2.UseVisualStyleBackColor = true; + // + // metersKindRadioButton1 + // + resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1"); + this.metersKindRadioButton1.Name = "metersKindRadioButton1"; + this.metersKindRadioButton1.TabStop = true; + this.metersKindRadioButton1.UseVisualStyleBackColor = true; + // + // transitionEndComboBox + // + this.transitionEndComboBox.FormattingEnabled = true; + resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); + this.transitionEndComboBox.Name = "transitionEndComboBox"; + // + // transitionEndLabel + // + resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); + this.transitionEndLabel.Name = "transitionEndLabel"; + // + // transitionStartComboBox + // + this.transitionStartComboBox.FormattingEnabled = true; + resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); + this.transitionStartComboBox.Name = "transitionStartComboBox"; + // + // transitionStartLabel + // + resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); + this.transitionStartLabel.Name = "transitionStartLabel"; + // + // fileWriter1ComboBox + // + this.fileWriter1ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); + this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; + // + // printer1ComboBox + // + this.printer1ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); + this.printer1ComboBox.Name = "printer1ComboBox"; + // + // dataEntryComboBox + // + this.dataEntryComboBox.FormattingEnabled = true; + resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); + this.dataEntryComboBox.Name = "dataEntryComboBox"; + // + // resultsWriterLabel + // + resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); + this.resultsWriterLabel.Name = "resultsWriterLabel"; + // + // resultsPrinterLabel + // + resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); + this.resultsPrinterLabel.Name = "resultsPrinterLabel"; + // + // dataEntryLabel + // + resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); + this.dataEntryLabel.Name = "dataEntryLabel"; + // + // notesTextBox + // + resources.ApplyResources(this.notesTextBox, "notesTextBox"); + this.notesTextBox.Name = "notesTextBox"; + // + // label18 + // + resources.ApplyResources(this.label18, "label18"); + this.label18.Name = "label18"; + // + // watermetersTextBox + // + resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox"); + this.watermetersTextBox.Name = "watermetersTextBox"; + // + // watermetersLabel + // + resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); + this.watermetersLabel.Name = "watermetersLabel"; + // + // lastChangedOnTextBox + // + resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox"); + this.lastChangedOnTextBox.Name = "lastChangedOnTextBox"; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // + // lastChangedByTextBox + // + resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox"); + this.lastChangedByTextBox.Name = "lastChangedByTextBox"; + // + // label16 + // + resources.ApplyResources(this.label16, "label16"); + this.label16.Name = "label16"; + // + // createdOnTextBox + // + resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox"); + this.createdOnTextBox.Name = "createdOnTextBox"; + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // createdByTextBox + // + resources.ApplyResources(this.createdByTextBox, "createdByTextBox"); + this.createdByTextBox.Name = "createdByTextBox"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // + // descriptionTextBox + // + resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox"); + this.descriptionTextBox.Name = "descriptionTextBox"; + // + // label12 + // + resources.ApplyResources(this.label12, "label12"); + this.label12.Name = "label12"; + // + // procNameTextBox + // + resources.ApplyResources(this.procNameTextBox, "procNameTextBox"); + this.procNameTextBox.Name = "procNameTextBox"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // historyTabPage + // + this.historyTabPage.Controls.Add(this.historyListViewEx); + resources.ApplyResources(this.historyTabPage, "historyTabPage"); + this.historyTabPage.Name = "historyTabPage"; + this.historyTabPage.UseVisualStyleBackColor = true; + // + // historyListViewEx + // + this.historyListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); + this.historyListViewEx.DoubleClickActivation = false; + this.historyListViewEx.FullRowSelect = true; + this.historyListViewEx.GridLines = true; + this.historyListViewEx.Name = "historyListViewEx"; + this.historyListViewEx.UseCompatibleStateImageBehavior = false; + this.historyListViewEx.View = System.Windows.Forms.View.Details; + // + // metrology1TabPage + // + this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); + resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); + this.metrology1TabPage.Name = "metrology1TabPage"; + this.metrology1TabPage.UseVisualStyleBackColor = true; + // + // metrology1ListViewEx + // + this.metrology1ListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); + this.metrology1ListViewEx.DoubleClickActivation = false; + this.metrology1ListViewEx.FullRowSelect = true; + this.metrology1ListViewEx.GridLines = true; + this.metrology1ListViewEx.Name = "metrology1ListViewEx"; + this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false; + this.metrology1ListViewEx.View = System.Windows.Forms.View.Details; + this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged); + // + // metrology2TabPage + // + this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); + resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); + this.metrology2TabPage.Name = "metrology2TabPage"; + this.metrology2TabPage.UseVisualStyleBackColor = true; + // + // metrology2ListViewEx + // + this.metrology2ListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); + this.metrology2ListViewEx.DoubleClickActivation = false; + this.metrology2ListViewEx.FullRowSelect = true; + this.metrology2ListViewEx.GridLines = true; + this.metrology2ListViewEx.Name = "metrology2ListViewEx"; + this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false; + this.metrology2ListViewEx.View = System.Windows.Forms.View.Details; + this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged); + // + // processTabPage + // + this.processTabPage.Controls.Add(this.processListViewEx); + resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Name = "processTabPage"; + this.processTabPage.UseVisualStyleBackColor = true; + // + // processListViewEx + // + this.processListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.processListViewEx, "processListViewEx"); + this.processListViewEx.DoubleClickActivation = false; + this.processListViewEx.FullRowSelect = true; + this.processListViewEx.GridLines = true; + this.processListViewEx.Name = "processListViewEx"; + this.processListViewEx.UseCompatibleStateImageBehavior = false; + this.processListViewEx.View = System.Windows.Forms.View.Details; + this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged); + // + // parametersTabPage + // + this.parametersTabPage.Controls.Add(this.parametersListViewEx); + resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); + this.parametersTabPage.Name = "parametersTabPage"; + this.parametersTabPage.UseVisualStyleBackColor = true; + // + // parametersListViewEx + // + this.parametersListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); + this.parametersListViewEx.DoubleClickActivation = false; + this.parametersListViewEx.FullRowSelect = true; + this.parametersListViewEx.GridLines = true; + this.parametersListViewEx.Name = "parametersListViewEx"; + this.parametersListViewEx.UseCompatibleStateImageBehavior = false; + this.parametersListViewEx.View = System.Windows.Forms.View.Details; + // + // sharedButtons + // + resources.ApplyResources(this.sharedButtons, "sharedButtons"); + this.sharedButtons.Name = "sharedButtons"; + // + // ProcedureDlg + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.mainSplitContainer); + this.Name = "ProcedureDlg"; + this.Load += new System.EventHandler(this.ProcedureDlg_Load); + this.mainSplitContainer.Panel1.ResumeLayout(false); + this.mainSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit(); + this.mainSplitContainer.ResumeLayout(false); + this.tabControl.ResumeLayout(false); + this.generalTabPage.ResumeLayout(false); + this.generalTabPage.PerformLayout(); + this.historyTabPage.ResumeLayout(false); + this.metrology1TabPage.ResumeLayout(false); + this.metrology2TabPage.ResumeLayout(false); + this.processTabPage.ResumeLayout(false); + this.parametersTabPage.ResumeLayout(false); + this.ResumeLayout(false); } @@ -570,8 +555,6 @@ namespace TBF private System.Windows.Forms.RadioButton metersKindRadioButton1; private System.Windows.Forms.TabPage parametersTabPage; private Results.Forms.ListViewEx parametersListViewEx; - private System.Windows.Forms.TextBox protocolTitleTextBox; - private System.Windows.Forms.Label protocolTitleLabel; private System.Windows.Forms.ComboBox fileWriter2ComboBox; private System.Windows.Forms.ComboBox fileWriter3ComboBox; private System.Windows.Forms.ComboBox printer2ComboBox; @@ -581,8 +564,8 @@ namespace TBF private System.Windows.Forms.CheckBox protectedCheckBox; private System.Windows.Forms.CheckBox manualControlDisabledCheckBox; private System.Windows.Forms.TextBox altProcNameTextBox; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label altProcNameLabel; private System.Windows.Forms.TextBox altProcPeriodTextBox; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label altProcPeriodLabel; } } \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index 974c4fd9f..6cff50467 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -301,10 +301,15 @@ namespace TBF PrepareMetrology12AndProcessTabs(); /// Disable controls in General tab +#if IPERL + altProcNameLabel.Visible = true; + altProcNameTextBox.Visible = true; + altProcPeriodLabel.Visible = true; + altProcPeriodTextBox.Visible = true; +#endif procNameTextBox.Enabled = false; descriptionTextBox.Enabled = false; watermetersTextBox.Enabled = false; - protocolTitleTextBox.Enabled = false; protectedCheckBox.Enabled = false; mustBeCompleteCheckBox.Enabled = false; manualControlDisabledCheckBox.Enabled = false; @@ -364,7 +369,6 @@ namespace TBF label15.Text = Strings.Date; label18.Text = Strings.Notes; watermetersLabel.Text = Strings.Meter_types_tested; - protocolTitleLabel.Text = Strings.Protocol_title; protectedCheckBox.Text = Strings.Protected_procedure; mustBeCompleteCheckBox.Text = Strings.All_tests_must_be_completed; manualControlDisabledCheckBox.Text = Strings.Manual_control_disabled; @@ -402,7 +406,6 @@ namespace TBF lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToString(); } watermetersTextBox.Text = LoadedProcedure.Watermeters; - protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle; protectedCheckBox.Checked = LoadedProcedure.Protected; mustBeCompleteCheckBox.Checked = LoadedProcedure.MustBeComplete; manualControlDisabledCheckBox.Checked = LoadedProcedure.ManualCtrlDisabled; @@ -456,7 +459,6 @@ namespace TBF LoadedProcedure.Description = descriptionTextBox.Text; LoadedProcedure.Watermeters = watermetersTextBox.Text; - LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text; LoadedProcedure.Protected = protectedCheckBox.Checked; LoadedProcedure.MustBeComplete = mustBeCompleteCheckBox.Checked; @@ -1560,7 +1562,6 @@ namespace TBF procNameTextBox.Enabled = true; descriptionTextBox.Enabled = true; watermetersTextBox.Enabled = true; - protocolTitleTextBox.Enabled = true; protectedCheckBox.Enabled = Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.Metrologists); mustBeCompleteCheckBox.Enabled = true; manualControlDisabledCheckBox.Enabled = true; diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index 4e7ee358d..041b97a61 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -130,7 +130,7 @@ 0, 0 - 636, 151 + 636, 128 34, 20 @@ -138,6 +138,9 @@ 19 + + False + altProcPeriodTextBox @@ -150,38 +153,41 @@ 0 - + True - + NoControl - - 502, 154 + + 502, 131 - + 116, 13 - + 18 - + Alternative proc. period - - label3 + + False - + + altProcPeriodLabel + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - + 1 - 148, 151 + 148, 128 217, 20 @@ -189,6 +195,9 @@ 17 + + False + altProcNameTextBox @@ -201,34 +210,37 @@ 2 - + True - + NoControl - - 20, 154 + + 20, 131 - + 113, 13 - + 16 - + Alternative proc. name - - label2 + + False - + + altProcNameLabel + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - + 3 @@ -238,7 +250,7 @@ NoControl - 505, 229 + 505, 197 138, 17 @@ -268,7 +280,7 @@ NoControl - 505, 208 + 505, 176 152, 17 @@ -298,7 +310,7 @@ NoControl - 505, 187 + 505, 155 123, 17 @@ -328,7 +340,7 @@ NoControl - 356, 228 + 356, 196 77, 17 @@ -352,7 +364,7 @@ 7 - 148, 358 + 148, 336 121, 21 @@ -373,7 +385,7 @@ 8 - 148, 335 + 148, 312 121, 21 @@ -394,7 +406,7 @@ 9 - 148, 266 + 148, 243 121, 21 @@ -415,7 +427,7 @@ 10 - 148, 312 + 148, 289 121, 21 @@ -435,57 +447,6 @@ 11 - - 148, 128 - - - 522, 20 - - - 15 - - - protocolTitleTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 12 - - - True - - - NoControl - - - 20, 131 - - - 65, 13 - - - 14 - - - Protocol title - - - protocolTitleLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 13 - True @@ -493,7 +454,7 @@ NoControl - 356, 207 + 356, 175 72, 17 @@ -514,7 +475,7 @@ generalTabPage - 14 + 12 True @@ -523,7 +484,7 @@ NoControl - 356, 186 + 356, 154 54, 17 @@ -544,10 +505,10 @@ generalTabPage - 15 + 13 - 148, 220 + 148, 197 121, 21 @@ -565,7 +526,7 @@ generalTabPage - 16 + 14 True @@ -574,7 +535,7 @@ NoControl - 20, 225 + 20, 202 63, 13 @@ -595,10 +556,10 @@ generalTabPage - 17 + 15 - 148, 197 + 148, 174 121, 21 @@ -616,7 +577,7 @@ generalTabPage - 18 + 16 True @@ -625,7 +586,7 @@ NoControl - 20, 200 + 20, 177 71, 13 @@ -646,10 +607,10 @@ generalTabPage - 19 + 17 - 148, 289 + 148, 266 121, 21 @@ -667,10 +628,10 @@ generalTabPage - 20 + 18 - 148, 243 + 148, 220 121, 21 @@ -688,10 +649,10 @@ generalTabPage - 21 + 19 - 148, 174 + 148, 151 121, 21 @@ -709,7 +670,7 @@ generalTabPage - 22 + 20 True @@ -718,7 +679,7 @@ NoControl - 20, 294 + 20, 271 70, 13 @@ -739,7 +700,7 @@ generalTabPage - 23 + 21 True @@ -748,7 +709,7 @@ NoControl - 20, 248 + 20, 225 42, 13 @@ -769,7 +730,7 @@ generalTabPage - 24 + 22 True @@ -778,7 +739,7 @@ NoControl - 21, 177 + 21, 154 57, 13 @@ -799,10 +760,10 @@ generalTabPage - 25 + 23 - 353, 266 + 353, 243 True @@ -823,7 +784,7 @@ generalTabPage - 26 + 24 True @@ -832,7 +793,7 @@ NoControl - 291, 266 + 291, 243 35, 13 @@ -853,7 +814,7 @@ generalTabPage - 27 + 25 148, 105 @@ -874,7 +835,7 @@ generalTabPage - 28 + 26 True @@ -904,7 +865,7 @@ generalTabPage - 29 + 27 362, 82 @@ -925,7 +886,7 @@ generalTabPage - 30 + 28 True @@ -955,7 +916,7 @@ generalTabPage - 31 + 29 148, 82 @@ -976,7 +937,7 @@ generalTabPage - 32 + 30 True @@ -1006,7 +967,7 @@ generalTabPage - 33 + 31 362, 59 @@ -1027,7 +988,7 @@ generalTabPage - 34 + 32 True @@ -1057,7 +1018,7 @@ generalTabPage - 35 + 33 148, 59 @@ -1078,7 +1039,7 @@ generalTabPage - 36 + 34 True @@ -1108,7 +1069,7 @@ generalTabPage - 37 + 35 148, 36 @@ -1129,7 +1090,7 @@ generalTabPage - 38 + 36 True @@ -1159,7 +1120,7 @@ generalTabPage - 39 + 37 148, 13 @@ -1180,7 +1141,7 @@ generalTabPage - 40 + 38 True @@ -1210,7 +1171,7 @@ generalTabPage - 41 + 39 4, 34 @@ -1219,7 +1180,7 @@ 3, 3, 3, 3 - 923, 389 + 923, 366 0 @@ -1246,7 +1207,7 @@ 3, 3 - 917, 358 + 917, 360 0 @@ -1255,7 +1216,7 @@ historyListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1270,7 +1231,7 @@ 3, 3, 3, 3 - 923, 364 + 923, 366 1 @@ -1297,7 +1258,7 @@ 3, 3 - 917, 358 + 917, 360 0 @@ -1306,7 +1267,7 @@ metrology1ListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1321,7 +1282,7 @@ 3, 3, 3, 3 - 923, 364 + 923, 366 2 @@ -1348,7 +1309,7 @@ 3, 3 - 917, 358 + 917, 360 0 @@ -1357,7 +1318,7 @@ metrology2ListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1372,7 +1333,7 @@ 3, 3, 3, 3 - 923, 364 + 923, 366 3 @@ -1399,7 +1360,7 @@ 3, 3 - 917, 358 + 917, 360 0 @@ -1408,7 +1369,7 @@ processListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null processTabPage @@ -1423,7 +1384,7 @@ 3, 3, 3, 3 - 923, 364 + 923, 366 4 @@ -1450,7 +1411,7 @@ 0, 0 - 923, 364 + 923, 366 0 @@ -1459,7 +1420,7 @@ parametersListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1471,7 +1432,7 @@ 4, 34 - 923, 364 + 923, 366 5 @@ -1501,7 +1462,7 @@ 0, 0 - 931, 427 + 931, 404 0 @@ -1543,7 +1504,7 @@ sharedButtons - TBF.UiControls.SharedButtons, TBF, Version=2.14.588.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.15.619.1, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 @@ -1564,7 +1525,7 @@ 1 - 1034, 427 + 1034, 404 931 @@ -1591,7 +1552,7 @@ 6, 13 - 1034, 427 + 1034, 404 CenterParent