From 4b8f9e031eb6974b93f19fbfd7ef9381a1a94dad Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 16 Jun 2016 17:28:31 +0200 Subject: [PATCH] (1) ResultConfigDlg does not close on Enter, (2) wider 'purchase order' field in PreviousresultsCtrl, ver.2.7.307 --- Results/Forms/ResultsConfigDlg.cs | 6 ++++++ Results/Forms/ResultsConfigDlg.designer.cs | 9 ++++----- Results/Properties/AssemblyInfo.cs | 4 ++-- TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs | 6 +++--- TestBenchFramework/Forms/PreviousResultCtrl.cs | 2 +- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- TestBenchFramework/Resources/Strings.Designer.cs | 9 +++++++++ TestBenchFramework/Resources/Strings.cs.resx | 3 +++ TestBenchFramework/Resources/Strings.de.resx | 3 +++ TestBenchFramework/Resources/Strings.resx | 3 +++ 10 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Results/Forms/ResultsConfigDlg.cs b/Results/Forms/ResultsConfigDlg.cs index 28f2fa6de..63a686afa 100644 --- a/Results/Forms/ResultsConfigDlg.cs +++ b/Results/Forms/ResultsConfigDlg.cs @@ -340,5 +340,11 @@ namespace Results.Forms selectedResultsListViewEx.Items[selIdx + 1].Selected = true; selectedResultsListViewEx.Items[selIdx + 1].EnsureVisible(); } + + private void cancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } } } diff --git a/Results/Forms/ResultsConfigDlg.designer.cs b/Results/Forms/ResultsConfigDlg.designer.cs index cabe108dd..811b5620f 100644 --- a/Results/Forms/ResultsConfigDlg.designer.cs +++ b/Results/Forms/ResultsConfigDlg.designer.cs @@ -39,7 +39,7 @@ namespace Results.Forms this.removeAllButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button(); this.addButton = new System.Windows.Forms.Button(); - this.selectedResultsListViewEx = new ListViewEx(); + this.selectedResultsListViewEx = new Results.Forms.ListViewEx(); this.upButton = new System.Windows.Forms.Button(); this.downButton = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -63,6 +63,7 @@ namespace Results.Forms this.cancelButton.TabIndex = 5; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; + this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // availableResultsListBox // @@ -132,8 +133,8 @@ namespace Results.Forms this.selectedResultsListViewEx.TabIndex = 47; this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false; this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details; - this.selectedResultsListViewEx.SubItemClicked += new SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); - this.selectedResultsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); + this.selectedResultsListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); + this.selectedResultsListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); // // upButton // @@ -157,10 +158,8 @@ namespace Results.Forms // // ResultsConfigDlg // - this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(893, 445); this.Controls.Add(this.downButton); this.Controls.Add(this.upButton); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 2760aaef6..8d651d664 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.306.0")] -[assembly: AssemblyFileVersion("2.7.306.0")] +[assembly: AssemblyVersion("2.7.307.0")] +[assembly: AssemblyFileVersion("2.7.307.0")] diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs b/TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs index e594135b9..3d23e8dbe 100644 --- a/TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs +++ b/TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs @@ -81,7 +81,7 @@ // purchaseOrderLabel // this.purchaseOrderLabel.AutoSize = true; - this.purchaseOrderLabel.Location = new System.Drawing.Point(490, 7); + this.purchaseOrderLabel.Location = new System.Drawing.Point(481, 7); this.purchaseOrderLabel.Name = "purchaseOrderLabel"; this.purchaseOrderLabel.Size = new System.Drawing.Size(77, 13); this.purchaseOrderLabel.TabIndex = 11; @@ -90,7 +90,7 @@ // procedureLabel // this.procedureLabel.AutoSize = true; - this.procedureLabel.Location = new System.Drawing.Point(334, 7); + this.procedureLabel.Location = new System.Drawing.Point(328, 7); this.procedureLabel.Name = "procedureLabel"; this.procedureLabel.Size = new System.Drawing.Size(55, 13); this.procedureLabel.TabIndex = 10; @@ -99,7 +99,7 @@ // endTimeLabel // this.endTimeLabel.AutoSize = true; - this.endTimeLabel.Location = new System.Drawing.Point(188, 7); + this.endTimeLabel.Location = new System.Drawing.Point(185, 7); this.endTimeLabel.Name = "endTimeLabel"; this.endTimeLabel.Size = new System.Drawing.Size(48, 13); this.endTimeLabel.TabIndex = 9; diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.cs b/TestBenchFramework/Forms/PreviousResultCtrl.cs index 3286bce0b..27c599cea 100644 --- a/TestBenchFramework/Forms/PreviousResultCtrl.cs +++ b/TestBenchFramework/Forms/PreviousResultCtrl.cs @@ -45,7 +45,7 @@ namespace TBF.Forms startTimeLabel.Text = string.Format("{0} {1}", StarTime.ToShortDateString(), StarTime.ToShortTimeString()); endTimeLabel.Text = string.Format("{0} {1}", EndTime.ToShortDateString(), EndTime.ToShortTimeString()); procedureLabel.Text = ProcedureName; - purchaseOrderLabel.Text = string.Format("{0}: {1}", Strings.Purchase_order, PurchaseOrder); + purchaseOrderLabel.Text = string.Format("{0}: {1}", Strings.PO, PurchaseOrder); passedCountLabel.Text = string.Format("{0}: {1}", Strings.Passed, PassedCount); failedCountLabel.Text = string.Format("{0}: {1}", Strings.Failed, FailedCount); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index bc59ba8f6..20c8ffdcb 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.7.306.1")] -[assembly: AssemblyFileVersion("2.7.306.1")] +[assembly: AssemblyVersion("2.7.307.1")] +[assembly: AssemblyFileVersion("2.7.307.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 29753b143..ac4283c73 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -2157,6 +2157,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to PO. + /// + internal static string PO { + get { + return ResourceManager.GetString("PO", resourceCulture); + } + } + /// /// Looks up a localized string similar to Power [%]. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index 63487d2f2..456d4b391 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -1212,4 +1212,7 @@ Zadejte údaje o vodoměrech + + Obj. + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 34618fc72..3c6083a83 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1248,4 +1248,7 @@ Tabelle umbenennen + + Best. + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 2e40e27f9..e776f7b9d 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1417,4 +1417,7 @@ Sensus production extensions + + PO + \ No newline at end of file