From e02411d180f856bfd0ccfdf0363cdaf58cd8c427 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Wed, 25 Oct 2023 11:59:21 +0200
Subject: [PATCH] ProcedureDlg changes : wider ComboBox-es, PL language, etc.,
 ver. 2.33.2120

---
 TBF/Properties/AssemblyInfo.cs             |  4 +-
 TBF/UI/Procedures/ProcedureDlg.Designer.cs |  5 ++
 TBF/UI/Procedures/ProcedureDlg.cs          |  2 +-
 TBF/UI/Procedures/ProcedureDlg.resx        | 88 +++++++++++-----------
 TBF/UI/Procedures/ProceduresCtrl.cs        |  1 +
 Users/Resources/Strings.pl.resx            |  9 +++
 6 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 62d296cce..32be7d011 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.33.2113.0")]
-[assembly: AssemblyFileVersion("2.33.2113.0")]
+[assembly: AssemblyVersion("2.33.2121.0")]
+[assembly: AssemblyFileVersion("2.33.2121.0")]
diff --git a/TBF/UI/Procedures/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs
index 1824573d1..7e06c4e79 100644
--- a/TBF/UI/Procedures/ProcedureDlg.Designer.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs
@@ -594,6 +594,7 @@ namespace TBF.UI.Procedures
             this.historyListViewEx.DoubleClickActivation = false;
             this.historyListViewEx.FullRowSelect = true;
             this.historyListViewEx.GridLines = true;
+            this.historyListViewEx.HideSelection = false;
             this.historyListViewEx.Name = "historyListViewEx";
             this.historyListViewEx.UseCompatibleStateImageBehavior = false;
             this.historyListViewEx.View = System.Windows.Forms.View.Details;
@@ -613,6 +614,7 @@ namespace TBF.UI.Procedures
             this.metrology1ListViewEx.DoubleClickActivation = false;
             this.metrology1ListViewEx.FullRowSelect = true;
             this.metrology1ListViewEx.GridLines = true;
+            this.metrology1ListViewEx.HideSelection = false;
             this.metrology1ListViewEx.Name = "metrology1ListViewEx";
             this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false;
             this.metrology1ListViewEx.View = System.Windows.Forms.View.Details;
@@ -632,6 +634,7 @@ namespace TBF.UI.Procedures
             this.metrology2ListViewEx.DoubleClickActivation = false;
             this.metrology2ListViewEx.FullRowSelect = true;
             this.metrology2ListViewEx.GridLines = true;
+            this.metrology2ListViewEx.HideSelection = false;
             this.metrology2ListViewEx.Name = "metrology2ListViewEx";
             this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false;
             this.metrology2ListViewEx.View = System.Windows.Forms.View.Details;
@@ -651,6 +654,7 @@ namespace TBF.UI.Procedures
             this.processListViewEx.DoubleClickActivation = false;
             this.processListViewEx.FullRowSelect = true;
             this.processListViewEx.GridLines = true;
+            this.processListViewEx.HideSelection = false;
             this.processListViewEx.Name = "processListViewEx";
             this.processListViewEx.UseCompatibleStateImageBehavior = false;
             this.processListViewEx.View = System.Windows.Forms.View.Details;
@@ -670,6 +674,7 @@ namespace TBF.UI.Procedures
             this.parametersListViewEx.DoubleClickActivation = false;
             this.parametersListViewEx.FullRowSelect = true;
             this.parametersListViewEx.GridLines = true;
+            this.parametersListViewEx.HideSelection = false;
             this.parametersListViewEx.Name = "parametersListViewEx";
             this.parametersListViewEx.UseCompatibleStateImageBehavior = false;
             this.parametersListViewEx.View = System.Windows.Forms.View.Details;
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index a506158d2..479539720 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 #if LANG_PL
 #define SHOW_Q_TG
diff --git a/TBF/UI/Procedures/ProcedureDlg.resx b/TBF/UI/Procedures/ProcedureDlg.resx
index e6b8a33dd..df318cd7f 100644
--- a/TBF/UI/Procedures/ProcedureDlg.resx
+++ b/TBF/UI/Procedures/ProcedureDlg.resx
@@ -139,7 +139,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger3NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 409</value>
+    <value>475, 409</value>
   </data>
   <data name="eventTrigger3NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -175,7 +175,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 386</value>
+    <value>475, 386</value>
   </data>
   <data name="eventTrigger2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -211,7 +211,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 363</value>
