diff --git a/TBF/UI/Procedures/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs
index 7e06c4e79..5ebf9590c 100644
--- a/TBF/UI/Procedures/ProcedureDlg.Designer.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs
@@ -35,6 +35,8 @@ namespace TBF.UI.Procedures
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.generalTabPage = new System.Windows.Forms.TabPage();
+ this.printer3NokLabel = new System.Windows.Forms.Label();
+ this.printer3ComboBox = new System.Windows.Forms.ComboBox();
this.eventTrigger3NokLabel = new System.Windows.Forms.Label();
this.eventTrigger2NokLabel = new System.Windows.Forms.Label();
this.eventTrigger1NokLabel = new System.Windows.Forms.Label();
@@ -149,6 +151,8 @@ namespace TBF.UI.Procedures
//
// generalTabPage
//
+ this.generalTabPage.Controls.Add(this.printer3NokLabel);
+ this.generalTabPage.Controls.Add(this.printer3ComboBox);
this.generalTabPage.Controls.Add(this.eventTrigger3NokLabel);
this.generalTabPage.Controls.Add(this.eventTrigger2NokLabel);
this.generalTabPage.Controls.Add(this.eventTrigger1NokLabel);
@@ -214,6 +218,20 @@ namespace TBF.UI.Procedures
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.UseVisualStyleBackColor = true;
//
+ // printer3NokLabel
+ //
+ resources.ApplyResources(this.printer3NokLabel, "printer3NokLabel");
+ this.printer3NokLabel.ForeColor = System.Drawing.Color.Red;
+ this.printer3NokLabel.Name = "printer3NokLabel";
+ //
+ // printer3ComboBox
+ //
+ this.printer3ComboBox.FormattingEnabled = true;
+ resources.ApplyResources(this.printer3ComboBox, "printer3ComboBox");
+ this.printer3ComboBox.Name = "printer3ComboBox";
+ this.printer3ComboBox.SelectedIndexChanged += new System.EventHandler(this.printer3ComboBox_SelectedIndexChanged);
+ this.printer3ComboBox.TextChanged += new System.EventHandler(this.printer3ComboBox_TextChanged);
+ //
// eventTrigger3NokLabel
//
resources.ApplyResources(this.eventTrigger3NokLabel, "eventTrigger3NokLabel");
@@ -785,5 +803,7 @@ namespace TBF.UI.Procedures
private System.Windows.Forms.Label transitionStartNokLabel;
private System.Windows.Forms.Label dataEntryNokLabel;
private System.Windows.Forms.Label label2;
- }
+ private System.Windows.Forms.Label printer3NokLabel;
+ private System.Windows.Forms.ComboBox printer3ComboBox;
+ }
}
\ No newline at end of file
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 479539720..0d5ef9048 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -154,6 +154,7 @@ namespace TBF.UI.Procedures
dataEntryComboBox.Items.Add("---");
printer1ComboBox.Items.Add("---");
printer2ComboBox.Items.Add("---");
+ printer3ComboBox.Items.Add("---");
fileWriter1ComboBox.Items.Add("---");
fileWriter2ComboBox.Items.Add("---");
fileWriter3ComboBox.Items.Add("---");
@@ -173,6 +174,7 @@ namespace TBF.UI.Procedures
{
printer1ComboBox.Items.Add(cmpnt.Cfg.Name);
printer2ComboBox.Items.Add(cmpnt.Cfg.Name);
+ printer3ComboBox.Items.Add(cmpnt.Cfg.Name);
}
if (cmpnt is IResultsWriter)
{
@@ -378,6 +380,7 @@ namespace TBF.UI.Procedures
transitionEndComboBox.Enabled = false;
printer1ComboBox.Enabled = false;
printer2ComboBox.Enabled = false;
+ printer3ComboBox.Enabled = false;
fileWriter1ComboBox.Enabled = false;
fileWriter2ComboBox.Enabled = false;
fileWriter3ComboBox.Enabled = false;
@@ -521,13 +524,15 @@ namespace TBF.UI.Procedures
{
printer1ComboBox.Text = "---";
printer2ComboBox.Text = "---";
- }
- else
+ printer3ComboBox.Text = "---";
+ }
+ else
{
string[] fields = LoadedProcedure.ResultsPrinter.Split(new char[] { '~' });
printer1ComboBox.Text = fields[0];
- printer2ComboBox.Text = (fields.Length == 2) ? fields[1] : "---";
- }
+ printer2ComboBox.Text = (fields.Length >= 2) ? fields[1] : "---";
+ printer3ComboBox.Text = (fields.Length >= 3) ? fields[2] : "---";
+ }
if (string.IsNullOrEmpty(LoadedProcedure.ResultsWriter))
{
@@ -601,16 +606,35 @@ namespace TBF.UI.Procedures
///
/// Printers
///
- if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) && printer2ComboBox.Items.Contains(printer2ComboBox.Text))
+ if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) &&
+ printer2ComboBox.Items.Contains(printer2ComboBox.Text) &&
+ printer3ComboBox.Items.Contains(printer3ComboBox.Text))
{
- bool pr = !printer1ComboBox.Text.Equals("---");
- bool pr2 = !printer2ComboBox.Text.Equals("---") && !printer2ComboBox.Text.Equals(printer1ComboBox.Text);
+ bool first = true;
+ StringBuilder sb = new StringBuilder();
+ if (!printer1ComboBox.Text.Equals("---"))
+ {
+ sb.Append(printer1ComboBox.Text);
+ first = false;
+ }
- if (!pr && !pr2) LoadedProcedure.ResultsPrinter = string.Empty;
- else if (pr && !pr2) LoadedProcedure.ResultsPrinter = printer1ComboBox.Text;
- else if (!pr && pr2) LoadedProcedure.ResultsPrinter = printer2ComboBox.Text;
- else LoadedProcedure.ResultsPrinter = printer1ComboBox.Text + '~' + printer2ComboBox.Text;
- }
+ if (!printer2ComboBox.Text.Equals("---") && !printer2ComboBox.Text.Equals(printer1ComboBox.Text))
+ {
+ if (!first) sb.Append("~");
+ sb.Append(printer2ComboBox.Text);
+ first = false;
+ }
+
+ if (!printer3ComboBox.Text.Equals("---") && !printer3ComboBox.Text.Equals(printer1ComboBox.Text)
+ && !printer3ComboBox.Text.Equals(printer2ComboBox.Text))
+ {
+ if (!first) sb.Append("~");
+ sb.Append(printer3ComboBox.Text);
+ first = false;
+ }
+
+ LoadedProcedure.ResultsPrinter = sb.ToString();
+ }
///
/// File writers
@@ -2208,6 +2232,7 @@ namespace TBF.UI.Procedures
#endif
printer1ComboBox.Enabled = true;
printer2ComboBox.Enabled = true;
+ printer3ComboBox.Enabled = true;
fileWriter1ComboBox.Enabled = true;
fileWriter2ComboBox.Enabled = true;
fileWriter3ComboBox.Enabled = true;
@@ -3183,6 +3208,7 @@ namespace TBF.UI.Procedures
private void transitionEndComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void printer1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void printer2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
+ private void printer3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
@@ -3197,6 +3223,7 @@ namespace TBF.UI.Procedures
private void transitionEndComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void printer1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void printer2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
+ private void printer3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
private void fileWriter3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
@@ -3213,6 +3240,7 @@ namespace TBF.UI.Procedures
transitionEndNokLabel.Visible = !transitionEndComboBox.Items.Contains(transitionEndComboBox.Text);
printer1NokLabel.Visible = !printer1ComboBox.Items.Contains(printer1ComboBox.Text);
printer2NokLabel.Visible = !printer2ComboBox.Items.Contains(printer2ComboBox.Text);
+ printer3NokLabel.Visible = !printer3ComboBox.Items.Contains(printer3ComboBox.Text);
fileWriter1NokLabel.Visible = !fileWriter1ComboBox.Items.Contains(fileWriter1ComboBox.Text);
fileWriter2NokLabel.Visible = !fileWriter2ComboBox.Items.Contains(fileWriter2ComboBox.Text);
fileWriter3NokLabel.Visible = !fileWriter3ComboBox.Items.Contains(fileWriter3ComboBox.Text);
diff --git a/TBF/UI/Procedures/ProcedureDlg.resx b/TBF/UI/Procedures/ProcedureDlg.resx
index df318cd7f..473f36fb0 100644
--- a/TBF/UI/Procedures/ProcedureDlg.resx
+++ b/TBF/UI/Procedures/ProcedureDlg.resx
@@ -129,6 +129,63 @@
0, 0
+
+ True
+
+
+ Microsoft Sans Serif, 8.25pt, style=Bold
+
+
+ NoControl
+
+
+ 475, 248
+
+
+ 11, 13
+
+
+ 62
+
+
+ !
+
+
+ False
+
+
+ printer3NokLabel
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ generalTabPage
+
+
+ 0
+
+
+ 188, 243
+
+
+ 282, 21
+
+
+ 61
+
+
+ printer3ComboBox
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ generalTabPage
+
+
+ 1
+
True
@@ -139,7 +196,7 @@
NoControl
- 475, 409
+ 475, 432
11, 13
@@ -163,7 +220,7 @@
generalTabPage
- 0
+ 2
True
@@ -175,7 +232,7 @@
NoControl
- 475, 386
+ 475, 409
11, 13
@@ -199,7 +256,7 @@
generalTabPage
- 1
+ 3
True
@@ -211,7 +268,7 @@
NoControl
- 475, 363
+ 475, 386
11, 13
@@ -235,7 +292,7 @@
generalTabPage
- 2
+ 4
True
@@ -247,7 +304,7 @@
NoControl
- 475, 340
+ 475, 363
11, 13
@@ -271,7 +328,7 @@
generalTabPage
- 3
+ 5
True
@@ -283,7 +340,7 @@
NoControl
- 475, 317
+ 475, 340
11, 13
@@ -307,7 +364,7 @@
generalTabPage
- 4
+ 6
True
@@ -319,7 +376,7 @@
NoControl
- 475, 294
+ 475, 317
11, 13
@@ -343,7 +400,7 @@
generalTabPage
- 5
+ 7
True
@@ -355,7 +412,7 @@
NoControl
- 475, 271
+ 475, 294
11, 13
@@ -379,7 +436,7 @@
generalTabPage
- 6
+ 8
True
@@ -391,7 +448,7 @@
NoControl
- 475, 248
+ 475, 271
11, 13
@@ -415,7 +472,7 @@
generalTabPage
- 7
+ 9
True
@@ -451,7 +508,7 @@
generalTabPage
- 8
+ 10
True
@@ -487,7 +544,7 @@
generalTabPage
- 9
+ 11
True
@@ -523,7 +580,7 @@
generalTabPage
- 10
+ 12
True
@@ -559,7 +616,7 @@
generalTabPage
- 11
+ 13
True
@@ -595,7 +652,7 @@
generalTabPage
- 12
+ 14
True
@@ -625,10 +682,10 @@
generalTabPage
- 13
+ 15
- 188, 335
+ 188, 358
282, 21
@@ -646,10 +703,10 @@
generalTabPage
- 14
+ 16
- 188, 404
+ 188, 427
282, 21
@@ -667,10 +724,10 @@
generalTabPage
- 15
+ 17
- 188, 381
+ 188, 404
282, 21
@@ -688,10 +745,10 @@
generalTabPage
- 16
+ 18
- 188, 358
+ 188, 381
282, 21
@@ -709,7 +766,7 @@
generalTabPage
- 17
+ 19
True
@@ -718,7 +775,7 @@
NoControl
- 20, 364
+ 20, 387
72, 13
@@ -739,7 +796,7 @@
generalTabPage
- 18
+ 20
False
@@ -763,7 +820,7 @@
generalTabPage
- 19
+ 21
True
@@ -793,7 +850,7 @@
generalTabPage
- 20
+ 22
835, 382
@@ -817,7 +874,7 @@
generalTabPage
- 21
+ 23
True
@@ -850,7 +907,7 @@
generalTabPage
- 22
+ 24
652, 358
@@ -874,7 +931,7 @@
generalTabPage
- 23
+ 25
True
@@ -907,7 +964,7 @@
generalTabPage
- 24
+ 26
True
@@ -937,7 +994,7 @@
generalTabPage
- 25
+ 27
True
@@ -967,7 +1024,7 @@
generalTabPage
- 26
+ 28
True
@@ -997,7 +1054,7 @@
generalTabPage
- 27
+ 29
True
@@ -1027,10 +1084,10 @@
generalTabPage
- 28
+ 30
- 188, 312
+ 188, 335
282, 21
@@ -1048,10 +1105,10 @@
generalTabPage
- 29
+ 31
- 188, 289
+ 188, 312
282, 21
@@ -1069,7 +1126,7 @@
generalTabPage
- 30
+ 32
188, 220
@@ -1090,10 +1147,10 @@
generalTabPage
- 31
+ 33
- 188, 266
+ 188, 289
282, 21
@@ -1111,7 +1168,7 @@
generalTabPage
- 32
+ 34
True
@@ -1141,7 +1198,7 @@
generalTabPage
- 33
+ 35
True
@@ -1171,7 +1228,7 @@
generalTabPage
- 34
+ 36
188, 174
@@ -1192,7 +1249,7 @@
generalTabPage
- 35
+ 37
True
@@ -1222,7 +1279,7 @@
generalTabPage
- 36
+ 38
188, 151
@@ -1243,7 +1300,7 @@
generalTabPage
- 37
+ 39
True
@@ -1273,10 +1330,10 @@
generalTabPage
- 38
+ 40
- 188, 243
+ 188, 266
282, 21
@@ -1294,7 +1351,7 @@
generalTabPage
- 39
+ 41
188, 197
@@ -1315,7 +1372,7 @@
generalTabPage
- 40
+ 42
188, 128
@@ -1336,7 +1393,7 @@
generalTabPage
- 41
+ 43
True
@@ -1345,7 +1402,7 @@
NoControl
- 20, 248
+ 20, 271
56, 13
@@ -1366,7 +1423,7 @@
generalTabPage
- 42
+ 44
True
@@ -1396,7 +1453,7 @@
generalTabPage
- 43
+ 45
True
@@ -1426,7 +1483,7 @@
generalTabPage
- 44
+ 46
504, 220
@@ -1450,7 +1507,7 @@
generalTabPage
- 45
+ 47
True
@@ -1480,7 +1537,7 @@
generalTabPage
- 46
+ 48
188, 105
@@ -1501,7 +1558,7 @@
generalTabPage
- 47
+ 49
True
@@ -1531,7 +1588,7 @@
generalTabPage
- 48
+ 50
402, 82
@@ -1552,7 +1609,7 @@
generalTabPage
- 49
+ 51
True
@@ -1582,7 +1639,7 @@
generalTabPage
- 50
+ 52
188, 82
@@ -1603,7 +1660,7 @@
generalTabPage
- 51
+ 53
True
@@ -1633,7 +1690,7 @@
generalTabPage
- 52
+ 54
402, 59
@@ -1654,7 +1711,7 @@
generalTabPage
- 53
+ 55
True
@@ -1684,7 +1741,7 @@
generalTabPage
- 54
+ 56
188, 59
@@ -1705,7 +1762,7 @@
generalTabPage
- 55
+ 57
True
@@ -1735,7 +1792,7 @@
generalTabPage
- 56
+ 58
188, 36
@@ -1756,7 +1813,7 @@
generalTabPage
- 57
+ 59
True
@@ -1786,7 +1843,7 @@
generalTabPage
- 58
+ 60
188, 13
@@ -1807,7 +1864,7 @@
generalTabPage
- 59
+ 61
True
@@ -1837,7 +1894,7 @@
generalTabPage
- 60
+ 62
4, 34
@@ -1846,7 +1903,7 @@
3, 3, 3, 3
- 923, 433
+ 923, 456
0
@@ -1873,7 +1930,7 @@
3, 3
- 917, 427
+ 917, 450
0
@@ -1897,7 +1954,7 @@
3, 3, 3, 3
- 923, 433
+ 923, 456
1
@@ -1924,7 +1981,7 @@
3, 3
- 917, 427
+ 917, 450
0
@@ -1948,7 +2005,7 @@
3, 3, 3, 3
- 923, 433
+ 923, 456
2
@@ -1975,7 +2032,7 @@
3, 3
- 917, 427
+ 917, 450
0
@@ -1999,7 +2056,7 @@
3, 3, 3, 3
- 923, 433
+ 923, 456
3
@@ -2026,7 +2083,7 @@
3, 3
- 917, 427
+ 917, 450
0
@@ -2050,7 +2107,7 @@
3, 3, 3, 3
- 923, 433
+ 923, 456
4
@@ -2077,7 +2134,7 @@
0, 0
- 923, 433
+ 923, 456
0
@@ -2098,7 +2155,7 @@
4, 34
- 923, 433
+ 923, 456
5
@@ -2128,7 +2185,7 @@
0, 0
- 931, 471
+ 931, 494
0
@@ -2170,7 +2227,7 @@
sharedButtons
- TBF.UI.Shared.SharedButtons, TBF, Version=2.33.2119.0, Culture=neutral, PublicKeyToken=null
+ TBF.UI.Shared.SharedButtons, TBF, Version=2.33.2127.0, Culture=neutral, PublicKeyToken=null
mainSplitContainer.Panel2
@@ -2191,7 +2248,7 @@
1
- 1034, 471
+ 1034, 494
931
@@ -2218,7 +2275,7 @@
6, 13
- 1034, 471
+ 1034, 494
CenterParent