Results config - new tab order, Output.Printer.Enhanced - font properties (UI)
This commit is contained in:
+27
-27
@@ -30,11 +30,11 @@
|
|||||||
{
|
{
|
||||||
this.availableTabControl = new System.Windows.Forms.TabControl();
|
this.availableTabControl = new System.Windows.Forms.TabControl();
|
||||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||||
this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
|
|
||||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
|
||||||
this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
|
this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
|
||||||
this.tabPage3 = new System.Windows.Forms.TabPage();
|
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||||
this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
|
this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
|
||||||
|
this.tabPage3 = new System.Windows.Forms.TabPage();
|
||||||
|
this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
|
||||||
this.downButton = new System.Windows.Forms.Button();
|
this.downButton = new System.Windows.Forms.Button();
|
||||||
this.upButton = new System.Windows.Forms.Button();
|
this.upButton = new System.Windows.Forms.Button();
|
||||||
this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
|
this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
//
|
//
|
||||||
// tabPage1
|
// tabPage1
|
||||||
//
|
//
|
||||||
this.tabPage1.Controls.Add(this.availableAlphabeticTreeView);
|
this.tabPage1.Controls.Add(this.availableByQuantityTreeView);
|
||||||
this.tabPage1.Location = new System.Drawing.Point(4, 22);
|
this.tabPage1.Location = new System.Drawing.Point(4, 22);
|
||||||
this.tabPage1.Name = "tabPage1";
|
this.tabPage1.Name = "tabPage1";
|
||||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
||||||
@@ -74,16 +74,16 @@
|
|||||||
//
|
//
|
||||||
// availableAlphabeticTreeView
|
// availableAlphabeticTreeView
|
||||||
//
|
//
|
||||||
this.availableAlphabeticTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.availableByQuantityTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.availableAlphabeticTreeView.Location = new System.Drawing.Point(3, 3);
|
this.availableByQuantityTreeView.Location = new System.Drawing.Point(3, 3);
|
||||||
this.availableAlphabeticTreeView.Name = "availableAlphabeticTreeView";
|
this.availableByQuantityTreeView.Name = "availableAlphabeticTreeView";
|
||||||
this.availableAlphabeticTreeView.Size = new System.Drawing.Size(192, 421);
|
this.availableByQuantityTreeView.Size = new System.Drawing.Size(192, 421);
|
||||||
this.availableAlphabeticTreeView.TabIndex = 0;
|
this.availableByQuantityTreeView.TabIndex = 0;
|
||||||
this.availableAlphabeticTreeView.DoubleClick += new System.EventHandler(this.availableAlphabeticTreeView_DoubleClick);
|
this.availableByQuantityTreeView.DoubleClick += new System.EventHandler(this.availableByQuantityTreeView_DoubleClick);
|
||||||
//
|
//
|
||||||
// tabPage2
|
// tabPage2
|
||||||
//
|
//
|
||||||
this.tabPage2.Controls.Add(this.availableByQuantityTreeView);
|
this.tabPage2.Controls.Add(this.availableByCategoryTreeView);
|
||||||
this.tabPage2.Location = new System.Drawing.Point(4, 22);
|
this.tabPage2.Location = new System.Drawing.Point(4, 22);
|
||||||
this.tabPage2.Name = "tabPage2";
|
this.tabPage2.Name = "tabPage2";
|
||||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
||||||
@@ -94,16 +94,16 @@
|
|||||||
//
|
//
|
||||||
// availableByQuantityTreeView
|
// availableByQuantityTreeView
|
||||||
//
|
//
|
||||||
this.availableByQuantityTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.availableByCategoryTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.availableByQuantityTreeView.Location = new System.Drawing.Point(3, 3);
|
this.availableByCategoryTreeView.Location = new System.Drawing.Point(3, 3);
|
||||||
this.availableByQuantityTreeView.Name = "availableByQuantityTreeView";
|
this.availableByCategoryTreeView.Name = "availableByQuantityTreeView";
|
||||||
this.availableByQuantityTreeView.Size = new System.Drawing.Size(192, 421);
|
this.availableByCategoryTreeView.Size = new System.Drawing.Size(192, 421);
|
||||||
this.availableByQuantityTreeView.TabIndex = 0;
|
this.availableByCategoryTreeView.TabIndex = 0;
|
||||||
this.availableByQuantityTreeView.DoubleClick += new System.EventHandler(this.availableByQuantityTreeView_DoubleClick);
|
this.availableByCategoryTreeView.DoubleClick += new System.EventHandler(this.availableByCategoryTreeView_DoubleClick);
|
||||||
//
|
//
|
||||||
// tabPage3
|
// tabPage3
|
||||||
//
|
//
|
||||||
this.tabPage3.Controls.Add(this.availableByCategoryTreeView);
|
this.tabPage3.Controls.Add(this.availableAlphabeticTreeView);
|
||||||
this.tabPage3.Location = new System.Drawing.Point(4, 22);
|
this.tabPage3.Location = new System.Drawing.Point(4, 22);
|
||||||
this.tabPage3.Name = "tabPage3";
|
this.tabPage3.Name = "tabPage3";
|
||||||
this.tabPage3.Size = new System.Drawing.Size(198, 427);
|
this.tabPage3.Size = new System.Drawing.Size(198, 427);
|
||||||
@@ -113,12 +113,12 @@
|
|||||||
//
|
//
|
||||||
// availableByCategoryTreeView
|
// availableByCategoryTreeView
|
||||||
//
|
//
|
||||||
this.availableByCategoryTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.availableAlphabeticTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.availableByCategoryTreeView.Location = new System.Drawing.Point(0, 0);
|
this.availableAlphabeticTreeView.Location = new System.Drawing.Point(0, 0);
|
||||||
this.availableByCategoryTreeView.Name = "availableByCategoryTreeView";
|
this.availableAlphabeticTreeView.Name = "availableByCategoryTreeView";
|
||||||
this.availableByCategoryTreeView.Size = new System.Drawing.Size(198, 427);
|
this.availableAlphabeticTreeView.Size = new System.Drawing.Size(198, 427);
|
||||||
this.availableByCategoryTreeView.TabIndex = 0;
|
this.availableAlphabeticTreeView.TabIndex = 0;
|
||||||
this.availableByCategoryTreeView.DoubleClick += new System.EventHandler(this.availableByCategoryTreeView_DoubleClick);
|
this.availableAlphabeticTreeView.DoubleClick += new System.EventHandler(this.availableAlphabeticTreeView_DoubleClick);
|
||||||
//
|
//
|
||||||
// downButton
|
// downButton
|
||||||
//
|
//
|
||||||
@@ -239,11 +239,11 @@
|
|||||||
|
|
||||||
private System.Windows.Forms.TabControl availableTabControl;
|
private System.Windows.Forms.TabControl availableTabControl;
|
||||||
private System.Windows.Forms.TabPage tabPage1;
|
private System.Windows.Forms.TabPage tabPage1;
|
||||||
private System.Windows.Forms.TreeView availableAlphabeticTreeView;
|
|
||||||
private System.Windows.Forms.TabPage tabPage2;
|
|
||||||
private System.Windows.Forms.TreeView availableByQuantityTreeView;
|
private System.Windows.Forms.TreeView availableByQuantityTreeView;
|
||||||
private System.Windows.Forms.TabPage tabPage3;
|
private System.Windows.Forms.TabPage tabPage2;
|
||||||
private System.Windows.Forms.TreeView availableByCategoryTreeView;
|
private System.Windows.Forms.TreeView availableByCategoryTreeView;
|
||||||
|
private System.Windows.Forms.TabPage tabPage3;
|
||||||
|
private System.Windows.Forms.TreeView availableAlphabeticTreeView;
|
||||||
private System.Windows.Forms.Button downButton;
|
private System.Windows.Forms.Button downButton;
|
||||||
private System.Windows.Forms.Button upButton;
|
private System.Windows.Forms.Button upButton;
|
||||||
private ListViewEx selectedResultsListViewEx;
|
private ListViewEx selectedResultsListViewEx;
|
||||||
|
|||||||
@@ -1,14 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Drawing;
|
|
||||||
using System.Data;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using log4net;
|
|
||||||
using Config.Entities;
|
using Config.Entities;
|
||||||
using Results;
|
|
||||||
using Results.Resources;
|
using Results.Resources;
|
||||||
|
|
||||||
namespace Results.Forms
|
namespace Results.Forms
|
||||||
@@ -71,9 +65,9 @@ namespace Results.Forms
|
|||||||
{
|
{
|
||||||
Text = Strings.Configuration;
|
Text = Strings.Configuration;
|
||||||
availableResultsLabel.Text = Strings.Available_results;
|
availableResultsLabel.Text = Strings.Available_results;
|
||||||
availableTabControl.TabPages[0].Text = "A...Z";
|
availableTabControl.TabPages[0].Text = Strings.Quantity;
|
||||||
availableTabControl.TabPages[1].Text = Strings.Quantity;
|
availableTabControl.TabPages[1].Text = Strings.Category;
|
||||||
availableTabControl.TabPages[2].Text = Strings.Category;
|
availableTabControl.TabPages[2].Text = "A...Z";
|
||||||
|
|
||||||
selectedResultsLabel.Text = Strings.Selected_results;
|
selectedResultsLabel.Text = Strings.Selected_results;
|
||||||
|
|
||||||
@@ -133,9 +127,9 @@ namespace Results.Forms
|
|||||||
selectedResultsListViewEx.SubItemClicked += new SubItemEventHandler(selectedResultsListViewEx_SubItemClicked);
|
selectedResultsListViewEx.SubItemClicked += new SubItemEventHandler(selectedResultsListViewEx_SubItemClicked);
|
||||||
selectedResultsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(selectedResultsListViewEx_SubItemEndEditing);
|
selectedResultsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(selectedResultsListViewEx_SubItemEndEditing);
|
||||||
|
|
||||||
availableAlphabeticTreeView.ShowNodeToolTips = true;
|
|
||||||
availableByQuantityTreeView.ShowNodeToolTips = true;
|
availableByQuantityTreeView.ShowNodeToolTips = true;
|
||||||
availableByCategoryTreeView.ShowNodeToolTips = true;
|
availableByCategoryTreeView.ShowNodeToolTips = true;
|
||||||
|
availableAlphabeticTreeView.ShowNodeToolTips = true;
|
||||||
|
|
||||||
RedrawAvailable();
|
RedrawAvailable();
|
||||||
RedrawSelected();
|
RedrawSelected();
|
||||||
@@ -220,9 +214,9 @@ namespace Results.Forms
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
void RedrawAvailable()
|
void RedrawAvailable()
|
||||||
{
|
{
|
||||||
RedrawInAlphabeticOrder(availableAlphabeticTreeView);
|
|
||||||
RedrawByQuantity(availableByQuantityTreeView);
|
RedrawByQuantity(availableByQuantityTreeView);
|
||||||
RedrawByCategory(availableByCategoryTreeView);
|
RedrawByCategory(availableByCategoryTreeView);
|
||||||
|
RedrawInAlphabeticOrder(availableAlphabeticTreeView);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -237,7 +231,7 @@ namespace Results.Forms
|
|||||||
TreeNode node = new TreeNode(item.Name);
|
TreeNode node = new TreeNode(item.Name);
|
||||||
node.Tag = item;
|
node.Tag = item;
|
||||||
node.ToolTipText = item.ToolTipText;
|
node.ToolTipText = item.ToolTipText;
|
||||||
availableAlphabeticTreeView.Nodes.Add(node);
|
treeView.Nodes.Add(node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -356,28 +350,19 @@ namespace Results.Forms
|
|||||||
switch (availableTabControl.SelectedIndex)
|
switch (availableTabControl.SelectedIndex)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
availableAlphabeticTreeView_DoubleClick(this, null);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
availableByQuantityTreeView_DoubleClick(this, null);
|
availableByQuantityTreeView_DoubleClick(this, null);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 1:
|
||||||
availableByCategoryTreeView_DoubleClick(this, null);
|
availableByCategoryTreeView_DoubleClick(this, null);
|
||||||
break;
|
break;
|
||||||
|
case 2:
|
||||||
|
availableAlphabeticTreeView_DoubleClick(this, null);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void availableAlphabeticTreeView_DoubleClick(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
if (availableAlphabeticTreeView.SelectedNode != null &&
|
|
||||||
availableAlphabeticTreeView.SelectedNode.Tag is WMeterRsltItemSpec)
|
|
||||||
{
|
|
||||||
AddItem(availableAlphabeticTreeView.SelectedNode.Tag as WMeterRsltItemSpec);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void availableByQuantityTreeView_DoubleClick(object sender, EventArgs e)
|
private void availableByQuantityTreeView_DoubleClick(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (availableByQuantityTreeView.SelectedNode != null &&
|
if (availableByQuantityTreeView.SelectedNode != null &&
|
||||||
@@ -396,6 +381,15 @@ namespace Results.Forms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void availableAlphabeticTreeView_DoubleClick(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (availableAlphabeticTreeView.SelectedNode != null &&
|
||||||
|
availableAlphabeticTreeView.SelectedNode.Tag is WMeterRsltItemSpec)
|
||||||
|
{
|
||||||
|
AddItem(availableAlphabeticTreeView.SelectedNode.Tag as WMeterRsltItemSpec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void AddItem(WMeterRsltItemSpec item)
|
void AddItem(WMeterRsltItemSpec item)
|
||||||
{
|
{
|
||||||
WMeterRsltItemSpec newItem = item.Clone();
|
WMeterRsltItemSpec newItem = item.Clone();
|
||||||
|
|||||||
@@ -21,11 +21,20 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
public int TopMargin;
|
public int TopMargin;
|
||||||
public int BottomMargin;
|
public int BottomMargin;
|
||||||
public int LeftMargin;
|
public int LeftMargin;
|
||||||
public bool SupressPrinting; /// Bypass printing when true
|
public string TitFntFml;
|
||||||
|
public string HdrFntFml;
|
||||||
|
public string BodyFntFml;
|
||||||
|
public int TitFntSz;
|
||||||
|
public int HdrFntSz;
|
||||||
|
public int BodyFntSz;
|
||||||
|
public int TitFntSty;
|
||||||
|
public int HdrFntSty;
|
||||||
|
public int BodyFntSty;
|
||||||
|
public bool SupressPrinting; /// Bypass printing when true
|
||||||
public Culture Culture;
|
public Culture Culture;
|
||||||
public string[] CommonItems;
|
public string[] CommonItems;
|
||||||
public string[] SelectedItems;
|
public string[] SelectedItems;
|
||||||
public string Header;
|
public string Header; /// =Title
|
||||||
public string Footer;
|
public string Footer;
|
||||||
|
|
||||||
[XmlIgnore]
|
[XmlIgnore]
|
||||||
@@ -48,6 +57,15 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
TopMargin = 100;
|
TopMargin = 100;
|
||||||
BottomMargin = 100;
|
BottomMargin = 100;
|
||||||
LeftMargin = 100;
|
LeftMargin = 100;
|
||||||
|
TitFntFml = "Arial";
|
||||||
|
TitFntSz = 18;
|
||||||
|
TitFntSty = 1;
|
||||||
|
TitFntFml = "Arial";
|
||||||
|
TitFntSz = 10;
|
||||||
|
TitFntSty = 0;
|
||||||
|
TitFntFml = "Arial";
|
||||||
|
TitFntSz = 10;
|
||||||
|
TitFntSty = 0;
|
||||||
SupressPrinting = false;
|
SupressPrinting = false;
|
||||||
Header = string.Empty;
|
Header = string.Empty;
|
||||||
Footer = string.Empty;
|
Footer = string.Empty;
|
||||||
|
|||||||
+240
-55
@@ -40,15 +40,30 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.topMarginTextBox = new System.Windows.Forms.TextBox();
|
this.topMarginTextBox = new System.Windows.Forms.TextBox();
|
||||||
this.topMarginLabel = new System.Windows.Forms.Label();
|
this.topMarginLabel = new System.Windows.Forms.Label();
|
||||||
this.leftMarginTextBox = new System.Windows.Forms.TextBox();
|
this.leftMarginTextBox = new System.Windows.Forms.TextBox();
|
||||||
this.leftMarginLabel = new System.Windows.Forms.Label();
|
|
||||||
this.bottomMarginTextBox = new System.Windows.Forms.TextBox();
|
this.bottomMarginTextBox = new System.Windows.Forms.TextBox();
|
||||||
this.bottomMarginLabel = new System.Windows.Forms.Label();
|
|
||||||
this.cultureComboBox = new System.Windows.Forms.ComboBox();
|
this.cultureComboBox = new System.Windows.Forms.ComboBox();
|
||||||
this.cultureLabel = new System.Windows.Forms.Label();
|
this.cultureLabel = new System.Windows.Forms.Label();
|
||||||
this.commonItemsButton = new System.Windows.Forms.Button();
|
this.commonItemsButton = new System.Windows.Forms.Button();
|
||||||
this.footerButton = new System.Windows.Forms.Button();
|
this.footerButton = new System.Windows.Forms.Button();
|
||||||
this.headerButton = new System.Windows.Forms.Button();
|
this.headerButton = new System.Windows.Forms.Button();
|
||||||
this.testItemsButton = new System.Windows.Forms.Button();
|
this.testItemsButton = new System.Windows.Forms.Button();
|
||||||
|
this.headerFontLabel = new System.Windows.Forms.Label();
|
||||||
|
this.titleFontLabel = new System.Windows.Forms.Label();
|
||||||
|
this.titleFontFamilyComboBox = new System.Windows.Forms.ComboBox();
|
||||||
|
this.headerFontFamilyComboBox = new System.Windows.Forms.ComboBox();
|
||||||
|
this.bodyFontFamilyComboBox = new System.Windows.Forms.ComboBox();
|
||||||
|
this.bodyFontLabel = new System.Windows.Forms.Label();
|
||||||
|
this.titleFontSizeTextBox = new System.Windows.Forms.TextBox();
|
||||||
|
this.headerFontSizeTextBox = new System.Windows.Forms.TextBox();
|
||||||
|
this.bodyFontSizeTextBox = new System.Windows.Forms.TextBox();
|
||||||
|
this.titleBoldCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.titleItalicCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.headerItalicCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.headerBoldCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.bodyItalicCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.bodyBoldCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// nameTextBox
|
// nameTextBox
|
||||||
@@ -56,7 +71,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.nameTextBox.Enabled = false;
|
this.nameTextBox.Enabled = false;
|
||||||
this.nameTextBox.Location = new System.Drawing.Point(142, 40);
|
this.nameTextBox.Location = new System.Drawing.Point(142, 40);
|
||||||
this.nameTextBox.Name = "nameTextBox";
|
this.nameTextBox.Name = "nameTextBox";
|
||||||
this.nameTextBox.Size = new System.Drawing.Size(146, 20);
|
this.nameTextBox.Size = new System.Drawing.Size(218, 20);
|
||||||
this.nameTextBox.TabIndex = 2;
|
this.nameTextBox.TabIndex = 2;
|
||||||
//
|
//
|
||||||
// nameLabel
|
// nameLabel
|
||||||
@@ -81,10 +96,10 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
//
|
//
|
||||||
this.supressPrintingCheckBox.AutoSize = true;
|
this.supressPrintingCheckBox.AutoSize = true;
|
||||||
this.supressPrintingCheckBox.Enabled = false;
|
this.supressPrintingCheckBox.Enabled = false;
|
||||||
this.supressPrintingCheckBox.Location = new System.Drawing.Point(142, 167);
|
this.supressPrintingCheckBox.Location = new System.Drawing.Point(143, 188);
|
||||||
this.supressPrintingCheckBox.Name = "supressPrintingCheckBox";
|
this.supressPrintingCheckBox.Name = "supressPrintingCheckBox";
|
||||||
this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17);
|
this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17);
|
||||||
this.supressPrintingCheckBox.TabIndex = 11;
|
this.supressPrintingCheckBox.TabIndex = 24;
|
||||||
this.supressPrintingCheckBox.Text = "Supress printing";
|
this.supressPrintingCheckBox.Text = "Supress printing";
|
||||||
this.supressPrintingCheckBox.UseVisualStyleBackColor = true;
|
this.supressPrintingCheckBox.UseVisualStyleBackColor = true;
|
||||||
//
|
//
|
||||||
@@ -103,7 +118,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.orientationComboBox.FormattingEnabled = true;
|
this.orientationComboBox.FormattingEnabled = true;
|
||||||
this.orientationComboBox.Location = new System.Drawing.Point(142, 64);
|
this.orientationComboBox.Location = new System.Drawing.Point(142, 64);
|
||||||
this.orientationComboBox.Name = "orientationComboBox";
|
this.orientationComboBox.Name = "orientationComboBox";
|
||||||
this.orientationComboBox.Size = new System.Drawing.Size(146, 21);
|
this.orientationComboBox.Size = new System.Drawing.Size(218, 21);
|
||||||
this.orientationComboBox.TabIndex = 4;
|
this.orientationComboBox.TabIndex = 4;
|
||||||
//
|
//
|
||||||
// topMarginTextBox
|
// topMarginTextBox
|
||||||
@@ -111,7 +126,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.topMarginTextBox.Enabled = false;
|
this.topMarginTextBox.Enabled = false;
|
||||||
this.topMarginTextBox.Location = new System.Drawing.Point(142, 89);
|
this.topMarginTextBox.Location = new System.Drawing.Point(142, 89);
|
||||||
this.topMarginTextBox.Name = "topMarginTextBox";
|
this.topMarginTextBox.Name = "topMarginTextBox";
|
||||||
this.topMarginTextBox.Size = new System.Drawing.Size(80, 20);
|
this.topMarginTextBox.Size = new System.Drawing.Size(44, 20);
|
||||||
this.topMarginTextBox.TabIndex = 6;
|
this.topMarginTextBox.TabIndex = 6;
|
||||||
//
|
//
|
||||||
// topMarginLabel
|
// topMarginLabel
|
||||||
@@ -119,69 +134,51 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.topMarginLabel.AutoSize = true;
|
this.topMarginLabel.AutoSize = true;
|
||||||
this.topMarginLabel.Location = new System.Drawing.Point(16, 92);
|
this.topMarginLabel.Location = new System.Drawing.Point(16, 92);
|
||||||
this.topMarginLabel.Name = "topMarginLabel";
|
this.topMarginLabel.Name = "topMarginLabel";
|
||||||
this.topMarginLabel.Size = new System.Drawing.Size(109, 13);
|
this.topMarginLabel.Size = new System.Drawing.Size(116, 13);
|
||||||
this.topMarginLabel.TabIndex = 5;
|
this.topMarginLabel.TabIndex = 5;
|
||||||
this.topMarginLabel.Text = "Top margin [0.25 mm]";
|
this.topMarginLabel.Text = "Top/bottom/left margin";
|
||||||
//
|
//
|
||||||
// leftMarginTextBox
|
// leftMarginTextBox
|
||||||
//
|
//
|
||||||
this.leftMarginTextBox.Enabled = false;
|
this.leftMarginTextBox.Enabled = false;
|
||||||
this.leftMarginTextBox.Location = new System.Drawing.Point(142, 137);
|
this.leftMarginTextBox.Location = new System.Drawing.Point(244, 89);
|
||||||
this.leftMarginTextBox.Name = "leftMarginTextBox";
|
this.leftMarginTextBox.Name = "leftMarginTextBox";
|
||||||
this.leftMarginTextBox.Size = new System.Drawing.Size(80, 20);
|
this.leftMarginTextBox.Size = new System.Drawing.Size(44, 20);
|
||||||
this.leftMarginTextBox.TabIndex = 10;
|
this.leftMarginTextBox.TabIndex = 8;
|
||||||
//
|
|
||||||
// leftMarginLabel
|
|
||||||
//
|
|
||||||
this.leftMarginLabel.AutoSize = true;
|
|
||||||
this.leftMarginLabel.Location = new System.Drawing.Point(16, 140);
|
|
||||||
this.leftMarginLabel.Name = "leftMarginLabel";
|
|
||||||
this.leftMarginLabel.Size = new System.Drawing.Size(108, 13);
|
|
||||||
this.leftMarginLabel.TabIndex = 9;
|
|
||||||
this.leftMarginLabel.Text = "Left margin [0.25 mm]";
|
|
||||||
//
|
//
|
||||||
// bottomMarginTextBox
|
// bottomMarginTextBox
|
||||||
//
|
//
|
||||||
this.bottomMarginTextBox.Enabled = false;
|
this.bottomMarginTextBox.Enabled = false;
|
||||||
this.bottomMarginTextBox.Location = new System.Drawing.Point(142, 113);
|
this.bottomMarginTextBox.Location = new System.Drawing.Point(193, 89);
|
||||||
this.bottomMarginTextBox.Name = "bottomMarginTextBox";
|
this.bottomMarginTextBox.Name = "bottomMarginTextBox";
|
||||||
this.bottomMarginTextBox.Size = new System.Drawing.Size(80, 20);
|
this.bottomMarginTextBox.Size = new System.Drawing.Size(44, 20);
|
||||||
this.bottomMarginTextBox.TabIndex = 8;
|
this.bottomMarginTextBox.TabIndex = 7;
|
||||||
//
|
|
||||||
// bottomMarginLabel
|
|
||||||
//
|
|
||||||
this.bottomMarginLabel.AutoSize = true;
|
|
||||||
this.bottomMarginLabel.Location = new System.Drawing.Point(16, 116);
|
|
||||||
this.bottomMarginLabel.Name = "bottomMarginLabel";
|
|
||||||
this.bottomMarginLabel.Size = new System.Drawing.Size(123, 13);
|
|
||||||
this.bottomMarginLabel.TabIndex = 7;
|
|
||||||
this.bottomMarginLabel.Text = "Bottom margin [0.25 mm]";
|
|
||||||
//
|
//
|
||||||
// cultureComboBox
|
// cultureComboBox
|
||||||
//
|
//
|
||||||
this.cultureComboBox.Enabled = false;
|
this.cultureComboBox.Enabled = false;
|
||||||
this.cultureComboBox.FormattingEnabled = true;
|
this.cultureComboBox.FormattingEnabled = true;
|
||||||
this.cultureComboBox.Location = new System.Drawing.Point(142, 192);
|
this.cultureComboBox.Location = new System.Drawing.Point(142, 209);
|
||||||
this.cultureComboBox.Name = "cultureComboBox";
|
this.cultureComboBox.Name = "cultureComboBox";
|
||||||
this.cultureComboBox.Size = new System.Drawing.Size(146, 21);
|
this.cultureComboBox.Size = new System.Drawing.Size(218, 21);
|
||||||
this.cultureComboBox.TabIndex = 28;
|
this.cultureComboBox.TabIndex = 26;
|
||||||
//
|
//
|
||||||
// cultureLabel
|
// cultureLabel
|
||||||
//
|
//
|
||||||
this.cultureLabel.AutoSize = true;
|
this.cultureLabel.AutoSize = true;
|
||||||
this.cultureLabel.Location = new System.Drawing.Point(16, 195);
|
this.cultureLabel.Location = new System.Drawing.Point(16, 212);
|
||||||
this.cultureLabel.Name = "cultureLabel";
|
this.cultureLabel.Name = "cultureLabel";
|
||||||
this.cultureLabel.Size = new System.Drawing.Size(42, 13);
|
this.cultureLabel.Size = new System.Drawing.Size(42, 13);
|
||||||
this.cultureLabel.TabIndex = 27;
|
this.cultureLabel.TabIndex = 25;
|
||||||
this.cultureLabel.Text = "Cullture";
|
this.cultureLabel.Text = "Cullture";
|
||||||
//
|
//
|
||||||
// commonItemsButton
|
// commonItemsButton
|
||||||
//
|
//
|
||||||
this.commonItemsButton.Enabled = false;
|
this.commonItemsButton.Enabled = false;
|
||||||
this.commonItemsButton.Location = new System.Drawing.Point(142, 242);
|
this.commonItemsButton.Location = new System.Drawing.Point(142, 259);
|
||||||
this.commonItemsButton.Name = "commonItemsButton";
|
this.commonItemsButton.Name = "commonItemsButton";
|
||||||
this.commonItemsButton.Size = new System.Drawing.Size(146, 23);
|
this.commonItemsButton.Size = new System.Drawing.Size(218, 23);
|
||||||
this.commonItemsButton.TabIndex = 30;
|
this.commonItemsButton.TabIndex = 28;
|
||||||
this.commonItemsButton.Text = "Common items";
|
this.commonItemsButton.Text = "Common items";
|
||||||
this.commonItemsButton.UseVisualStyleBackColor = true;
|
this.commonItemsButton.UseVisualStyleBackColor = true;
|
||||||
this.commonItemsButton.Click += new System.EventHandler(this.commonItemsButton_Click);
|
this.commonItemsButton.Click += new System.EventHandler(this.commonItemsButton_Click);
|
||||||
@@ -189,10 +186,10 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
// footerButton
|
// footerButton
|
||||||
//
|
//
|
||||||
this.footerButton.Enabled = false;
|
this.footerButton.Enabled = false;
|
||||||
this.footerButton.Location = new System.Drawing.Point(142, 292);
|
this.footerButton.Location = new System.Drawing.Point(142, 309);
|
||||||
this.footerButton.Name = "footerButton";
|
this.footerButton.Name = "footerButton";
|
||||||
this.footerButton.Size = new System.Drawing.Size(146, 23);
|
this.footerButton.Size = new System.Drawing.Size(218, 23);
|
||||||
this.footerButton.TabIndex = 32;
|
this.footerButton.TabIndex = 30;
|
||||||
this.footerButton.Text = "Footer";
|
this.footerButton.Text = "Footer";
|
||||||
this.footerButton.UseVisualStyleBackColor = true;
|
this.footerButton.UseVisualStyleBackColor = true;
|
||||||
this.footerButton.Click += new System.EventHandler(this.footerButton_Click);
|
this.footerButton.Click += new System.EventHandler(this.footerButton_Click);
|
||||||
@@ -200,29 +197,202 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
// headerButton
|
// headerButton
|
||||||
//
|
//
|
||||||
this.headerButton.Enabled = false;
|
this.headerButton.Enabled = false;
|
||||||
this.headerButton.Location = new System.Drawing.Point(142, 217);
|
this.headerButton.Location = new System.Drawing.Point(142, 234);
|
||||||
this.headerButton.Name = "headerButton";
|
this.headerButton.Name = "headerButton";
|
||||||
this.headerButton.Size = new System.Drawing.Size(146, 23);
|
this.headerButton.Size = new System.Drawing.Size(218, 23);
|
||||||
this.headerButton.TabIndex = 29;
|
this.headerButton.TabIndex = 27;
|
||||||
this.headerButton.Text = "Header";
|
this.headerButton.Text = "Title";
|
||||||
this.headerButton.UseVisualStyleBackColor = true;
|
this.headerButton.UseVisualStyleBackColor = true;
|
||||||
this.headerButton.Click += new System.EventHandler(this.headerButton_Click);
|
this.headerButton.Click += new System.EventHandler(this.headerButton_Click);
|
||||||
//
|
//
|
||||||
// testItemsButton
|
// testItemsButton
|
||||||
//
|
//
|
||||||
this.testItemsButton.Enabled = false;
|
this.testItemsButton.Enabled = false;
|
||||||
this.testItemsButton.Location = new System.Drawing.Point(142, 267);
|
this.testItemsButton.Location = new System.Drawing.Point(142, 284);
|
||||||
this.testItemsButton.Name = "testItemsButton";
|
this.testItemsButton.Name = "testItemsButton";
|
||||||
this.testItemsButton.Size = new System.Drawing.Size(146, 23);
|
this.testItemsButton.Size = new System.Drawing.Size(218, 23);
|
||||||
this.testItemsButton.TabIndex = 31;
|
this.testItemsButton.TabIndex = 29;
|
||||||
this.testItemsButton.Text = "Test items";
|
this.testItemsButton.Text = "Test items";
|
||||||
this.testItemsButton.UseVisualStyleBackColor = true;
|
this.testItemsButton.UseVisualStyleBackColor = true;
|
||||||
this.testItemsButton.Click += new System.EventHandler(this.testItemsButton_Click);
|
this.testItemsButton.Click += new System.EventHandler(this.testItemsButton_Click);
|
||||||
//
|
//
|
||||||
|
// headerFontLabel
|
||||||
|
//
|
||||||
|
this.headerFontLabel.AutoSize = true;
|
||||||
|
this.headerFontLabel.Location = new System.Drawing.Point(16, 140);
|
||||||
|
this.headerFontLabel.Name = "headerFontLabel";
|
||||||
|
this.headerFontLabel.Size = new System.Drawing.Size(112, 13);
|
||||||
|
this.headerFontLabel.TabIndex = 14;
|
||||||
|
this.headerFontLabel.Text = "Header font/size/style";
|
||||||
|
//
|
||||||
|
// titleFontLabel
|
||||||
|
//
|
||||||
|
this.titleFontLabel.AutoSize = true;
|
||||||
|
this.titleFontLabel.Location = new System.Drawing.Point(16, 116);
|
||||||
|
this.titleFontLabel.Name = "titleFontLabel";
|
||||||
|
this.titleFontLabel.Size = new System.Drawing.Size(97, 13);
|
||||||
|
this.titleFontLabel.TabIndex = 9;
|
||||||
|
this.titleFontLabel.Text = "Title font/size/style";
|
||||||
|
//
|
||||||
|
// titleFontFamilyComboBox
|
||||||
|
//
|
||||||
|
this.titleFontFamilyComboBox.Enabled = false;
|
||||||
|
this.titleFontFamilyComboBox.FormattingEnabled = true;
|
||||||
|
this.titleFontFamilyComboBox.Location = new System.Drawing.Point(142, 113);
|
||||||
|
this.titleFontFamilyComboBox.Name = "titleFontFamilyComboBox";
|
||||||
|
this.titleFontFamilyComboBox.Size = new System.Drawing.Size(110, 21);
|
||||||
|
this.titleFontFamilyComboBox.TabIndex = 10;
|
||||||
|
//
|
||||||
|
// headerFontFamilyComboBox
|
||||||
|
//
|
||||||
|
this.headerFontFamilyComboBox.Enabled = false;
|
||||||
|
this.headerFontFamilyComboBox.FormattingEnabled = true;
|
||||||
|
this.headerFontFamilyComboBox.Location = new System.Drawing.Point(142, 137);
|
||||||
|
this.headerFontFamilyComboBox.Name = "headerFontFamilyComboBox";
|
||||||
|
this.headerFontFamilyComboBox.Size = new System.Drawing.Size(110, 21);
|
||||||
|
this.headerFontFamilyComboBox.TabIndex = 15;
|
||||||
|
//
|
||||||
|
// bodyFontFamilyComboBox
|
||||||
|
//
|
||||||
|
this.bodyFontFamilyComboBox.Enabled = false;
|
||||||
|
this.bodyFontFamilyComboBox.FormattingEnabled = true;
|
||||||
|
this.bodyFontFamilyComboBox.Location = new System.Drawing.Point(142, 161);
|
||||||
|
this.bodyFontFamilyComboBox.Name = "bodyFontFamilyComboBox";
|
||||||
|
this.bodyFontFamilyComboBox.Size = new System.Drawing.Size(110, 21);
|
||||||
|
this.bodyFontFamilyComboBox.TabIndex = 20;
|
||||||
|
//
|
||||||
|
// bodyFontLabel
|
||||||
|
//
|
||||||
|
this.bodyFontLabel.AutoSize = true;
|
||||||
|
this.bodyFontLabel.Location = new System.Drawing.Point(16, 164);
|
||||||
|
this.bodyFontLabel.Name = "bodyFontLabel";
|
||||||
|
this.bodyFontLabel.Size = new System.Drawing.Size(101, 13);
|
||||||
|
this.bodyFontLabel.TabIndex = 19;
|
||||||
|
this.bodyFontLabel.Text = "Body font/size/style";
|
||||||
|
//
|
||||||
|
// titleFontSizeTextBox
|
||||||
|
//
|
||||||
|
this.titleFontSizeTextBox.Enabled = false;
|
||||||
|
this.titleFontSizeTextBox.Location = new System.Drawing.Point(258, 113);
|
||||||
|
this.titleFontSizeTextBox.Name = "titleFontSizeTextBox";
|
||||||
|
this.titleFontSizeTextBox.Size = new System.Drawing.Size(30, 20);
|
||||||
|
this.titleFontSizeTextBox.TabIndex = 11;
|
||||||
|
//
|
||||||
|
// headerFontSizeTextBox
|
||||||
|
//
|
||||||
|
this.headerFontSizeTextBox.Enabled = false;
|
||||||
|
this.headerFontSizeTextBox.Location = new System.Drawing.Point(258, 137);
|
||||||
|
this.headerFontSizeTextBox.Name = "headerFontSizeTextBox";
|
||||||
|
this.headerFontSizeTextBox.Size = new System.Drawing.Size(30, 20);
|
||||||
|
this.headerFontSizeTextBox.TabIndex = 16;
|
||||||
|
//
|
||||||
|
// bodyFontSizeTextBox
|
||||||
|
//
|
||||||
|
this.bodyFontSizeTextBox.Enabled = false;
|
||||||
|
this.bodyFontSizeTextBox.Location = new System.Drawing.Point(258, 161);
|
||||||
|
this.bodyFontSizeTextBox.Name = "bodyFontSizeTextBox";
|
||||||
|
this.bodyFontSizeTextBox.Size = new System.Drawing.Size(29, 20);
|
||||||
|
this.bodyFontSizeTextBox.TabIndex = 21;
|
||||||
|
//
|
||||||
|
// titleBoldCheckBox
|
||||||
|
//
|
||||||
|
this.titleBoldCheckBox.AutoSize = true;
|
||||||
|
this.titleBoldCheckBox.Enabled = false;
|
||||||
|
this.titleBoldCheckBox.Location = new System.Drawing.Point(306, 116);
|
||||||
|
this.titleBoldCheckBox.Name = "titleBoldCheckBox";
|
||||||
|
this.titleBoldCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.titleBoldCheckBox.TabIndex = 12;
|
||||||
|
this.titleBoldCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// titleItalicCheckBox
|
||||||
|
//
|
||||||
|
this.titleItalicCheckBox.AutoSize = true;
|
||||||
|
this.titleItalicCheckBox.Enabled = false;
|
||||||
|
this.titleItalicCheckBox.Location = new System.Drawing.Point(334, 116);
|
||||||
|
this.titleItalicCheckBox.Name = "titleItalicCheckBox";
|
||||||
|
this.titleItalicCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.titleItalicCheckBox.TabIndex = 13;
|
||||||
|
this.titleItalicCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// headerItalicCheckBox
|
||||||
|
//
|
||||||
|
this.headerItalicCheckBox.AutoSize = true;
|
||||||
|
this.headerItalicCheckBox.Enabled = false;
|
||||||
|
this.headerItalicCheckBox.Location = new System.Drawing.Point(334, 140);
|
||||||
|
this.headerItalicCheckBox.Name = "headerItalicCheckBox";
|
||||||
|
this.headerItalicCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.headerItalicCheckBox.TabIndex = 18;
|
||||||
|
this.headerItalicCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// headerBoldCheckBox
|
||||||
|
//
|
||||||
|
this.headerBoldCheckBox.AutoSize = true;
|
||||||
|
this.headerBoldCheckBox.Enabled = false;
|
||||||
|
this.headerBoldCheckBox.Location = new System.Drawing.Point(306, 140);
|
||||||
|
this.headerBoldCheckBox.Name = "headerBoldCheckBox";
|
||||||
|
this.headerBoldCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.headerBoldCheckBox.TabIndex = 17;
|
||||||
|
this.headerBoldCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// bodyItalicCheckBox
|
||||||
|
//
|
||||||
|
this.bodyItalicCheckBox.AutoSize = true;
|
||||||
|
this.bodyItalicCheckBox.Enabled = false;
|
||||||
|
this.bodyItalicCheckBox.Location = new System.Drawing.Point(334, 164);
|
||||||
|
this.bodyItalicCheckBox.Name = "bodyItalicCheckBox";
|
||||||
|
this.bodyItalicCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.bodyItalicCheckBox.TabIndex = 23;
|
||||||
|
this.bodyItalicCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// bodyBoldCheckBox
|
||||||
|
//
|
||||||
|
this.bodyBoldCheckBox.AutoSize = true;
|
||||||
|
this.bodyBoldCheckBox.Enabled = false;
|
||||||
|
this.bodyBoldCheckBox.Location = new System.Drawing.Point(306, 164);
|
||||||
|
this.bodyBoldCheckBox.Name = "bodyBoldCheckBox";
|
||||||
|
this.bodyBoldCheckBox.Size = new System.Drawing.Size(15, 14);
|
||||||
|
this.bodyBoldCheckBox.TabIndex = 22;
|
||||||
|
this.bodyBoldCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
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, 100);
|
||||||
|
this.label1.Name = "label1";
|
||||||
|
this.label1.Size = new System.Drawing.Size(32, 13);
|
||||||
|
this.label1.TabIndex = 31;
|
||||||
|
this.label1.Text = "Bold";
|
||||||
|
//
|
||||||
|
// label2
|
||||||
|
//
|
||||||
|
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(330, 100);
|
||||||
|
this.label2.Name = "label2";
|
||||||
|
this.label2.Size = new System.Drawing.Size(24, 13);
|
||||||
|
this.label2.TabIndex = 32;
|
||||||
|
this.label2.Text = "Ital.";
|
||||||
|
//
|
||||||
// PrinterCfgCtrl
|
// PrinterCfgCtrl
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.Controls.Add(this.label2);
|
||||||
|
this.Controls.Add(this.label1);
|
||||||
|
this.Controls.Add(this.bodyItalicCheckBox);
|
||||||
|
this.Controls.Add(this.bodyBoldCheckBox);
|
||||||
|
this.Controls.Add(this.headerItalicCheckBox);
|
||||||
|
this.Controls.Add(this.headerBoldCheckBox);
|
||||||
|
this.Controls.Add(this.titleItalicCheckBox);
|
||||||
|
this.Controls.Add(this.titleBoldCheckBox);
|
||||||
|
this.Controls.Add(this.bodyFontSizeTextBox);
|
||||||
|
this.Controls.Add(this.headerFontSizeTextBox);
|
||||||
|
this.Controls.Add(this.titleFontSizeTextBox);
|
||||||
|
this.Controls.Add(this.bodyFontFamilyComboBox);
|
||||||
|
this.Controls.Add(this.bodyFontLabel);
|
||||||
|
this.Controls.Add(this.headerFontFamilyComboBox);
|
||||||
|
this.Controls.Add(this.titleFontFamilyComboBox);
|
||||||
this.Controls.Add(this.cultureComboBox);
|
this.Controls.Add(this.cultureComboBox);
|
||||||
this.Controls.Add(this.cultureLabel);
|
this.Controls.Add(this.cultureLabel);
|
||||||
this.Controls.Add(this.commonItemsButton);
|
this.Controls.Add(this.commonItemsButton);
|
||||||
@@ -230,9 +400,9 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
this.Controls.Add(this.headerButton);
|
this.Controls.Add(this.headerButton);
|
||||||
this.Controls.Add(this.testItemsButton);
|
this.Controls.Add(this.testItemsButton);
|
||||||
this.Controls.Add(this.bottomMarginTextBox);
|
this.Controls.Add(this.bottomMarginTextBox);
|
||||||
this.Controls.Add(this.bottomMarginLabel);
|
this.Controls.Add(this.titleFontLabel);
|
||||||
this.Controls.Add(this.leftMarginTextBox);
|
this.Controls.Add(this.leftMarginTextBox);
|
||||||
this.Controls.Add(this.leftMarginLabel);
|
this.Controls.Add(this.headerFontLabel);
|
||||||
this.Controls.Add(this.topMarginTextBox);
|
this.Controls.Add(this.topMarginTextBox);
|
||||||
this.Controls.Add(this.topMarginLabel);
|
this.Controls.Add(this.topMarginLabel);
|
||||||
this.Controls.Add(this.orientationComboBox);
|
this.Controls.Add(this.orientationComboBox);
|
||||||
@@ -260,14 +430,29 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
private System.Windows.Forms.TextBox topMarginTextBox;
|
private System.Windows.Forms.TextBox topMarginTextBox;
|
||||||
private System.Windows.Forms.Label topMarginLabel;
|
private System.Windows.Forms.Label topMarginLabel;
|
||||||
private System.Windows.Forms.TextBox leftMarginTextBox;
|
private System.Windows.Forms.TextBox leftMarginTextBox;
|
||||||
private System.Windows.Forms.Label leftMarginLabel;
|
|
||||||
private System.Windows.Forms.TextBox bottomMarginTextBox;
|
private System.Windows.Forms.TextBox bottomMarginTextBox;
|
||||||
private System.Windows.Forms.Label bottomMarginLabel;
|
|
||||||
private System.Windows.Forms.ComboBox cultureComboBox;
|
private System.Windows.Forms.ComboBox cultureComboBox;
|
||||||
private System.Windows.Forms.Label cultureLabel;
|
private System.Windows.Forms.Label cultureLabel;
|
||||||
private System.Windows.Forms.Button commonItemsButton;
|
private System.Windows.Forms.Button commonItemsButton;
|
||||||
private System.Windows.Forms.Button footerButton;
|
private System.Windows.Forms.Button footerButton;
|
||||||
private System.Windows.Forms.Button headerButton;
|
private System.Windows.Forms.Button headerButton;
|
||||||
private System.Windows.Forms.Button testItemsButton;
|
private System.Windows.Forms.Button testItemsButton;
|
||||||
|
private System.Windows.Forms.Label headerFontLabel;
|
||||||
|
private System.Windows.Forms.Label titleFontLabel;
|
||||||
|
private System.Windows.Forms.ComboBox titleFontFamilyComboBox;
|
||||||
|
private System.Windows.Forms.ComboBox headerFontFamilyComboBox;
|
||||||
|
private System.Windows.Forms.ComboBox bodyFontFamilyComboBox;
|
||||||
|
private System.Windows.Forms.Label bodyFontLabel;
|
||||||
|
private System.Windows.Forms.TextBox titleFontSizeTextBox;
|
||||||
|
private System.Windows.Forms.TextBox headerFontSizeTextBox;
|
||||||
|
private System.Windows.Forms.TextBox bodyFontSizeTextBox;
|
||||||
|
private System.Windows.Forms.CheckBox titleBoldCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox titleItalicCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox headerItalicCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox headerBoldCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox bodyItalicCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox bodyBoldCheckBox;
|
||||||
|
private System.Windows.Forms.Label label1;
|
||||||
|
private System.Windows.Forms.Label label2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,13 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
|
|
||||||
orientationComboBox.Items.Add(PageOrientation.Portrait.ToString());
|
orientationComboBox.Items.Add(PageOrientation.Portrait.ToString());
|
||||||
orientationComboBox.Items.Add(PageOrientation.Landscape.ToString());
|
orientationComboBox.Items.Add(PageOrientation.Landscape.ToString());
|
||||||
|
|
||||||
|
foreach (var ff in System.Drawing.FontFamily.Families)
|
||||||
|
{
|
||||||
|
titleFontFamilyComboBox.Items.Add(ff.Name);
|
||||||
|
headerFontFamilyComboBox.Items.Add(ff.Name);
|
||||||
|
bodyFontFamilyComboBox.Items.Add(ff.Name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PrinterCfgCtrl_Load(object sender, EventArgs e)
|
private void PrinterCfgCtrl_Load(object sender, EventArgs e)
|
||||||
@@ -84,6 +91,22 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
topMarginTextBox.Text = config.TopMargin.ToString();
|
topMarginTextBox.Text = config.TopMargin.ToString();
|
||||||
bottomMarginTextBox.Text = config.BottomMargin.ToString();
|
bottomMarginTextBox.Text = config.BottomMargin.ToString();
|
||||||
leftMarginTextBox.Text = config.LeftMargin.ToString();
|
leftMarginTextBox.Text = config.LeftMargin.ToString();
|
||||||
|
|
||||||
|
titleFontFamilyComboBox.Text = config.TitFntFml;
|
||||||
|
titleFontSizeTextBox.Text = config.TitFntSz.ToString();
|
||||||
|
titleBoldCheckBox.Checked = ((config.TitFntSty & (int)System.Drawing.FontStyle.Bold) != 0);
|
||||||
|
titleItalicCheckBox.Checked = ((config.TitFntSty & (int)System.Drawing.FontStyle.Italic) != 0);
|
||||||
|
|
||||||
|
headerFontFamilyComboBox.Text = config.HdrFntFml;
|
||||||
|
headerFontSizeTextBox.Text = config.HdrFntSz.ToString();
|
||||||
|
headerBoldCheckBox.Checked = ((config.HdrFntSty & (int)System.Drawing.FontStyle.Bold) != 0);
|
||||||
|
headerItalicCheckBox.Checked = ((config.HdrFntSty & (int)System.Drawing.FontStyle.Italic) != 0);
|
||||||
|
|
||||||
|
bodyFontFamilyComboBox.Text = config.BodyFntFml;
|
||||||
|
bodyFontSizeTextBox.Text = config.BodyFntSz.ToString();
|
||||||
|
bodyBoldCheckBox.Checked = ((config.BodyFntSty & (int)System.Drawing.FontStyle.Bold) != 0);
|
||||||
|
bodyItalicCheckBox.Checked = ((config.BodyFntSty & (int)System.Drawing.FontStyle.Italic) != 0);
|
||||||
|
|
||||||
supressPrintingCheckBox.Checked = config.SupressPrinting;
|
supressPrintingCheckBox.Checked = config.SupressPrinting;
|
||||||
cultureComboBox.Text = config.Culture.ToString();
|
cultureComboBox.Text = config.Culture.ToString();
|
||||||
}
|
}
|
||||||
@@ -95,6 +118,18 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
topMarginTextBox.Enabled = true;
|
topMarginTextBox.Enabled = true;
|
||||||
bottomMarginTextBox.Enabled = true;
|
bottomMarginTextBox.Enabled = true;
|
||||||
leftMarginTextBox.Enabled = true;
|
leftMarginTextBox.Enabled = true;
|
||||||
|
titleFontFamilyComboBox.Enabled = true;
|
||||||
|
titleFontSizeTextBox.Enabled = true;
|
||||||
|
titleBoldCheckBox.Enabled = true;
|
||||||
|
titleItalicCheckBox.Enabled = true;
|
||||||
|
headerFontFamilyComboBox.Enabled = true;
|
||||||
|
headerFontSizeTextBox.Enabled = true;
|
||||||
|
headerBoldCheckBox.Enabled = true;
|
||||||
|
headerItalicCheckBox.Enabled = true;
|
||||||
|
bodyFontFamilyComboBox.Enabled = true;
|
||||||
|
bodyFontSizeTextBox.Enabled = true;
|
||||||
|
bodyBoldCheckBox.Enabled = true;
|
||||||
|
bodyItalicCheckBox.Enabled = true;
|
||||||
supressPrintingCheckBox.Enabled = true;
|
supressPrintingCheckBox.Enabled = true;
|
||||||
cultureComboBox.Enabled = true;
|
cultureComboBox.Enabled = true;
|
||||||
headerButton.Enabled = true;
|
headerButton.Enabled = true;
|
||||||
@@ -132,6 +167,24 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
flags |= CfgUpdateFlags.Error;
|
flags |= CfgUpdateFlags.Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!int.TryParse(titleFontSizeTextBox.Text, out dummy) || dummy < 6 || dummy > 48)
|
||||||
|
{
|
||||||
|
message += Environment.NewLine + "Title font size' should be between 6 and 48";
|
||||||
|
flags |= CfgUpdateFlags.Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!int.TryParse(headerFontSizeTextBox.Text, out dummy) || dummy < 6 || dummy > 48)
|
||||||
|
{
|
||||||
|
message += Environment.NewLine + "Header font size' should be between 6 and 48";
|
||||||
|
flags |= CfgUpdateFlags.Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!int.TryParse(bodyFontSizeTextBox.Text, out dummy) || dummy < 6 || dummy > 48)
|
||||||
|
{
|
||||||
|
message += Environment.NewLine + "Body font size' should be between 6 and 48";
|
||||||
|
flags |= CfgUpdateFlags.Error;
|
||||||
|
}
|
||||||
|
|
||||||
if (!cultureComboBox.Items.Contains(cultureComboBox.Text))
|
if (!cultureComboBox.Items.Contains(cultureComboBox.Text))
|
||||||
{
|
{
|
||||||
flags |= CfgUpdateFlags.Error;
|
flags |= CfgUpdateFlags.Error;
|
||||||
@@ -180,6 +233,66 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
|
|||||||
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Title font properties
|
||||||
|
if (config.TitFntFml != titleFontFamilyComboBox.Text)
|
||||||
|
{
|
||||||
|
config.TitFntFml = titleFontFamilyComboBox.Text;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = int.Parse(titleFontSizeTextBox.Text);
|
||||||
|
if (config.TitFntSz != tmp)
|
||||||
|
{
|
||||||
|
config.TitFntSz = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = (titleBoldCheckBox.Checked ? (int)System.Drawing.FontStyle.Bold : 0)
|
||||||
|
+ (titleItalicCheckBox.Checked ? (int)System.Drawing.FontStyle.Italic : 0);
|
||||||
|
if (config.TitFntSty != tmp)
|
||||||
|
{
|
||||||
|
config.TitFntSty = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Header font properties
|
||||||
|
if (config.HdrFntFml != headerFontFamilyComboBox.Text)
|
||||||
|
{
|
||||||
|
config.HdrFntFml = headerFontFamilyComboBox.Text;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = int.Parse(headerFontSizeTextBox.Text);
|
||||||
|
if (config.HdrFntSz != tmp)
|
||||||
|
{
|
||||||
|
config.HdrFntSz = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = (headerBoldCheckBox.Checked ? (int)System.Drawing.FontStyle.Bold : 0)
|
||||||
|
+ (headerItalicCheckBox.Checked ? (int)System.Drawing.FontStyle.Italic : 0);
|
||||||
|
if (config.HdrFntSty != tmp)
|
||||||
|
{
|
||||||
|
config.HdrFntSty = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Body font properties
|
||||||
|
if (config.BodyFntFml != bodyFontFamilyComboBox.Text)
|
||||||
|
{
|
||||||
|
config.BodyFntFml = bodyFontFamilyComboBox.Text;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = int.Parse(bodyFontSizeTextBox.Text);
|
||||||
|
if (config.BodyFntSz != tmp)
|
||||||
|
{
|
||||||
|
config.BodyFntSz = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
tmp = (bodyBoldCheckBox.Checked ? (int)System.Drawing.FontStyle.Bold : 0)
|
||||||
|
+ (bodyItalicCheckBox.Checked ? (int)System.Drawing.FontStyle.Italic : 0);
|
||||||
|
if (config.BodyFntSty != tmp)
|
||||||
|
{
|
||||||
|
config.BodyFntSty = tmp;
|
||||||
|
flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
||||||
|
}
|
||||||
|
|
||||||
if (config.SupressPrinting != supressPrintingCheckBox.Checked)
|
if (config.SupressPrinting != supressPrintingCheckBox.Checked)
|
||||||
{
|
{
|
||||||
config.SupressPrinting = supressPrintingCheckBox.Checked;
|
config.SupressPrinting = supressPrintingCheckBox.Checked;
|
||||||
|
|||||||
Reference in New Issue
Block a user