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

(1) Closing iPerlCommunicationForm fixed once again, (2) Czech translations fixed.

Browse Source
This commit is contained in:
Milan Hanajik 2018-09-18 15:23:49 +02:00
parent aeefac1d4e
commit 49cc584914
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -257,6 +257,9 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
public bool Completed { get { return formCompleted; } }
bool formCompleted;
bool forcedClose; /// Set in the forced close handler
/// <summary> Number of text boxes for serial numbers </summary>
public int WaterMetersCount;
@ -659,6 +662,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
AllCompletedHandler = null;
stopWorkerThreads = true;
forcedClose = true;
DialogResult = DialogResult.Cancel;
Close();
@ -2019,7 +2023,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
private void iPerlCommunicationForm_FormClosing(object sender, FormClosingEventArgs e)
{
if ((e.CloseReason == CloseReason.UserClosing) && !checkBoxesEditMode)
if (!forcedClose && !formCompleted && !checkBoxesEditMode)
{
e.Cancel = true;
}

4
TBF/Resources/Strings.cs.resx
View File

@ -358,7 +358,7 @@
<value>Vyprázdnění</value>
</data>
<data name="Emptying_i_n" xml:space="preserve">
<value>Vyprazdňování ({0}: Krok {1} / {2})</value>
<value>Vypouštění ({0}: Krok {1} / {2})</value>
</data>
<data name="Emptying_tank" xml:space="preserve">
<value>Vyprázdnění nádrže</value>
@ -715,7 +715,7 @@
<value>Vyplachování</value>
</data>
<data name="Purging_i_n" xml:space="preserve">
<value>Vypouštění ({0}: Krok {1} / {2})</value>
<value>Napouštění ({0}: Krok {1} / {2})</value>
</data>
<data name="Purchase_order" xml:space="preserve">
<value>Objednávka</value>