From 8318ed33e13a980b71d5145a906e3b4671975453 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 9 Nov 2023 16:52:01 +0100 Subject: [PATCH] OnePerMeter : Alignment --- .../OnePerMeter/OnePerMeterPrintDocument.cs | 10 +- .../OnePerMeter/OnePerMeterPrinterCfg.cs | 1 + .../Output/Printers/OnePerMeter/Printer.cs | 2 + .../Output/Printers/OnePerMeter/PrinterCfg.cs | 1 + .../OnePerMeter/PrinterCfgCtrl.Designer.cs | 461 +++++++++++------- .../Printers/OnePerMeter/PrinterCfgCtrl.cs | 32 +- 6 files changed, 320 insertions(+), 187 deletions(-) diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs index 8678b50cc..d09139fda 100644 --- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs +++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs @@ -313,7 +313,15 @@ namespace Results.Output.Printers.OnePerMeter } SizeF size = table.Measure(e); - float tableLeft = (float)leftMargin + ((float)printWidth - size.Width) / 2; + float sideMargin = (printWidth - size.Width) / 2; + float tableLeft; + switch (cfg.Alignment) + { + case Alignment.Left: tableLeft = leftMargin; break; + default: + case Alignment.Center: tableLeft = leftMargin + sideMargin; break; + case Alignment.Right: tableLeft = leftMargin + 2 * sideMargin; break; + } belowTop = table.Draw(e, tableLeft, tableTop); if (pageNr == nrPages) diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs index e5fb8050b..4a565f997 100644 --- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs +++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs @@ -34,6 +34,7 @@ namespace Results.Output.Printers.OnePerMeter public string[] CommonItems2; public string[] CommonItems3; public Common.TableForm Form; + public Common.Alignment Alignment; public string[] TestItems; public string[] TestItems2; public int BelowW0Pct; diff --git a/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs b/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs index 53913e4e0..7eb0d4ece 100644 --- a/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs +++ b/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs @@ -105,6 +105,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter printerCfg.CommonItems2 = newCfg.CommonItems2; printerCfg.CommonItems3 = newCfg.CommonItems3; printerCfg.Form = newCfg.Form; + printerCfg.Alignment = newCfg.Alignment; printerCfg.SelectedItems = newCfg.SelectedItems; printerCfg.SelectedItems2 = newCfg.SelectedItems2; printerCfg.BelowW0Pct = newCfg.BelowW0Pct; @@ -227,6 +228,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter CommonItems2 = printerCfg.CommonItems2, CommonItems3 = printerCfg.CommonItems3, Form = printerCfg.Form, + Alignment = printerCfg.Alignment, TestItems = printerCfg.SelectedItems, TestItems2 = printerCfg.SelectedItems2, BelowW0Pct = printerCfg.BelowW0Pct, diff --git a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfg.cs b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfg.cs index 177eba039..72e5dbaed 100644 --- a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfg.cs +++ b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfg.cs @@ -50,6 +50,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter public string[] CommonItems3; public TableForm Form; + public Alignment Alignment; public string[] SelectedItems; public string[] SelectedItems2; diff --git a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs index d90cad222..de46be9ab 100644 --- a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs +++ b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs @@ -100,7 +100,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter this.belowItems3Button = new System.Windows.Forms.Button(); this.belowItems2Button = new System.Windows.Forms.Button(); this.belowItems1Button = new System.Windows.Forms.Button(); - this.table1FormComboBox = new System.Windows.Forms.ComboBox(); + this.tableFormComboBox = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); this.graphHeightTextBox = new System.Windows.Forms.TextBox(); this.graphWidthTextBox = new System.Windows.Forms.TextBox(); @@ -116,22 +116,25 @@ namespace TBF.Rig.Output.Printers.OnePerMeter this.printerComboBox = new System.Windows.Forms.ComboBox(); this.selectPrinterButton = new System.Windows.Forms.Button(); this.printerLabel = new System.Windows.Forms.Label(); + this.tableAlignmentComboBox = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // nameTextBox // this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(142, 3); + this.nameTextBox.Location = new System.Drawing.Point(189, 4); + this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(146, 20); + this.nameTextBox.Size = new System.Drawing.Size(193, 22); this.nameTextBox.TabIndex = 2; // // nameLabel // this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(16, 6); + this.nameLabel.Location = new System.Drawing.Point(21, 7); + this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.Size = new System.Drawing.Size(44, 16); this.nameLabel.TabIndex = 1; this.nameLabel.Text = "Name"; // @@ -139,9 +142,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.supressPrintingCheckBox.AutoSize = true; this.supressPrintingCheckBox.Enabled = false; - this.supressPrintingCheckBox.Location = new System.Drawing.Point(357, 93); + this.supressPrintingCheckBox.Location = new System.Drawing.Point(476, 114); + this.supressPrintingCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.supressPrintingCheckBox.Name = "supressPrintingCheckBox"; - this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17); + this.supressPrintingCheckBox.Size = new System.Drawing.Size(125, 20); this.supressPrintingCheckBox.TabIndex = 33; this.supressPrintingCheckBox.Text = "Supress printing"; this.supressPrintingCheckBox.UseVisualStyleBackColor = true; @@ -149,9 +153,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // orientationLabel // this.orientationLabel.AutoSize = true; - this.orientationLabel.Location = new System.Drawing.Point(16, 70); + this.orientationLabel.Location = new System.Drawing.Point(21, 86); + this.orientationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.orientationLabel.Name = "orientationLabel"; - this.orientationLabel.Size = new System.Drawing.Size(84, 13); + this.orientationLabel.Size = new System.Drawing.Size(105, 16); this.orientationLabel.TabIndex = 5; this.orientationLabel.Text = "Page orientation"; // @@ -159,68 +164,76 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.orientationComboBox.Enabled = false; this.orientationComboBox.FormattingEnabled = true; - this.orientationComboBox.Location = new System.Drawing.Point(142, 67); + this.orientationComboBox.Location = new System.Drawing.Point(189, 82); + this.orientationComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.orientationComboBox.Name = "orientationComboBox"; - this.orientationComboBox.Size = new System.Drawing.Size(146, 21); + this.orientationComboBox.Size = new System.Drawing.Size(193, 24); this.orientationComboBox.TabIndex = 6; // // topMarginTextBox // this.topMarginTextBox.Enabled = false; - this.topMarginTextBox.Location = new System.Drawing.Point(142, 89); + this.topMarginTextBox.Location = new System.Drawing.Point(189, 110); + this.topMarginTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.topMarginTextBox.Name = "topMarginTextBox"; - this.topMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.topMarginTextBox.Size = new System.Drawing.Size(57, 22); this.topMarginTextBox.TabIndex = 8; // // topMarginLabel // this.topMarginLabel.AutoSize = true; - this.topMarginLabel.Location = new System.Drawing.Point(16, 91); + this.topMarginLabel.Location = new System.Drawing.Point(21, 112); + this.topMarginLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.topMarginLabel.Name = "topMarginLabel"; - this.topMarginLabel.Size = new System.Drawing.Size(116, 13); + this.topMarginLabel.Size = new System.Drawing.Size(142, 16); this.topMarginLabel.TabIndex = 7; this.topMarginLabel.Text = "Top/bottom/left margin"; // // leftMarginTextBox // this.leftMarginTextBox.Enabled = false; - this.leftMarginTextBox.Location = new System.Drawing.Point(244, 89); + this.leftMarginTextBox.Location = new System.Drawing.Point(325, 110); + this.leftMarginTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftMarginTextBox.Name = "leftMarginTextBox"; - this.leftMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.leftMarginTextBox.Size = new System.Drawing.Size(57, 22); this.leftMarginTextBox.TabIndex = 10; // // bottomMarginTextBox // this.bottomMarginTextBox.Enabled = false; - this.bottomMarginTextBox.Location = new System.Drawing.Point(193, 89); + this.bottomMarginTextBox.Location = new System.Drawing.Point(257, 110); + this.bottomMarginTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bottomMarginTextBox.Name = "bottomMarginTextBox"; - this.bottomMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.bottomMarginTextBox.Size = new System.Drawing.Size(57, 22); this.bottomMarginTextBox.TabIndex = 9; // // cultureComboBox // this.cultureComboBox.Enabled = false; this.cultureComboBox.FormattingEnabled = true; - this.cultureComboBox.Location = new System.Drawing.Point(142, 195); + this.cultureComboBox.Location = new System.Drawing.Point(189, 240); + this.cultureComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cultureComboBox.Name = "cultureComboBox"; - this.cultureComboBox.Size = new System.Drawing.Size(110, 21); + this.cultureComboBox.Size = new System.Drawing.Size(145, 24); this.cultureComboBox.TabIndex = 32; // // cultureLabel // this.cultureLabel.AutoSize = true; - this.cultureLabel.Location = new System.Drawing.Point(16, 200); + this.cultureLabel.Location = new System.Drawing.Point(21, 246); + this.cultureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.cultureLabel.Name = "cultureLabel"; - this.cultureLabel.Size = new System.Drawing.Size(42, 13); + this.cultureLabel.Size = new System.Drawing.Size(51, 16); this.cultureLabel.TabIndex = 31; this.cultureLabel.Text = "Cullture"; // // footerButton // this.footerButton.Enabled = false; - this.footerButton.Location = new System.Drawing.Point(291, 288); + this.footerButton.Location = new System.Drawing.Point(388, 354); + this.footerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.footerButton.Name = "footerButton"; - this.footerButton.Size = new System.Drawing.Size(100, 20); + this.footerButton.Size = new System.Drawing.Size(133, 25); this.footerButton.TabIndex = 41; this.footerButton.Text = "Footer"; this.footerButton.UseVisualStyleBackColor = true; @@ -229,9 +242,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // headerButton // this.headerButton.Enabled = false; - this.headerButton.Location = new System.Drawing.Point(291, 193); + this.headerButton.Location = new System.Drawing.Point(388, 238); + this.headerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerButton.Name = "headerButton"; - this.headerButton.Size = new System.Drawing.Size(100, 20); + this.headerButton.Size = new System.Drawing.Size(133, 25); this.headerButton.TabIndex = 37; this.headerButton.Text = "Title"; this.headerButton.UseVisualStyleBackColor = true; @@ -240,9 +254,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // testItemsButton // this.testItemsButton.Enabled = false; - this.testItemsButton.Location = new System.Drawing.Point(291, 231); + this.testItemsButton.Location = new System.Drawing.Point(388, 284); + this.testItemsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.testItemsButton.Name = "testItemsButton"; - this.testItemsButton.Size = new System.Drawing.Size(100, 20); + this.testItemsButton.Size = new System.Drawing.Size(133, 25); this.testItemsButton.TabIndex = 39; this.testItemsButton.Text = "1st table"; this.testItemsButton.UseVisualStyleBackColor = true; @@ -251,18 +266,20 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // headerFontLabel // this.headerFontLabel.AutoSize = true; - this.headerFontLabel.Location = new System.Drawing.Point(16, 134); + this.headerFontLabel.Location = new System.Drawing.Point(21, 165); + this.headerFontLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.headerFontLabel.Name = "headerFontLabel"; - this.headerFontLabel.Size = new System.Drawing.Size(112, 13); + this.headerFontLabel.Size = new System.Drawing.Size(137, 16); this.headerFontLabel.TabIndex = 16; this.headerFontLabel.Text = "Header font/size/style"; // // titleFontLabel // this.titleFontLabel.AutoSize = true; - this.titleFontLabel.Location = new System.Drawing.Point(16, 113); + this.titleFontLabel.Location = new System.Drawing.Point(21, 139); + this.titleFontLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.titleFontLabel.Name = "titleFontLabel"; - this.titleFontLabel.Size = new System.Drawing.Size(97, 13); + this.titleFontLabel.Size = new System.Drawing.Size(117, 16); this.titleFontLabel.TabIndex = 11; this.titleFontLabel.Text = "Title font/size/style"; // @@ -270,69 +287,77 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.titleFontFamilyComboBox.Enabled = false; this.titleFontFamilyComboBox.FormattingEnabled = true; - this.titleFontFamilyComboBox.Location = new System.Drawing.Point(142, 110); + this.titleFontFamilyComboBox.Location = new System.Drawing.Point(189, 135); + this.titleFontFamilyComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.titleFontFamilyComboBox.Name = "titleFontFamilyComboBox"; - this.titleFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.titleFontFamilyComboBox.Size = new System.Drawing.Size(145, 24); this.titleFontFamilyComboBox.TabIndex = 12; // // headerFontFamilyComboBox // this.headerFontFamilyComboBox.Enabled = false; this.headerFontFamilyComboBox.FormattingEnabled = true; - this.headerFontFamilyComboBox.Location = new System.Drawing.Point(142, 131); + this.headerFontFamilyComboBox.Location = new System.Drawing.Point(189, 161); + this.headerFontFamilyComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerFontFamilyComboBox.Name = "headerFontFamilyComboBox"; - this.headerFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.headerFontFamilyComboBox.Size = new System.Drawing.Size(145, 24); this.headerFontFamilyComboBox.TabIndex = 17; // // bodyFontFamilyComboBox // this.bodyFontFamilyComboBox.Enabled = false; this.bodyFontFamilyComboBox.FormattingEnabled = true; - this.bodyFontFamilyComboBox.Location = new System.Drawing.Point(142, 152); + this.bodyFontFamilyComboBox.Location = new System.Drawing.Point(189, 187); + this.bodyFontFamilyComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyFontFamilyComboBox.Name = "bodyFontFamilyComboBox"; - this.bodyFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.bodyFontFamilyComboBox.Size = new System.Drawing.Size(145, 24); this.bodyFontFamilyComboBox.TabIndex = 22; // // bodyFontLabel // this.bodyFontLabel.AutoSize = true; - this.bodyFontLabel.Location = new System.Drawing.Point(16, 155); + this.bodyFontLabel.Location = new System.Drawing.Point(21, 191); + this.bodyFontLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.bodyFontLabel.Name = "bodyFontLabel"; - this.bodyFontLabel.Size = new System.Drawing.Size(101, 13); + this.bodyFontLabel.Size = new System.Drawing.Size(123, 16); this.bodyFontLabel.TabIndex = 21; this.bodyFontLabel.Text = "Body font/size/style"; // // titleFontSizeTextBox // this.titleFontSizeTextBox.Enabled = false; - this.titleFontSizeTextBox.Location = new System.Drawing.Point(258, 110); + this.titleFontSizeTextBox.Location = new System.Drawing.Point(344, 135); + this.titleFontSizeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.titleFontSizeTextBox.Name = "titleFontSizeTextBox"; - this.titleFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.titleFontSizeTextBox.Size = new System.Drawing.Size(39, 22); this.titleFontSizeTextBox.TabIndex = 13; // // headerFontSizeTextBox // this.headerFontSizeTextBox.Enabled = false; - this.headerFontSizeTextBox.Location = new System.Drawing.Point(258, 131); + this.headerFontSizeTextBox.Location = new System.Drawing.Point(344, 161); + this.headerFontSizeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerFontSizeTextBox.Name = "headerFontSizeTextBox"; - this.headerFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.headerFontSizeTextBox.Size = new System.Drawing.Size(39, 22); this.headerFontSizeTextBox.TabIndex = 18; // // bodyFontSizeTextBox // this.bodyFontSizeTextBox.Enabled = false; - this.bodyFontSizeTextBox.Location = new System.Drawing.Point(258, 152); + this.bodyFontSizeTextBox.Location = new System.Drawing.Point(344, 187); + this.bodyFontSizeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyFontSizeTextBox.Name = "bodyFontSizeTextBox"; - this.bodyFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.bodyFontSizeTextBox.Size = new System.Drawing.Size(39, 22); this.bodyFontSizeTextBox.TabIndex = 23; // // titleBoldCheckBox // this.titleBoldCheckBox.AutoSize = true; this.titleBoldCheckBox.Enabled = false; - this.titleBoldCheckBox.Location = new System.Drawing.Point(306, 113); + this.titleBoldCheckBox.Location = new System.Drawing.Point(408, 139); + this.titleBoldCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.titleBoldCheckBox.Name = "titleBoldCheckBox"; - this.titleBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.titleBoldCheckBox.Size = new System.Drawing.Size(18, 17); this.titleBoldCheckBox.TabIndex = 14; this.titleBoldCheckBox.UseVisualStyleBackColor = true; // @@ -340,9 +365,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.titleItalicCheckBox.AutoSize = true; this.titleItalicCheckBox.Enabled = false; - this.titleItalicCheckBox.Location = new System.Drawing.Point(331, 113); + this.titleItalicCheckBox.Location = new System.Drawing.Point(441, 139); + this.titleItalicCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.titleItalicCheckBox.Name = "titleItalicCheckBox"; - this.titleItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.titleItalicCheckBox.Size = new System.Drawing.Size(18, 17); this.titleItalicCheckBox.TabIndex = 15; this.titleItalicCheckBox.UseVisualStyleBackColor = true; // @@ -350,9 +376,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.headerItalicCheckBox.AutoSize = true; this.headerItalicCheckBox.Enabled = false; - this.headerItalicCheckBox.Location = new System.Drawing.Point(331, 134); + this.headerItalicCheckBox.Location = new System.Drawing.Point(441, 165); + this.headerItalicCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerItalicCheckBox.Name = "headerItalicCheckBox"; - this.headerItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.headerItalicCheckBox.Size = new System.Drawing.Size(18, 17); this.headerItalicCheckBox.TabIndex = 20; this.headerItalicCheckBox.UseVisualStyleBackColor = true; // @@ -360,9 +387,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.headerBoldCheckBox.AutoSize = true; this.headerBoldCheckBox.Enabled = false; - this.headerBoldCheckBox.Location = new System.Drawing.Point(306, 134); + this.headerBoldCheckBox.Location = new System.Drawing.Point(408, 165); + this.headerBoldCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headerBoldCheckBox.Name = "headerBoldCheckBox"; - this.headerBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.headerBoldCheckBox.Size = new System.Drawing.Size(18, 17); this.headerBoldCheckBox.TabIndex = 19; this.headerBoldCheckBox.UseVisualStyleBackColor = true; // @@ -370,9 +398,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.bodyItalicCheckBox.AutoSize = true; this.bodyItalicCheckBox.Enabled = false; - this.bodyItalicCheckBox.Location = new System.Drawing.Point(331, 155); + this.bodyItalicCheckBox.Location = new System.Drawing.Point(441, 191); + this.bodyItalicCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyItalicCheckBox.Name = "bodyItalicCheckBox"; - this.bodyItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.bodyItalicCheckBox.Size = new System.Drawing.Size(18, 17); this.bodyItalicCheckBox.TabIndex = 25; this.bodyItalicCheckBox.UseVisualStyleBackColor = true; // @@ -380,9 +409,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.bodyBoldCheckBox.AutoSize = true; this.bodyBoldCheckBox.Enabled = false; - this.bodyBoldCheckBox.Location = new System.Drawing.Point(306, 155); + this.bodyBoldCheckBox.Location = new System.Drawing.Point(408, 191); + this.bodyBoldCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyBoldCheckBox.Name = "bodyBoldCheckBox"; - this.bodyBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.bodyBoldCheckBox.Size = new System.Drawing.Size(18, 17); this.bodyBoldCheckBox.TabIndex = 24; this.bodyBoldCheckBox.UseVisualStyleBackColor = true; // @@ -390,9 +420,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.Location = new System.Drawing.Point(296, 97); + this.label1.Location = new System.Drawing.Point(395, 119); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(32, 13); + this.label1.Size = new System.Drawing.Size(40, 17); this.label1.TabIndex = 37; this.label1.Text = "Bold"; // @@ -400,18 +431,20 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label2.Location = new System.Drawing.Point(327, 97); + this.label2.Location = new System.Drawing.Point(436, 119); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(24, 13); + this.label2.Size = new System.Drawing.Size(30, 17); this.label2.TabIndex = 38; this.label2.Text = "Ital."; // // testItems2Button // this.testItems2Button.Enabled = false; - this.testItems2Button.Location = new System.Drawing.Point(291, 250); + this.testItems2Button.Location = new System.Drawing.Point(388, 308); + this.testItems2Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.testItems2Button.Name = "testItems2Button"; - this.testItems2Button.Size = new System.Drawing.Size(100, 20); + this.testItems2Button.Size = new System.Drawing.Size(133, 25); this.testItems2Button.TabIndex = 40; this.testItems2Button.Text = "2nd table"; this.testItems2Button.UseVisualStyleBackColor = true; @@ -421,9 +454,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.goodOnlyCheckBox.AutoSize = true; this.goodOnlyCheckBox.Enabled = false; - this.goodOnlyCheckBox.Location = new System.Drawing.Point(357, 107); + this.goodOnlyCheckBox.Location = new System.Drawing.Point(476, 132); + this.goodOnlyCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.goodOnlyCheckBox.Name = "goodOnlyCheckBox"; - this.goodOnlyCheckBox.Size = new System.Drawing.Size(74, 17); + this.goodOnlyCheckBox.Size = new System.Drawing.Size(91, 20); this.goodOnlyCheckBox.TabIndex = 34; this.goodOnlyCheckBox.Text = "Good only"; this.goodOnlyCheckBox.UseVisualStyleBackColor = true; @@ -431,44 +465,49 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // templateTextBox // this.templateTextBox.Enabled = false; - this.templateTextBox.Location = new System.Drawing.Point(142, 46); + this.templateTextBox.Location = new System.Drawing.Point(189, 57); + this.templateTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.templateTextBox.Name = "templateTextBox"; - this.templateTextBox.Size = new System.Drawing.Size(146, 20); + this.templateTextBox.Size = new System.Drawing.Size(193, 22); this.templateTextBox.TabIndex = 4; // // templateLabel // this.templateLabel.AutoSize = true; - this.templateLabel.Location = new System.Drawing.Point(16, 49); + this.templateLabel.Location = new System.Drawing.Point(21, 60); + this.templateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.templateLabel.Name = "templateLabel"; - this.templateLabel.Size = new System.Drawing.Size(51, 13); + this.templateLabel.Size = new System.Drawing.Size(65, 16); this.templateLabel.TabIndex = 3; this.templateLabel.Text = "Template"; // // docNameLabel // this.docNameLabel.AutoSize = true; - this.docNameLabel.Location = new System.Drawing.Point(297, 46); + this.docNameLabel.Location = new System.Drawing.Point(396, 57); + this.docNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.docNameLabel.Name = "docNameLabel"; - this.docNameLabel.Size = new System.Drawing.Size(127, 13); + this.docNameLabel.Size = new System.Drawing.Size(155, 16); this.docNameLabel.TabIndex = 42; this.docNameLabel.Text = "Doc.name (0=start 1-end,"; // // docNameTextBox // this.docNameTextBox.Enabled = false; - this.docNameTextBox.Location = new System.Drawing.Point(302, 72); + this.docNameTextBox.Location = new System.Drawing.Point(403, 89); + this.docNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.docNameTextBox.Name = "docNameTextBox"; - this.docNameTextBox.Size = new System.Drawing.Size(151, 20); + this.docNameTextBox.Size = new System.Drawing.Size(200, 22); this.docNameTextBox.TabIndex = 43; // // footerItalicCheckBox // this.footerItalicCheckBox.AutoSize = true; this.footerItalicCheckBox.Enabled = false; - this.footerItalicCheckBox.Location = new System.Drawing.Point(331, 176); + this.footerItalicCheckBox.Location = new System.Drawing.Point(441, 217); + this.footerItalicCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.footerItalicCheckBox.Name = "footerItalicCheckBox"; - this.footerItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.footerItalicCheckBox.Size = new System.Drawing.Size(18, 17); this.footerItalicCheckBox.TabIndex = 30; this.footerItalicCheckBox.UseVisualStyleBackColor = true; // @@ -476,162 +515,181 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // this.footerBoldCheckBox.AutoSize = true; this.footerBoldCheckBox.Enabled = false; - this.footerBoldCheckBox.Location = new System.Drawing.Point(306, 176); + this.footerBoldCheckBox.Location = new System.Drawing.Point(408, 217); + this.footerBoldCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.footerBoldCheckBox.Name = "footerBoldCheckBox"; - this.footerBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.footerBoldCheckBox.Size = new System.Drawing.Size(18, 17); this.footerBoldCheckBox.TabIndex = 29; this.footerBoldCheckBox.UseVisualStyleBackColor = true; // // footerFontSizeTextBox // this.footerFontSizeTextBox.Enabled = false; - this.footerFontSizeTextBox.Location = new System.Drawing.Point(258, 173); + this.footerFontSizeTextBox.Location = new System.Drawing.Point(344, 213); + this.footerFontSizeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.footerFontSizeTextBox.Name = "footerFontSizeTextBox"; - this.footerFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.footerFontSizeTextBox.Size = new System.Drawing.Size(39, 22); this.footerFontSizeTextBox.TabIndex = 28; // // footerFontFamilyComboBox // this.footerFontFamilyComboBox.Enabled = false; this.footerFontFamilyComboBox.FormattingEnabled = true; - this.footerFontFamilyComboBox.Location = new System.Drawing.Point(142, 173); + this.footerFontFamilyComboBox.Location = new System.Drawing.Point(189, 213); + this.footerFontFamilyComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.footerFontFamilyComboBox.Name = "footerFontFamilyComboBox"; - this.footerFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.footerFontFamilyComboBox.Size = new System.Drawing.Size(145, 24); this.footerFontFamilyComboBox.TabIndex = 27; // // footerFontLabel // this.footerFontLabel.AutoSize = true; - this.footerFontLabel.Location = new System.Drawing.Point(16, 176); + this.footerFontLabel.Location = new System.Drawing.Point(21, 217); + this.footerFontLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.footerFontLabel.Name = "footerFontLabel"; - this.footerFontLabel.Size = new System.Drawing.Size(107, 13); + this.footerFontLabel.Size = new System.Drawing.Size(130, 16); this.footerFontLabel.TabIndex = 26; this.footerFontLabel.Text = "Footer font/size/style"; // // imageNameTextBox // this.imageNameTextBox.Enabled = false; - this.imageNameTextBox.Location = new System.Drawing.Point(287, 308); + this.imageNameTextBox.Location = new System.Drawing.Point(383, 379); + this.imageNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.imageNameTextBox.Name = "imageNameTextBox"; - this.imageNameTextBox.Size = new System.Drawing.Size(166, 20); + this.imageNameTextBox.Size = new System.Drawing.Size(220, 22); this.imageNameTextBox.TabIndex = 44; // // imageLeftTextBox // this.imageLeftTextBox.Enabled = false; - this.imageLeftTextBox.Location = new System.Drawing.Point(141, 309); + this.imageLeftTextBox.Location = new System.Drawing.Point(188, 380); + this.imageLeftTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.imageLeftTextBox.Name = "imageLeftTextBox"; - this.imageLeftTextBox.Size = new System.Drawing.Size(33, 20); + this.imageLeftTextBox.Size = new System.Drawing.Size(43, 22); this.imageLeftTextBox.TabIndex = 46; // // imageTopTextBox // this.imageTopTextBox.Enabled = false; - this.imageTopTextBox.Location = new System.Drawing.Point(177, 309); + this.imageTopTextBox.Location = new System.Drawing.Point(236, 380); + this.imageTopTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.imageTopTextBox.Name = "imageTopTextBox"; - this.imageTopTextBox.Size = new System.Drawing.Size(31, 20); + this.imageTopTextBox.Size = new System.Drawing.Size(40, 22); this.imageTopTextBox.TabIndex = 47; // // imageWidthTextBox // this.imageWidthTextBox.Enabled = false; - this.imageWidthTextBox.Location = new System.Drawing.Point(211, 309); + this.imageWidthTextBox.Location = new System.Drawing.Point(281, 380); + this.imageWidthTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.imageWidthTextBox.Name = "imageWidthTextBox"; - this.imageWidthTextBox.Size = new System.Drawing.Size(31, 20); + this.imageWidthTextBox.Size = new System.Drawing.Size(40, 22); this.imageWidthTextBox.TabIndex = 48; // // imageHeightTextBox // this.imageHeightTextBox.Enabled = false; - this.imageHeightTextBox.Location = new System.Drawing.Point(245, 309); + this.imageHeightTextBox.Location = new System.Drawing.Point(327, 380); + this.imageHeightTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.imageHeightTextBox.Name = "imageHeightTextBox"; - this.imageHeightTextBox.Size = new System.Drawing.Size(31, 20); + this.imageHeightTextBox.Size = new System.Drawing.Size(40, 22); this.imageHeightTextBox.TabIndex = 49; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(17, 312); + this.label4.Location = new System.Drawing.Point(23, 384); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(115, 13); + this.label4.Size = new System.Drawing.Size(133, 16); this.label4.TabIndex = 50; this.label4.Text = "Image left/top/w/h/file"; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(55, 272); + this.label8.Location = new System.Drawing.Point(73, 335); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(224, 13); + this.label8.Size = new System.Drawing.Size(280, 16); this.label8.TabIndex = 57; this.label8.Text = "Graph and image coordinates are in 0.254 mm"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(172, 222); + this.label6.Location = new System.Drawing.Point(229, 273); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(15, 13); + this.label6.Size = new System.Drawing.Size(19, 16); this.label6.TabIndex = 67; this.label6.Text = "%"; // // colW0TextBox // this.colW0TextBox.Enabled = false; - this.colW0TextBox.Location = new System.Drawing.Point(142, 219); + this.colW0TextBox.Location = new System.Drawing.Point(189, 270); + this.colW0TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.colW0TextBox.Name = "colW0TextBox"; - this.colW0TextBox.Size = new System.Drawing.Size(30, 20); + this.colW0TextBox.Size = new System.Drawing.Size(39, 22); this.colW0TextBox.TabIndex = 66; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(16, 222); + this.label5.Location = new System.Drawing.Point(21, 273); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(97, 13); + this.label5.Size = new System.Drawing.Size(120, 16); this.label5.TabIndex = 58; this.label5.Text = "Column widths in %"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(264, 222); + this.label7.Location = new System.Drawing.Point(352, 273); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(15, 13); + this.label7.Size = new System.Drawing.Size(19, 16); this.label7.TabIndex = 62; this.label7.Text = "%"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(218, 222); + this.label9.Location = new System.Drawing.Point(291, 273); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(15, 13); + this.label9.Size = new System.Drawing.Size(19, 16); this.label9.TabIndex = 60; this.label9.Text = "%"; // // colW2TextBox // this.colW2TextBox.Enabled = false; - this.colW2TextBox.Location = new System.Drawing.Point(234, 219); + this.colW2TextBox.Location = new System.Drawing.Point(312, 270); + this.colW2TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.colW2TextBox.Name = "colW2TextBox"; - this.colW2TextBox.Size = new System.Drawing.Size(30, 20); + this.colW2TextBox.Size = new System.Drawing.Size(39, 22); this.colW2TextBox.TabIndex = 61; // // colW1TextBox // this.colW1TextBox.Enabled = false; - this.colW1TextBox.Location = new System.Drawing.Point(188, 219); + this.colW1TextBox.Location = new System.Drawing.Point(251, 270); + this.colW1TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.colW1TextBox.Name = "colW1TextBox"; - this.colW1TextBox.Size = new System.Drawing.Size(30, 20); + this.colW1TextBox.Size = new System.Drawing.Size(39, 22); this.colW1TextBox.TabIndex = 59; // // commonItems3Button // this.commonItems3Button.Enabled = false; - this.commonItems3Button.Location = new System.Drawing.Point(397, 212); + this.commonItems3Button.Location = new System.Drawing.Point(529, 261); + this.commonItems3Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.commonItems3Button.Name = "commonItems3Button"; - this.commonItems3Button.Size = new System.Drawing.Size(47, 20); + this.commonItems3Button.Size = new System.Drawing.Size(63, 25); this.commonItems3Button.TabIndex = 65; this.commonItems3Button.Text = "Col. 3"; this.commonItems3Button.UseVisualStyleBackColor = true; @@ -640,9 +698,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // commonItems2Button // this.commonItems2Button.Enabled = false; - this.commonItems2Button.Location = new System.Drawing.Point(344, 212); + this.commonItems2Button.Location = new System.Drawing.Point(459, 261); + this.commonItems2Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.commonItems2Button.Name = "commonItems2Button"; - this.commonItems2Button.Size = new System.Drawing.Size(47, 20); + this.commonItems2Button.Size = new System.Drawing.Size(63, 25); this.commonItems2Button.TabIndex = 64; this.commonItems2Button.Text = "Col. 2"; this.commonItems2Button.UseVisualStyleBackColor = true; @@ -651,9 +710,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // commonItems1Button // this.commonItems1Button.Enabled = false; - this.commonItems1Button.Location = new System.Drawing.Point(291, 212); + this.commonItems1Button.Location = new System.Drawing.Point(388, 261); + this.commonItems1Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.commonItems1Button.Name = "commonItems1Button"; - this.commonItems1Button.Size = new System.Drawing.Size(47, 20); + this.commonItems1Button.Size = new System.Drawing.Size(63, 25); this.commonItems1Button.TabIndex = 63; this.commonItems1Button.Text = "Col. 1"; this.commonItems1Button.UseVisualStyleBackColor = true; @@ -662,69 +722,77 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(172, 247); + this.label10.Location = new System.Drawing.Point(229, 304); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(15, 13); + this.label10.Size = new System.Drawing.Size(19, 16); this.label10.TabIndex = 74; this.label10.Text = "%"; // // belowW0TextBox // this.belowW0TextBox.Enabled = false; - this.belowW0TextBox.Location = new System.Drawing.Point(142, 244); + this.belowW0TextBox.Location = new System.Drawing.Point(189, 300); + this.belowW0TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowW0TextBox.Name = "belowW0TextBox"; - this.belowW0TextBox.Size = new System.Drawing.Size(30, 20); + this.belowW0TextBox.Size = new System.Drawing.Size(39, 22); this.belowW0TextBox.TabIndex = 73; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(16, 247); + this.label11.Location = new System.Drawing.Point(21, 304); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(97, 13); + this.label11.Size = new System.Drawing.Size(120, 16); this.label11.TabIndex = 68; this.label11.Text = "Column widths in %"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(264, 247); + this.label12.Location = new System.Drawing.Point(352, 304); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(15, 13); + this.label12.Size = new System.Drawing.Size(19, 16); this.label12.TabIndex = 72; this.label12.Text = "%"; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(218, 247); + this.label13.Location = new System.Drawing.Point(291, 304); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(15, 13); + this.label13.Size = new System.Drawing.Size(19, 16); this.label13.TabIndex = 70; this.label13.Text = "%"; // // belowW2TextBox // this.belowW2TextBox.Enabled = false; - this.belowW2TextBox.Location = new System.Drawing.Point(234, 244); + this.belowW2TextBox.Location = new System.Drawing.Point(312, 300); + this.belowW2TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowW2TextBox.Name = "belowW2TextBox"; - this.belowW2TextBox.Size = new System.Drawing.Size(30, 20); + this.belowW2TextBox.Size = new System.Drawing.Size(39, 22); this.belowW2TextBox.TabIndex = 71; // // belowW1TextBox // this.belowW1TextBox.Enabled = false; - this.belowW1TextBox.Location = new System.Drawing.Point(188, 244); + this.belowW1TextBox.Location = new System.Drawing.Point(251, 300); + this.belowW1TextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowW1TextBox.Name = "belowW1TextBox"; - this.belowW1TextBox.Size = new System.Drawing.Size(30, 20); + this.belowW1TextBox.Size = new System.Drawing.Size(39, 22); this.belowW1TextBox.TabIndex = 69; // // belowItems3Button // this.belowItems3Button.Enabled = false; - this.belowItems3Button.Location = new System.Drawing.Point(397, 269); + this.belowItems3Button.Location = new System.Drawing.Point(529, 331); + this.belowItems3Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowItems3Button.Name = "belowItems3Button"; - this.belowItems3Button.Size = new System.Drawing.Size(47, 20); + this.belowItems3Button.Size = new System.Drawing.Size(63, 25); this.belowItems3Button.TabIndex = 77; this.belowItems3Button.Text = "Col. 3"; this.belowItems3Button.UseVisualStyleBackColor = true; @@ -733,9 +801,10 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // belowItems2Button // this.belowItems2Button.Enabled = false; - this.belowItems2Button.Location = new System.Drawing.Point(344, 269); + this.belowItems2Button.Location = new System.Drawing.Point(459, 331); + this.belowItems2Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowItems2Button.Name = "belowItems2Button"; - this.belowItems2Button.Size = new System.Drawing.Size(47, 20); + this.belowItems2Button.Size = new System.Drawing.Size(63, 25); this.belowItems2Button.TabIndex = 76; this.belowItems2Button.Text = "Col. 2"; this.belowItems2Button.UseVisualStyleBackColor = true; @@ -744,138 +813,154 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // belowItems1Button // this.belowItems1Button.Enabled = false; - this.belowItems1Button.Location = new System.Drawing.Point(291, 269); + this.belowItems1Button.Location = new System.Drawing.Point(388, 331); + this.belowItems1Button.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.belowItems1Button.Name = "belowItems1Button"; - this.belowItems1Button.Size = new System.Drawing.Size(47, 20); + this.belowItems1Button.Size = new System.Drawing.Size(63, 25); this.belowItems1Button.TabIndex = 75; this.belowItems1Button.Text = "Col. 1"; this.belowItems1Button.UseVisualStyleBackColor = true; this.belowItems1Button.Click += new System.EventHandler(this.belowItems1Button_Click); // - // table1FormComboBox + // tableFormComboBox // - this.table1FormComboBox.Enabled = false; - this.table1FormComboBox.FormattingEnabled = true; - this.table1FormComboBox.Location = new System.Drawing.Point(392, 240); - this.table1FormComboBox.Name = "table1FormComboBox"; - this.table1FormComboBox.Size = new System.Drawing.Size(61, 21); - this.table1FormComboBox.TabIndex = 78; + this.tableFormComboBox.Enabled = false; + this.tableFormComboBox.FormattingEnabled = true; + this.tableFormComboBox.Location = new System.Drawing.Point(523, 285); + this.tableFormComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableFormComboBox.Name = "tableFormComboBox"; + this.tableFormComboBox.Size = new System.Drawing.Size(80, 24); + this.tableFormComboBox.TabIndex = 78; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(17, 291); + this.label3.Location = new System.Drawing.Point(23, 358); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(97, 13); + this.label3.Size = new System.Drawing.Size(111, 16); this.label3.TabIndex = 83; this.label3.Text = "Graph left/top/w/h"; // // graphHeightTextBox // this.graphHeightTextBox.Enabled = false; - this.graphHeightTextBox.Location = new System.Drawing.Point(245, 288); + this.graphHeightTextBox.Location = new System.Drawing.Point(327, 354); + this.graphHeightTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.graphHeightTextBox.Name = "graphHeightTextBox"; - this.graphHeightTextBox.Size = new System.Drawing.Size(31, 20); + this.graphHeightTextBox.Size = new System.Drawing.Size(40, 22); this.graphHeightTextBox.TabIndex = 82; // // graphWidthTextBox // this.graphWidthTextBox.Enabled = false; - this.graphWidthTextBox.Location = new System.Drawing.Point(211, 288); + this.graphWidthTextBox.Location = new System.Drawing.Point(281, 354); + this.graphWidthTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.graphWidthTextBox.Name = "graphWidthTextBox"; - this.graphWidthTextBox.Size = new System.Drawing.Size(31, 20); + this.graphWidthTextBox.Size = new System.Drawing.Size(40, 22); this.graphWidthTextBox.TabIndex = 81; // // graphTopTextBox // this.graphTopTextBox.Enabled = false; - this.graphTopTextBox.Location = new System.Drawing.Point(177, 288); + this.graphTopTextBox.Location = new System.Drawing.Point(236, 354); + this.graphTopTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.graphTopTextBox.Name = "graphTopTextBox"; - this.graphTopTextBox.Size = new System.Drawing.Size(31, 20); + this.graphTopTextBox.Size = new System.Drawing.Size(40, 22); this.graphTopTextBox.TabIndex = 80; // // graphLeftTextBox // this.graphLeftTextBox.Enabled = false; - this.graphLeftTextBox.Location = new System.Drawing.Point(141, 288); + this.graphLeftTextBox.Location = new System.Drawing.Point(188, 354); + this.graphLeftTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.graphLeftTextBox.Name = "graphLeftTextBox"; - this.graphLeftTextBox.Size = new System.Drawing.Size(33, 20); + this.graphLeftTextBox.Size = new System.Drawing.Size(43, 22); this.graphLeftTextBox.TabIndex = 79; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(339, 59); + this.label14.Location = new System.Drawing.Point(452, 73); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(120, 13); + this.label14.Size = new System.Drawing.Size(139, 16); this.label14.TabIndex = 84; this.label14.Text = " 2=batch, 3=wm, 4=s/n)"; // // barcodeLabel // this.barcodeLabel.AutoSize = true; - this.barcodeLabel.Location = new System.Drawing.Point(17, 333); + this.barcodeLabel.Location = new System.Drawing.Point(23, 410); + this.barcodeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.barcodeLabel.Name = "barcodeLabel"; - this.barcodeLabel.Size = new System.Drawing.Size(121, 13); + this.barcodeLabel.Size = new System.Drawing.Size(140, 16); this.barcodeLabel.TabIndex = 89; this.barcodeLabel.Text = "Barcode left/t/w/h/type"; // // barcodeHeightTextBox // this.barcodeHeightTextBox.Enabled = false; - this.barcodeHeightTextBox.Location = new System.Drawing.Point(245, 330); + this.barcodeHeightTextBox.Location = new System.Drawing.Point(327, 406); + this.barcodeHeightTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.barcodeHeightTextBox.Name = "barcodeHeightTextBox"; - this.barcodeHeightTextBox.Size = new System.Drawing.Size(31, 20); + this.barcodeHeightTextBox.Size = new System.Drawing.Size(40, 22); this.barcodeHeightTextBox.TabIndex = 88; // // barcodeWidthTextBox // this.barcodeWidthTextBox.Enabled = false; - this.barcodeWidthTextBox.Location = new System.Drawing.Point(211, 330); + this.barcodeWidthTextBox.Location = new System.Drawing.Point(281, 406); + this.barcodeWidthTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.barcodeWidthTextBox.Name = "barcodeWidthTextBox"; - this.barcodeWidthTextBox.Size = new System.Drawing.Size(31, 20); + this.barcodeWidthTextBox.Size = new System.Drawing.Size(40, 22); this.barcodeWidthTextBox.TabIndex = 87; // // barcodeTopTextBox // this.barcodeTopTextBox.Enabled = false; - this.barcodeTopTextBox.Location = new System.Drawing.Point(177, 330); + this.barcodeTopTextBox.Location = new System.Drawing.Point(236, 406); + this.barcodeTopTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.barcodeTopTextBox.Name = "barcodeTopTextBox"; - this.barcodeTopTextBox.Size = new System.Drawing.Size(31, 20); + this.barcodeTopTextBox.Size = new System.Drawing.Size(40, 22); this.barcodeTopTextBox.TabIndex = 86; // // barcodeLeftTextBox // this.barcodeLeftTextBox.Enabled = false; - this.barcodeLeftTextBox.Location = new System.Drawing.Point(141, 330); + this.barcodeLeftTextBox.Location = new System.Drawing.Point(188, 406); + this.barcodeLeftTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.barcodeLeftTextBox.Name = "barcodeLeftTextBox"; - this.barcodeLeftTextBox.Size = new System.Drawing.Size(33, 20); + this.barcodeLeftTextBox.Size = new System.Drawing.Size(43, 22); this.barcodeLeftTextBox.TabIndex = 85; // // barcodeTypeComboBox // this.barcodeTypeComboBox.Enabled = false; this.barcodeTypeComboBox.FormattingEnabled = true; - this.barcodeTypeComboBox.Location = new System.Drawing.Point(287, 329); + this.barcodeTypeComboBox.Location = new System.Drawing.Point(383, 405); + this.barcodeTypeComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.barcodeTypeComboBox.Name = "barcodeTypeComboBox"; - this.barcodeTypeComboBox.Size = new System.Drawing.Size(166, 21); + this.barcodeTypeComboBox.Size = new System.Drawing.Size(220, 24); this.barcodeTypeComboBox.TabIndex = 90; // // printerComboBox // this.printerComboBox.Enabled = false; this.printerComboBox.FormattingEnabled = true; - this.printerComboBox.Location = new System.Drawing.Point(142, 24); + this.printerComboBox.Location = new System.Drawing.Point(189, 30); + this.printerComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.printerComboBox.Name = "printerComboBox"; - this.printerComboBox.Size = new System.Drawing.Size(249, 21); + this.printerComboBox.Size = new System.Drawing.Size(331, 24); this.printerComboBox.TabIndex = 93; // // selectPrinterButton // this.selectPrinterButton.Enabled = false; - this.selectPrinterButton.Location = new System.Drawing.Point(392, 23); + this.selectPrinterButton.Location = new System.Drawing.Point(523, 28); + this.selectPrinterButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.selectPrinterButton.Name = "selectPrinterButton"; - this.selectPrinterButton.Size = new System.Drawing.Size(61, 22); + this.selectPrinterButton.Size = new System.Drawing.Size(81, 27); this.selectPrinterButton.TabIndex = 92; this.selectPrinterButton.Text = "Select"; this.selectPrinterButton.UseVisualStyleBackColor = true; @@ -884,16 +969,28 @@ namespace TBF.Rig.Output.Printers.OnePerMeter // printerLabel // this.printerLabel.AutoSize = true; - this.printerLabel.Location = new System.Drawing.Point(16, 27); + this.printerLabel.Location = new System.Drawing.Point(21, 33); + this.printerLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.printerLabel.Name = "printerLabel"; - this.printerLabel.Size = new System.Drawing.Size(37, 13); + this.printerLabel.Size = new System.Drawing.Size(45, 16); this.printerLabel.TabIndex = 91; this.printerLabel.Text = "Printer"; // + // tableAlignmentComboBox + // + this.tableAlignmentComboBox.Enabled = false; + this.tableAlignmentComboBox.FormattingEnabled = true; + this.tableAlignmentComboBox.Location = new System.Drawing.Point(523, 309); + this.tableAlignmentComboBox.Margin = new System.Windows.Forms.Padding(4); + this.tableAlignmentComboBox.Name = "tableAlignmentComboBox"; + this.tableAlignmentComboBox.Size = new System.Drawing.Size(80, 24); + this.tableAlignmentComboBox.TabIndex = 94; + // // PrinterCfgCtrl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tableAlignmentComboBox); this.Controls.Add(this.printerComboBox); this.Controls.Add(this.selectPrinterButton); this.Controls.Add(this.printerLabel); @@ -909,7 +1006,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter this.Controls.Add(this.graphWidthTextBox); this.Controls.Add(this.graphTopTextBox); this.Controls.Add(this.graphLeftTextBox); - this.Controls.Add(this.table1FormComboBox); + this.Controls.Add(this.tableFormComboBox); this.Controls.Add(this.belowItems3Button); this.Controls.Add(this.belowItems2Button); this.Controls.Add(this.belowItems1Button); @@ -979,8 +1076,9 @@ namespace TBF.Rig.Output.Printers.OnePerMeter this.Controls.Add(this.supressPrintingCheckBox); this.Controls.Add(this.nameTextBox); this.Controls.Add(this.nameLabel); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "PrinterCfgCtrl"; - this.Size = new System.Drawing.Size(455, 350); + this.Size = new System.Drawing.Size(607, 431); this.Load += new System.EventHandler(this.PrinterCfgCtrl_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -1058,7 +1156,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter private System.Windows.Forms.Button belowItems3Button; private System.Windows.Forms.Button belowItems2Button; private System.Windows.Forms.Button belowItems1Button; - private System.Windows.Forms.ComboBox table1FormComboBox; + private System.Windows.Forms.ComboBox tableFormComboBox; private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox graphHeightTextBox; private System.Windows.Forms.TextBox graphWidthTextBox; @@ -1074,5 +1172,6 @@ namespace TBF.Rig.Output.Printers.OnePerMeter private System.Windows.Forms.ComboBox printerComboBox; private System.Windows.Forms.Button selectPrinterButton; private System.Windows.Forms.Label printerLabel; - } + private System.Windows.Forms.ComboBox tableAlignmentComboBox; + } } diff --git a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs index 8d1b1bdde..c9870bde8 100644 --- a/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs +++ b/TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs @@ -59,7 +59,12 @@ namespace TBF.Rig.Output.Printers.OnePerMeter for (TableForm f = 0; f < TableForm.Count; f++) { - table1FormComboBox.Items.Add(f.ToString()); + tableFormComboBox.Items.Add(f.ToString()); + } + + for (Alignment a = 0; a < Alignment.Count; a++) + { + tableAlignmentComboBox.Items.Add(a.ToDescription()); } for (BarcodeType bt = BarcodeType.None; bt < BarcodeType.Count; bt++) @@ -158,7 +163,8 @@ namespace TBF.Rig.Output.Printers.OnePerMeter imageNameTextBox.Text = config.ImgName; docNameTextBox.Text = config.DocName; - table1FormComboBox.Text = config.Form.ToString(); + tableFormComboBox.Text = config.Form.ToString(); + tableAlignmentComboBox.Text = config.Alignment.ToDescription(); barcodeTypeComboBox.Text = config.BarcodeType.ToString(); barcodeLeftTextBox.Text = config.BarcodeLeft.ToString(); @@ -203,7 +209,8 @@ namespace TBF.Rig.Output.Printers.OnePerMeter commonItems1Button.Enabled = true; commonItems2Button.Enabled = true; commonItems3Button.Enabled = true; - table1FormComboBox.Enabled = true; + tableFormComboBox.Enabled = true; + tableAlignmentComboBox.Enabled = true; testItemsButton.Enabled = true; testItems2Button.Enabled = true; belowW0TextBox.Enabled = true; @@ -376,12 +383,18 @@ namespace TBF.Rig.Output.Printers.OnePerMeter flags |= CfgUpdateFlags.Error; } - if (!table1FormComboBox.Items.Contains(table1FormComboBox.Text)) + if (!tableFormComboBox.Items.Contains(tableFormComboBox.Text)) { message += Environment.NewLine + "Invalid 'Table form'"; flags |= CfgUpdateFlags.Error; } + if (!tableAlignmentComboBox.Items.Contains(tableAlignmentComboBox.Text)) + { + message += Environment.NewLine + "Invalid 'Table alignmentm'"; + flags |= CfgUpdateFlags.Error; + } + if (!barcodeTypeComboBox.Items.Contains(barcodeTypeComboBox.Text)) { message += Environment.NewLine + "Invalid barcode type"; @@ -505,13 +518,22 @@ namespace TBF.Rig.Output.Printers.OnePerMeter for (TableForm f = 0; f < TableForm.Count; f++) { - if (f.ToString().Equals(table1FormComboBox.Text)) + if (f.ToString().Equals(tableFormComboBox.Text)) { config.Form = f; flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); } } + for (Alignment a = 0; a < Alignment.Count; a++) + { + if (a.ToDescription().Equals(tableAlignmentComboBox.Text)) + { + config.Alignment = a; + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + } + } + flags |= UpdateDifferent(ref config.GraphLeft, graphLeftTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); flags |= UpdateDifferent(ref config.GraphTop, graphTopTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); flags |= UpdateDifferent(ref config.GraphWid, graphWidthTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);