+    <value>475, 363</value>
   </data>
   <data name="eventTrigger1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -247,7 +247,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter5NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 340</value>
+    <value>475, 340</value>
   </data>
   <data name="fileWriter5NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -283,7 +283,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter4NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 317</value>
+    <value>475, 317</value>
   </data>
   <data name="fileWriter4NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -319,7 +319,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter3NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 294</value>
+    <value>475, 294</value>
   </data>
   <data name="fileWriter3NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -355,7 +355,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 271</value>
+    <value>475, 271</value>
   </data>
   <data name="fileWriter2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -391,7 +391,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 248</value>
+    <value>475, 248</value>
   </data>
   <data name="fileWriter1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -427,7 +427,7 @@
     <value>NoControl</value>
   </data>
   <data name="printer2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 225</value>
+    <value>475, 225</value>
   </data>
   <data name="printer2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -463,7 +463,7 @@
     <value>NoControl</value>
   </data>
   <data name="printer1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 202</value>
+    <value>475, 202</value>
   </data>
   <data name="printer1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -499,7 +499,7 @@
     <value>NoControl</value>
   </data>
   <data name="transitionEndNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 179</value>
+    <value>475, 179</value>
   </data>
   <data name="transitionEndNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -535,7 +535,7 @@
     <value>NoControl</value>
   </data>
   <data name="transitionStartNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 156</value>
+    <value>475, 156</value>
   </data>
   <data name="transitionStartNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -571,7 +571,7 @@
     <value>NoControl</value>
   </data>
   <data name="dataEntryNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 133</value>
+    <value>475, 133</value>
   </data>
   <data name="dataEntryNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -631,7 +631,7 @@
     <value>188, 335</value>
   </data>
   <data name="fileWriter5ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter5ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>46</value>
@@ -652,7 +652,7 @@
     <value>188, 404</value>
   </data>
   <data name="eventTrigger3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger3ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>45</value>
@@ -673,7 +673,7 @@
     <value>188, 381</value>
   </data>
   <data name="eventTrigger2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>44</value>
@@ -694,7 +694,7 @@
     <value>188, 358</value>
   </data>
   <data name="eventTrigger1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>43</value>
@@ -745,7 +745,7 @@
     <value>False</value>
   </data>
   <data name="testProfileTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>550, 13</value>
+    <value>652, 13</value>
   </data>
   <data name="testProfileTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>217, 20</value>
@@ -772,7 +772,7 @@
     <value>NoControl</value>
   </data>
   <data name="testProfileLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>438, 16</value>
+    <value>540, 16</value>
   </data>
   <data name="testProfileLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>64, 13</value>
@@ -796,7 +796,7 @@
     <value>20</value>
   </data>
   <data name="altProcPeriodTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>733, 382</value>
+    <value>835, 382</value>
   </data>
   <data name="altProcPeriodTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 20</value>
@@ -826,7 +826,7 @@
     <value>NoControl</value>
   </data>
   <data name="altProcPeriodLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>450, 385</value>
+    <value>552, 385</value>
   </data>
   <data name="altProcPeriodLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>116, 13</value>
@@ -853,7 +853,7 @@
     <value>22</value>
   </data>
   <data name="altProcNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>550, 358</value>
+    <value>652, 358</value>
   </data>
   <data name="altProcNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>217, 20</value>
@@ -883,7 +883,7 @@
     <value>NoControl</value>
   </data>
   <data name="altProcNameLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>450, 360</value>
+    <value>552, 360</value>
   </data>
   <data name="altProcNameLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>84, 13</value>
@@ -916,7 +916,7 @@
     <value>NoControl</value>
   </data>
   <data name="manualControlDisabledCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 181</value>
+    <value>695, 181</value>
   </data>
   <data name="manualControlDisabledCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 17</value>
@@ -946,7 +946,7 @@
     <value>NoControl</value>
   </data>
   <data name="mustBeCompleteCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 160</value>
+    <value>695, 160</value>
   </data>
   <data name="mustBeCompleteCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 17</value>
@@ -976,7 +976,7 @@
     <value>NoControl</value>
   </data>
   <data name="protectedCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 139</value>
+    <value>695, 139</value>
   </data>
   <data name="protectedCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>123, 17</value>
@@ -1006,7 +1006,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 180</value>
+    <value>546, 180</value>
   </data>
   <data name="metersKindRadioButton3.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 17</value>
