michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) ResultConfigDlg does not close on Enter, (2) wider 'purchase order' field in PreviousresultsCtrl, ver.2.7.307

Browse Source
This commit is contained in:
Milan Hanajik
2016-06-16 17:28:31 +02:00
parent 1337fff2dc
commit 4b8f9e031e
10 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Forms/ResultsConfigDlg.cs
+6
View File
@@ -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();
}
}
}
Results/Forms/ResultsConfigDlg.designer.cs
Generated
+4 -5
View File
@@ -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);
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs
Generated
+3 -3
View File
@@ -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;
TestBenchFramework/Forms/PreviousResultCtrl.cs
+1 -1
View File
@@ -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);
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
TestBenchFramework/Resources/Strings.Designer.cs
Generated
+9
View File
@@ -2157,6 +2157,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to PO.
/// </summary>
internal static string PO {
get {
return ResourceManager.GetString("PO", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Power [%].
/// </summary>
TestBenchFramework/Resources/Strings.cs.resx
+3
View File
@@ -1212,4 +1212,7 @@
<data name="Enter_water_meter_data" xml:space="preserve">
<value>Zadejte údaje o vodoměrech</value>
</data>
<data name="PO" xml:space="preserve">
<value>Obj.</value>
</data>
</root>
TestBenchFramework/Resources/Strings.de.resx
+3
View File
@@ -1248,4 +1248,7 @@
<data name="RenameTabBtnText" xml:space="preserve">
<value>Tabelle umbenennen</value>
</data>
<data name="PO" xml:space="preserve">
<value>Best.</value>
</data>
</root>
TestBenchFramework/Resources/Strings.resx
+3
View File
@@ -1417,4 +1417,7 @@
<data name="Sensus_production_extensions" xml:space="preserve">
<value>Sensus production extensions</value>
</data>
<data name="PO" xml:space="preserve">
<value>PO</value>
</data>
</root>