@@ -1033,7 +1033,7 @@
     <value>188, 312</value>
   </data>
   <data name="fileWriter4ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter4ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>29</value>
@@ -1054,7 +1054,7 @@
     <value>188, 289</value>
   </data>
   <data name="fileWriter3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter3ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>28</value>
@@ -1075,7 +1075,7 @@
     <value>188, 220</value>
   </data>
   <data name="printer2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="printer2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
@@ -1096,7 +1096,7 @@
     <value>188, 266</value>
   </data>
   <data name="fileWriter2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
@@ -1120,7 +1120,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 159</value>
+    <value>546, 159</value>
   </data>
   <data name="metersKindRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 17</value>
@@ -1150,7 +1150,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 138</value>
+    <value>546, 138</value>
   </data>
   <data name="metersKindRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 17</value>
@@ -1177,7 +1177,7 @@
     <value>188, 174</value>
   </data>
   <data name="transitionEndComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="transitionEndComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -1228,7 +1228,7 @@
     <value>188, 151</value>
   </data>
   <data name="transitionStartComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="transitionStartComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -1279,7 +1279,7 @@
     <value>188, 243</value>
   </data>
   <data name="fileWriter1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
@@ -1300,7 +1300,7 @@
     <value>188, 197</value>
   </data>
   <data name="printer1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="printer1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -1321,7 +1321,7 @@
     <value>188, 128</value>
   </data>
   <data name="dataEntryComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="dataEntryComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -1429,7 +1429,7 @@
     <value>44</value>
   </data>
   <data name="notesTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>402, 220</value>
+    <value>504, 220</value>
   </data>
   <data name="notesTextBox.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1459,7 +1459,7 @@
     <value>NoControl</value>
   </data>
   <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>399, 202</value>
+    <value>501, 202</value>
   </data>
   <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
     <value>35, 13</value>
@@ -1486,7 +1486,7 @@
     <value>188, 105</value>
   </data>
   <data name="watermetersTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>579, 20</value>
+    <value>681, 20</value>
   </data>
   <data name="watermetersTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -1741,7 +1741,7 @@
     <value>188, 36</value>
   </data>
   <data name="descriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>579, 20</value>
+    <value>681, 20</value>
   </data>
   <data name="descriptionTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1792,7 +1792,7 @@
     <value>188, 13</value>
   </data>
   <data name="procNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 20</value>
+    <value>317, 20</value>
   </data>
   <data name="procNameTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2170,7 +2170,7 @@
     <value>sharedButtons</value>
   </data>
   <data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
-    <value>TBF.UI.Shared.SharedButtons, TBF, Version=2.32.2027.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Shared.SharedButtons, TBF, Version=2.33.2119.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
     <value>mainSplitContainer.Panel2</value>
diff --git a/TBF/UI/Procedures/ProceduresCtrl.cs b/TBF/UI/Procedures/ProceduresCtrl.cs
index 5881ae08f..5fd46ff48 100644
--- a/TBF/UI/Procedures/ProceduresCtrl.cs
+++ b/TBF/UI/Procedures/ProceduresCtrl.cs
@@ -846,6 +846,7 @@ namespace TBF.UI.Procedures
             newProcedure.ObtainedByCopy = false;
             newProcedure.CreationUser = Users.CurrentUser.UserName();
             newProcedure.CreationTime = DateTime.Now;
+            newProcedure.ResultsPrinter = dlg.SelectedProfile.Name;
 
             if (new ProcedureDlg(Session, newProcedure, GetUsedNames(false), ProcedureDlg.Mode.Unlocked, parent).ShowDialog() == DialogResult.OK)
             {
diff --git a/Users/Resources/Strings.pl.resx b/Users/Resources/Strings.pl.resx
index 14ca0a44d..e51d536e6 100644
--- a/Users/Resources/Strings.pl.resx
+++ b/Users/Resources/Strings.pl.resx
@@ -205,4 +205,13 @@
   <data name="tester" xml:space="preserve">
     <value>Pracownik przeprowadzający testy</value>
   </data>
+  <data name="metrological_authority" xml:space="preserve">
+    <value>Metrological authority</value>
+  </data>
+  <data name="production_tracing_administrator" xml:space="preserve">
+    <value>Production tracing administrator</value>
+  </data>
+  <data name="water_meter_authority" xml:space="preserve">
+    <value>Water meter authority</value>
+  </data>
 </root>
\ No newline at end of file