diff --git a/VAR.Toolbox/Controls/ControlsUtils.cs b/VAR.Toolbox/Controls/ControlsUtils.cs new file mode 100644 index 0000000..64a0935 --- /dev/null +++ b/VAR.Toolbox/Controls/ControlsUtils.cs @@ -0,0 +1,12 @@ +using System.Windows.Forms; + +namespace VAR.Toolbox.Controls +{ + public static class ControlsUtils + { + public static float GetFontSize(Control ctrl, float size) + { + return size * 96f / ctrl.CreateGraphics().DpiX; + } + } +} diff --git a/VAR.Toolbox/Controls/CtrOutput.cs b/VAR.Toolbox/Controls/CtrOutput.cs index 418bff1..d626b8b 100644 --- a/VAR.Toolbox/Controls/CtrOutput.cs +++ b/VAR.Toolbox/Controls/CtrOutput.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Runtime.InteropServices; using System.Text; using System.Windows.Forms; @@ -9,7 +8,7 @@ namespace VAR.Toolbox.Controls { public class CtrOutput : Control { - private ListBox _listBox; + private ListBoxMonospace _listBox; private Timer _timer; @@ -32,14 +31,9 @@ namespace VAR.Toolbox.Controls private void InitializeControls() { - _listBox = new ListBox + _listBox = new ListBoxMonospace { Dock = DockStyle.Fill, - FormattingEnabled = true, - Font = new System.Drawing.Font("Consolas", 9), - BackColor = Color.Black, - ForeColor = Color.Gray, - SelectionMode = SelectionMode.MultiExtended, }; _listBox.MouseDoubleClick += ListBox_MouseDoubleClick; _listBox.KeyDown += ListBox_KeyDown; diff --git a/VAR.Toolbox/Controls/Frame.cs b/VAR.Toolbox/Controls/Frame.cs new file mode 100644 index 0000000..687e1b5 --- /dev/null +++ b/VAR.Toolbox/Controls/Frame.cs @@ -0,0 +1,11 @@ +namespace VAR.Toolbox.Controls +{ + public class Frame : System.Windows.Forms.Form + { + public Frame() + { + Font = new System.Drawing.Font(Font.Name, ControlsUtils.GetFontSize(this, 8.25f), Font.Style, Font.Unit, Font.GdiCharSet, Font.GdiVerticalFont); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + } + } +} diff --git a/VAR.Toolbox/Controls/ListBoxMonospace.cs b/VAR.Toolbox/Controls/ListBoxMonospace.cs new file mode 100644 index 0000000..0ef19d7 --- /dev/null +++ b/VAR.Toolbox/Controls/ListBoxMonospace.cs @@ -0,0 +1,17 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace VAR.Toolbox.Controls +{ + public class ListBoxMonospace : ListBox + { + public ListBoxMonospace() + { + FormattingEnabled = true; + Font = new Font("Consolas", ControlsUtils.GetFontSize(this, 9)); + BackColor = Color.Black; + ForeColor = Color.Gray; + SelectionMode = SelectionMode.MultiExtended; + } + } +} diff --git a/VAR.Toolbox/Controls/ListBoxNormal.cs b/VAR.Toolbox/Controls/ListBoxNormal.cs new file mode 100644 index 0000000..2827b27 --- /dev/null +++ b/VAR.Toolbox/Controls/ListBoxNormal.cs @@ -0,0 +1,13 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace VAR.Toolbox.Controls +{ + public class ListBoxNormal : ListBox + { + public ListBoxNormal() + { + Font = new Font("Microsoft Sans Serif", ControlsUtils.GetFontSize(this, 8.25f)); + } + } +} diff --git a/VAR.Toolbox/Controls/SubFrame.cs b/VAR.Toolbox/Controls/SubFrame.cs new file mode 100644 index 0000000..47f010f --- /dev/null +++ b/VAR.Toolbox/Controls/SubFrame.cs @@ -0,0 +1,11 @@ +namespace VAR.Toolbox.Controls +{ + public class SubFrame : System.Windows.Forms.UserControl + { + public SubFrame() + { + Font = new System.Drawing.Font(Font.Name, ControlsUtils.GetFontSize(this, 8.25f), Font.Style, Font.Unit, Font.GdiCharSet, Font.GdiVerticalFont); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + } + } +} diff --git a/VAR.Toolbox/Controls/TextBoxMonospace.cs b/VAR.Toolbox/Controls/TextBoxMonospace.cs new file mode 100644 index 0000000..573e965 --- /dev/null +++ b/VAR.Toolbox/Controls/TextBoxMonospace.cs @@ -0,0 +1,13 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace VAR.Toolbox.Controls +{ + public class TextBoxMonospace : TextBox + { + public TextBoxMonospace() + { + Font = new Font("Consolas", ControlsUtils.GetFontSize(this, 9.0f)); + } + } +} diff --git a/VAR.Toolbox/Controls/TextBoxNormal.cs b/VAR.Toolbox/Controls/TextBoxNormal.cs new file mode 100644 index 0000000..57cfd38 --- /dev/null +++ b/VAR.Toolbox/Controls/TextBoxNormal.cs @@ -0,0 +1,13 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace VAR.Toolbox.Controls +{ + public class TextBoxNormal : TextBox + { + public TextBoxNormal() + { + Font = new Font("Microsoft Sans Serif", ControlsUtils.GetFontSize(this, 8.25f)); + } + } +} diff --git a/VAR.Toolbox/UI/FrmDialogString.Designer.cs b/VAR.Toolbox/UI/FrmDialogString.Designer.cs index 2c67edd..7800815 100644 --- a/VAR.Toolbox/UI/FrmDialogString.Designer.cs +++ b/VAR.Toolbox/UI/FrmDialogString.Designer.cs @@ -30,7 +30,7 @@ { this.lblDescription = new System.Windows.Forms.Label(); this.tblLayout = new System.Windows.Forms.TableLayoutPanel(); - this.txtValue = new System.Windows.Forms.TextBox(); + this.txtValue = new VAR.Toolbox.Controls.TextBoxNormal(); this.flowButtons = new System.Windows.Forms.FlowLayoutPanel(); this.btnAccept = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); @@ -108,8 +108,6 @@ // // FrmDialogString // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(440, 284); this.Controls.Add(this.tblLayout); this.Name = "FrmDialogString"; @@ -125,7 +123,7 @@ private System.Windows.Forms.Label lblDescription; private System.Windows.Forms.TableLayoutPanel tblLayout; - private System.Windows.Forms.TextBox txtValue; + private VAR.Toolbox.Controls.TextBoxNormal txtValue; private System.Windows.Forms.FlowLayoutPanel flowButtons; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnAccept; diff --git a/VAR.Toolbox/UI/FrmDialogString.cs b/VAR.Toolbox/UI/FrmDialogString.cs index e8bc1ab..7f90e08 100644 --- a/VAR.Toolbox/UI/FrmDialogString.cs +++ b/VAR.Toolbox/UI/FrmDialogString.cs @@ -1,8 +1,8 @@ -using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmDialogString : Form + public partial class FrmDialogString : Frame { public FrmDialogString() { diff --git a/VAR.Toolbox/UI/FrmListBoxDialog.Designer.cs b/VAR.Toolbox/UI/FrmListBoxDialog.Designer.cs index f414482..0e36dde 100644 --- a/VAR.Toolbox/UI/FrmListBoxDialog.Designer.cs +++ b/VAR.Toolbox/UI/FrmListBoxDialog.Designer.cs @@ -28,15 +28,15 @@ /// private void InitializeComponent() { - this.lsbItems = new System.Windows.Forms.ListBox(); + this.lsbItems = new VAR.Toolbox.Controls.ListBoxNormal(); this.btnCancel = new System.Windows.Forms.Button(); this.btnAccept = new System.Windows.Forms.Button(); this.SuspendLayout(); // // lsbItems // - this.lsbItems.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.lsbItems.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lsbItems.FormattingEnabled = true; this.lsbItems.Location = new System.Drawing.Point(12, 12); @@ -69,8 +69,6 @@ // // FrmListBoxDialog // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(362, 465); this.Controls.Add(this.btnAccept); this.Controls.Add(this.btnCancel); @@ -83,7 +81,7 @@ #endregion - private System.Windows.Forms.ListBox lsbItems; + private VAR.Toolbox.Controls.ListBoxNormal lsbItems; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnAccept; } diff --git a/VAR.Toolbox/UI/FrmListBoxDialog.cs b/VAR.Toolbox/UI/FrmListBoxDialog.cs index 993dae4..ddd91f7 100644 --- a/VAR.Toolbox/UI/FrmListBoxDialog.cs +++ b/VAR.Toolbox/UI/FrmListBoxDialog.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmListBoxDialog : Form + public partial class FrmListBoxDialog : Frame { public FrmListBoxDialog() { diff --git a/VAR.Toolbox/UI/FrmToolbox.cs b/VAR.Toolbox/UI/FrmToolbox.cs index 4017549..59e6021 100644 --- a/VAR.Toolbox/UI/FrmToolbox.cs +++ b/VAR.Toolbox/UI/FrmToolbox.cs @@ -7,10 +7,11 @@ using System.Linq; using System.Windows.Forms; using VAR.Toolbox.Code; using VAR.Toolbox.Code.Windows; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public class FrmToolbox : Form + public class FrmToolbox : Frame { #region Declarations @@ -122,7 +123,7 @@ namespace VAR.Toolbox.UI lblToolbox = new Label { Anchor = (AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right), - Font = new Font("Microsoft Sans Serif", 27.75F, FontStyle.Bold, GraphicsUnit.Point, 0), + Font = new Font(Font.FontFamily, ControlsUtils.GetFontSize(this, 27.75F), FontStyle.Bold, GraphicsUnit.Point, 0), Location = new Point(windowSpacing, windowSpacing), Margin = new Padding(0, 0, 0, 0), Name = "lblToolbox", @@ -205,7 +206,6 @@ namespace VAR.Toolbox.UI nextYLocation = btnExit.Location.Y + btnExit.Size.Height + windowSpacing; // FrmToolbox - AutoScaleMode = AutoScaleMode.None; ClientSize = new Size(425, nextYLocation); Controls.Add(btnExit); Controls.Add(lblToolbox); @@ -226,6 +226,9 @@ namespace VAR.Toolbox.UI Visible = true }; niTray.MouseClick += NiTray_MouseClick; + + + ResumeLayout(); } #endregion Dynamic layout diff --git a/VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs b/VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs index 04c8b43..69de69a 100644 --- a/VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - this.txtInput = new System.Windows.Forms.TextBox(); + this.txtInput = new VAR.Toolbox.Controls.TextBoxMonospace(); this.btnDecode = new System.Windows.Forms.Button(); - this.txtOutput = new System.Windows.Forms.TextBox(); + this.txtOutput = new VAR.Toolbox.Controls.TextBoxMonospace(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.txtKey = new System.Windows.Forms.TextBox(); + this.txtKey = new VAR.Toolbox.Controls.TextBoxMonospace(); this.cboCode = new System.Windows.Forms.ComboBox(); this.btnEncode = new System.Windows.Forms.Button(); this.btnSwap = new System.Windows.Forms.Button(); @@ -44,10 +44,9 @@ // // txtInput // - this.txtInput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.txtInput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtInput.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtInput.Location = new System.Drawing.Point(9, 9); this.txtInput.Multiline = true; this.txtInput.Name = "txtInput"; @@ -68,10 +67,9 @@ // // txtOutput // - this.txtOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.txtOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtOutput.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtOutput.Location = new System.Drawing.Point(7, 9); this.txtOutput.Multiline = true; this.txtOutput.Name = "txtOutput"; @@ -82,8 +80,8 @@ // // splitContainer1 // - this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; @@ -106,9 +104,8 @@ // // txtKey // - this.txtKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.txtKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtKey.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtKey.Location = new System.Drawing.Point(9, 325); this.txtKey.Multiline = true; this.txtKey.Name = "txtKey"; @@ -152,8 +149,6 @@ // // FrmCoder // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(743, 425); this.Controls.Add(this.splitContainer1); this.Name = "FrmCoder"; @@ -170,14 +165,14 @@ #endregion - private System.Windows.Forms.TextBox txtInput; + private VAR.Toolbox.Controls.TextBoxMonospace txtInput; private System.Windows.Forms.Button btnDecode; - private System.Windows.Forms.TextBox txtOutput; + private VAR.Toolbox.Controls.TextBoxMonospace txtOutput; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Button btnEncode; private System.Windows.Forms.ComboBox cboCode; private System.Windows.Forms.Button btnSwap; - private System.Windows.Forms.TextBox txtKey; + private VAR.Toolbox.Controls.TextBoxMonospace txtKey; } } diff --git a/VAR.Toolbox/UI/Tools/FrmCoder.cs b/VAR.Toolbox/UI/Tools/FrmCoder.cs index 85ce1b5..5d0665d 100644 --- a/VAR.Toolbox/UI/Tools/FrmCoder.cs +++ b/VAR.Toolbox/UI/Tools/FrmCoder.cs @@ -1,10 +1,11 @@ using System; using System.Windows.Forms; using VAR.Toolbox.Code.TextCoders; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmCoder : Form, IToolForm + public partial class FrmCoder : Frame, IToolForm { public string ToolName { get { return "Coder"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmCover.cs b/VAR.Toolbox/UI/Tools/FrmCover.cs index e6c5fce..515ed48 100644 --- a/VAR.Toolbox/UI/Tools/FrmCover.cs +++ b/VAR.Toolbox/UI/Tools/FrmCover.cs @@ -3,10 +3,11 @@ using System.Drawing; using System.Windows.Forms; using VAR.Toolbox.Code; using VAR.Toolbox.Code.Windows; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public class FrmCover : Form + public class FrmCover : Frame { #region Declarations diff --git a/VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs b/VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs index f217f32..0cb80f5 100644 --- a/VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs @@ -32,7 +32,7 @@ this.btnScan = new System.Windows.Forms.Button(); this.lblStatus = new System.Windows.Forms.Label(); this.btnStop = new System.Windows.Forms.Button(); - this.txtSubnet = new System.Windows.Forms.TextBox(); + this.txtSubnet = new VAR.Toolbox.Controls.TextBoxMonospace(); this.SuspendLayout(); // // lsvResult @@ -88,8 +88,6 @@ // // FrmIPScan // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(365, 307); this.Controls.Add(this.txtSubnet); this.Controls.Add(this.btnStop); @@ -110,6 +108,6 @@ private System.Windows.Forms.Button btnScan; private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Button btnStop; - private System.Windows.Forms.TextBox txtSubnet; + private VAR.Toolbox.Controls.TextBoxMonospace txtSubnet; } } \ No newline at end of file diff --git a/VAR.Toolbox/UI/Tools/FrmIPScan.cs b/VAR.Toolbox/UI/Tools/FrmIPScan.cs index 0dcff44..2e0e9ab 100644 --- a/VAR.Toolbox/UI/Tools/FrmIPScan.cs +++ b/VAR.Toolbox/UI/Tools/FrmIPScan.cs @@ -4,10 +4,11 @@ using System.Net.NetworkInformation; using System.Net.Sockets; using System.Threading; using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmIPScan : Form, IToolForm + public partial class FrmIPScan : Frame, IToolForm { public string ToolName { get { return "IPScan"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs index d77eac5..e48849b 100644 --- a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs @@ -31,27 +31,27 @@ this.components = new System.ComponentModel.Container(); this.ddlNetworkInterfaces = new System.Windows.Forms.ComboBox(); this.lblID = new System.Windows.Forms.Label(); - this.txtID = new System.Windows.Forms.TextBox(); + this.txtID = new VAR.Toolbox.Controls.TextBoxMonospace(); this.lblName = new System.Windows.Forms.Label(); - this.txtName = new System.Windows.Forms.TextBox(); - this.txtStatus = new System.Windows.Forms.TextBox(); - this.txtSpeed = new System.Windows.Forms.TextBox(); - this.txtDescription = new System.Windows.Forms.TextBox(); - this.txtInterface = new System.Windows.Forms.TextBox(); - this.txtMAC = new System.Windows.Forms.TextBox(); + this.txtName = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtStatus = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtSpeed = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtDescription = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtInterface = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtMAC = new VAR.Toolbox.Controls.TextBoxMonospace(); this.lblStatus = new System.Windows.Forms.Label(); this.lblSpeed = new System.Windows.Forms.Label(); this.lblDescription = new System.Windows.Forms.Label(); this.lblInterface = new System.Windows.Forms.Label(); this.lblMAC = new System.Windows.Forms.Label(); - this.txtIPs = new System.Windows.Forms.TextBox(); + this.txtIPs = new VAR.Toolbox.Controls.TextBoxMonospace(); this.lblIPs = new System.Windows.Forms.Label(); this.timRefresh = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // // ddlNetworkInterfaces // - this.ddlNetworkInterfaces.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.ddlNetworkInterfaces.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ddlNetworkInterfaces.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ddlNetworkInterfaces.FormattingEnabled = true; @@ -72,9 +72,8 @@ // // txtID // - this.txtID.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtID.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtID.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtID.Location = new System.Drawing.Point(98, 39); this.txtID.Name = "txtID"; this.txtID.ReadOnly = true; @@ -92,7 +91,7 @@ // // txtName // - this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtName.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtName.Location = new System.Drawing.Point(98, 66); @@ -103,7 +102,7 @@ // // txtStatus // - this.txtStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtStatus.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtStatus.Location = new System.Drawing.Point(98, 93); @@ -114,7 +113,7 @@ // // txtSpeed // - this.txtSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtSpeed.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtSpeed.Location = new System.Drawing.Point(98, 125); @@ -125,9 +124,8 @@ // // txtDescription // - this.txtDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtDescription.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtDescription.Location = new System.Drawing.Point(98, 163); this.txtDescription.Name = "txtDescription"; this.txtDescription.ReadOnly = true; @@ -136,9 +134,8 @@ // // txtInterface // - this.txtInterface.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtInterface.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtInterface.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtInterface.Location = new System.Drawing.Point(98, 189); this.txtInterface.Name = "txtInterface"; this.txtInterface.ReadOnly = true; @@ -147,9 +144,8 @@ // // txtMAC // - this.txtMAC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtMAC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtMAC.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtMAC.Location = new System.Drawing.Point(98, 215); this.txtMAC.Name = "txtMAC"; this.txtMAC.ReadOnly = true; @@ -203,10 +199,9 @@ // // txtIPs // - this.txtIPs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.txtIPs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtIPs.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtIPs.Location = new System.Drawing.Point(12, 260); this.txtIPs.Multiline = true; this.txtIPs.Name = "txtIPs"; @@ -230,8 +225,6 @@ // // FrmNetworkInfo // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(534, 476); this.Controls.Add(this.lblIPs); this.Controls.Add(this.txtIPs); @@ -263,20 +256,20 @@ private System.Windows.Forms.ComboBox ddlNetworkInterfaces; private System.Windows.Forms.Label lblID; - private System.Windows.Forms.TextBox txtID; + private VAR.Toolbox.Controls.TextBoxMonospace txtID; private System.Windows.Forms.Label lblName; - private System.Windows.Forms.TextBox txtName; - private System.Windows.Forms.TextBox txtStatus; - private System.Windows.Forms.TextBox txtSpeed; - private System.Windows.Forms.TextBox txtDescription; - private System.Windows.Forms.TextBox txtInterface; - private System.Windows.Forms.TextBox txtMAC; + private VAR.Toolbox.Controls.TextBoxMonospace txtName; + private VAR.Toolbox.Controls.TextBoxMonospace txtStatus; + private VAR.Toolbox.Controls.TextBoxMonospace txtSpeed; + private VAR.Toolbox.Controls.TextBoxMonospace txtDescription; + private VAR.Toolbox.Controls.TextBoxMonospace txtInterface; + private VAR.Toolbox.Controls.TextBoxMonospace txtMAC; private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Label lblSpeed; private System.Windows.Forms.Label lblDescription; private System.Windows.Forms.Label lblInterface; private System.Windows.Forms.Label lblMAC; - private System.Windows.Forms.TextBox txtIPs; + private VAR.Toolbox.Controls.TextBoxMonospace txtIPs; private System.Windows.Forms.Label lblIPs; private System.Windows.Forms.Timer timRefresh; } diff --git a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs index 66ff170..8270701 100644 --- a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs +++ b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs @@ -5,10 +5,11 @@ using System.Net; using System.Net.NetworkInformation; using System.Text; using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmNetworkInfo : Form, IToolForm + public partial class FrmNetworkInfo : Frame, IToolForm { public string ToolName { get { return "NetworkInfo"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs index 2978df1..e590adb 100644 --- a/VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.splitMain = new System.Windows.Forms.SplitContainer(); - this.txtOutput = new System.Windows.Forms.TextBox(); - this.txtInput = new System.Windows.Forms.TextBox(); + this.txtOutput = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtInput = new VAR.Toolbox.Controls.TextBoxMonospace(); this.ddlCurrentConfig = new System.Windows.Forms.ComboBox(); this.btnConfig = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.splitMain)).BeginInit(); @@ -66,7 +66,6 @@ // this.txtOutput.BackColor = System.Drawing.Color.Black; this.txtOutput.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtOutput.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtOutput.ForeColor = System.Drawing.Color.Silver; this.txtOutput.Location = new System.Drawing.Point(0, 0); this.txtOutput.Multiline = true; @@ -81,7 +80,6 @@ // this.txtInput.BackColor = System.Drawing.Color.Black; this.txtInput.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtInput.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtInput.ForeColor = System.Drawing.Color.Silver; this.txtInput.Location = new System.Drawing.Point(0, 0); this.txtInput.Multiline = true; @@ -116,8 +114,6 @@ // // FrmProxyCmd // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(413, 446); this.Controls.Add(this.btnConfig); this.Controls.Add(this.ddlCurrentConfig); @@ -137,8 +133,8 @@ #endregion private System.Windows.Forms.SplitContainer splitMain; - private System.Windows.Forms.TextBox txtOutput; - private System.Windows.Forms.TextBox txtInput; + private VAR.Toolbox.Controls.TextBoxMonospace txtOutput; + private VAR.Toolbox.Controls.TextBoxMonospace txtInput; private System.Windows.Forms.ComboBox ddlCurrentConfig; private System.Windows.Forms.Button btnConfig; } diff --git a/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs index b68d7ac..e7f1fa6 100644 --- a/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs +++ b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs @@ -6,10 +6,11 @@ using System.Threading; using System.Windows.Forms; using VAR.Toolbox.Code; using VAR.Toolbox.Code.ProxyCmdExecutors; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmProxyCmd : Form, IOutputHandler, IToolForm + public partial class FrmProxyCmd : Frame, IOutputHandler, IToolForm { public string ToolName { get { return "ProxyCmd"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs index 6869d85..062a90e 100644 --- a/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs @@ -28,12 +28,12 @@ /// private void InitializeComponent() { - this.lsvCmdProxyConfigs = new System.Windows.Forms.ListBox(); - this.txtCmdProxyConfigName = new System.Windows.Forms.TextBox(); + this.lsvCmdProxyConfigs = new VAR.Toolbox.Controls.ListBoxNormal(); + this.txtCmdProxyConfigName = new VAR.Toolbox.Controls.TextBoxNormal(); this.btnSave = new System.Windows.Forms.Button(); this.btnDelete = new System.Windows.Forms.Button(); this.btnNew = new System.Windows.Forms.Button(); - this.txtCmdProxyConfigContent = new System.Windows.Forms.TextBox(); + this.txtCmdProxyConfigContent = new VAR.Toolbox.Controls.TextBoxNormal(); this.SuspendLayout(); // // lsvCmdProxyConfigs @@ -102,8 +102,6 @@ // // FrmProxyCmdConfig // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(496, 386); this.Controls.Add(this.txtCmdProxyConfigContent); this.Controls.Add(this.btnNew); @@ -121,11 +119,11 @@ #endregion - private System.Windows.Forms.ListBox lsvCmdProxyConfigs; - private System.Windows.Forms.TextBox txtCmdProxyConfigName; + private VAR.Toolbox.Controls.ListBoxNormal lsvCmdProxyConfigs; + private VAR.Toolbox.Controls.TextBoxNormal txtCmdProxyConfigName; private System.Windows.Forms.Button btnSave; private System.Windows.Forms.Button btnDelete; private System.Windows.Forms.Button btnNew; - private System.Windows.Forms.TextBox txtCmdProxyConfigContent; + private VAR.Toolbox.Controls.TextBoxNormal txtCmdProxyConfigContent; } } \ No newline at end of file diff --git a/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs index 23fa0d8..3bc0dd7 100644 --- a/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs +++ b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmProxyCmdConfig : Form + public partial class FrmProxyCmdConfig : Frame { public FrmProxyCmdConfig() { diff --git a/VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs b/VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs index ead84a0..b0f247e 100644 --- a/VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs @@ -47,8 +47,8 @@ // // picViewer // - this.picViewer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.picViewer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.picViewer.BackColor = System.Drawing.Color.Black; this.picViewer.ImageShow = null; @@ -71,8 +71,6 @@ // // FrmScreenshooter // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(605, 425); this.Controls.Add(this.btnStartStop); this.Controls.Add(this.btnScreenshoot); diff --git a/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs index e2d97ca..5f84b5c 100644 --- a/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs +++ b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs @@ -3,10 +3,11 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; using VAR.Toolbox.Code; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmScreenshooter : Form, IToolForm + public partial class FrmScreenshooter : Frame, IToolForm { public string ToolName { get { return "Screenshooter"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs b/VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs index 0dac06c..91fb53f 100644 --- a/VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs @@ -32,27 +32,27 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.btnTestSoap = new System.Windows.Forms.Button(); this.label5 = new System.Windows.Forms.Label(); - this.txtResultSoap = new System.Windows.Forms.TextBox(); - this.txtParametersSoap = new System.Windows.Forms.TextBox(); - this.txtMethodSoap = new System.Windows.Forms.TextBox(); - this.txtInterfaceSoap = new System.Windows.Forms.TextBox(); - this.txtUrlSoap = new System.Windows.Forms.TextBox(); + this.txtResultSoap = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtParametersSoap = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtMethodSoap = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtNamespaceUrlSoap = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtUrlSoap = new VAR.Toolbox.Controls.TextBoxMonospace(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.label6 = new System.Windows.Forms.Label(); - this.txtResultRest = new System.Windows.Forms.TextBox(); + this.txtResultRest = new VAR.Toolbox.Controls.TextBoxMonospace(); this.btnTestRest = new System.Windows.Forms.Button(); this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.lblUrlApiMethod = new System.Windows.Forms.Label(); this.lblURL = new System.Windows.Forms.Label(); - this.txtBodyRest = new System.Windows.Forms.TextBox(); - this.txtParametersRest = new System.Windows.Forms.TextBox(); - this.txtUrlApiMethodRest = new System.Windows.Forms.TextBox(); - this.txtUrlRest = new System.Windows.Forms.TextBox(); + this.txtBodyRest = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtParametersRest = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtUrlApiMethodRest = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtUrlRest = new VAR.Toolbox.Controls.TextBoxMonospace(); this.tabWebServices.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -77,7 +77,7 @@ this.tabPage1.Controls.Add(this.txtResultSoap); this.tabPage1.Controls.Add(this.txtParametersSoap); this.tabPage1.Controls.Add(this.txtMethodSoap); - this.tabPage1.Controls.Add(this.txtInterfaceSoap); + this.tabPage1.Controls.Add(this.txtNamespaceUrlSoap); this.tabPage1.Controls.Add(this.txtUrlSoap); this.tabPage1.Controls.Add(this.label4); this.tabPage1.Controls.Add(this.label3); @@ -116,6 +116,7 @@ this.txtResultSoap.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtResultSoap.Font = new System.Drawing.Font("Consolas", 6F); this.txtResultSoap.Location = new System.Drawing.Point(6, 219); this.txtResultSoap.Multiline = true; this.txtResultSoap.Name = "txtResultSoap"; @@ -127,6 +128,7 @@ // this.txtParametersSoap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtParametersSoap.Font = new System.Drawing.Font("Consolas", 6F); this.txtParametersSoap.Location = new System.Drawing.Point(100, 81); this.txtParametersSoap.Multiline = true; this.txtParametersSoap.Name = "txtParametersSoap"; @@ -138,27 +140,30 @@ // this.txtMethodSoap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtMethodSoap.Font = new System.Drawing.Font("Consolas", 6F); this.txtMethodSoap.Location = new System.Drawing.Point(100, 55); this.txtMethodSoap.Name = "txtMethodSoap"; - this.txtMethodSoap.Size = new System.Drawing.Size(571, 20); + this.txtMethodSoap.Size = new System.Drawing.Size(571, 22); this.txtMethodSoap.TabIndex = 17; // - // txtInterfaceSoap + // txtNamespaceUrlSoap // - this.txtInterfaceSoap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtNamespaceUrlSoap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtInterfaceSoap.Location = new System.Drawing.Point(100, 29); - this.txtInterfaceSoap.Name = "txtInterfaceSoap"; - this.txtInterfaceSoap.Size = new System.Drawing.Size(571, 20); - this.txtInterfaceSoap.TabIndex = 16; + this.txtNamespaceUrlSoap.Font = new System.Drawing.Font("Consolas", 6F); + this.txtNamespaceUrlSoap.Location = new System.Drawing.Point(100, 29); + this.txtNamespaceUrlSoap.Name = "txtNamespaceUrlSoap"; + this.txtNamespaceUrlSoap.Size = new System.Drawing.Size(571, 22); + this.txtNamespaceUrlSoap.TabIndex = 16; // // txtUrlSoap // this.txtUrlSoap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtUrlSoap.Font = new System.Drawing.Font("Consolas", 6F); this.txtUrlSoap.Location = new System.Drawing.Point(100, 6); this.txtUrlSoap.Name = "txtUrlSoap"; - this.txtUrlSoap.Size = new System.Drawing.Size(571, 20); + this.txtUrlSoap.Size = new System.Drawing.Size(571, 22); this.txtUrlSoap.TabIndex = 15; // // label4 @@ -184,9 +189,9 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(8, 32); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(49, 13); + this.label2.Size = new System.Drawing.Size(77, 13); this.label2.TabIndex = 12; - this.label2.Text = "Interface"; + this.label2.Text = "NamespaceUrl"; // // label1 // @@ -232,6 +237,7 @@ this.txtResultRest.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtResultRest.Font = new System.Drawing.Font("Consolas", 6F); this.txtResultRest.Location = new System.Drawing.Point(8, 213); this.txtResultRest.Multiline = true; this.txtResultRest.Name = "txtResultRest"; @@ -290,6 +296,7 @@ // this.txtBodyRest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtBodyRest.Font = new System.Drawing.Font("Consolas", 6F); this.txtBodyRest.Location = new System.Drawing.Point(119, 119); this.txtBodyRest.Multiline = true; this.txtBodyRest.Name = "txtBodyRest"; @@ -301,6 +308,7 @@ // this.txtParametersRest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtParametersRest.Font = new System.Drawing.Font("Consolas", 6F); this.txtParametersRest.Location = new System.Drawing.Point(119, 63); this.txtParametersRest.Multiline = true; this.txtParametersRest.Name = "txtParametersRest"; @@ -312,26 +320,27 @@ // this.txtUrlApiMethodRest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtUrlApiMethodRest.Font = new System.Drawing.Font("Consolas", 6F); this.txtUrlApiMethodRest.Location = new System.Drawing.Point(119, 36); this.txtUrlApiMethodRest.Name = "txtUrlApiMethodRest"; - this.txtUrlApiMethodRest.Size = new System.Drawing.Size(547, 20); + this.txtUrlApiMethodRest.Size = new System.Drawing.Size(547, 22); this.txtUrlApiMethodRest.TabIndex = 12; // // txtUrlRest // this.txtUrlRest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.txtUrlRest.Font = new System.Drawing.Font("Consolas", 6F); this.txtUrlRest.Location = new System.Drawing.Point(119, 9); this.txtUrlRest.Name = "txtUrlRest"; - this.txtUrlRest.Size = new System.Drawing.Size(547, 20); + this.txtUrlRest.Size = new System.Drawing.Size(547, 22); this.txtUrlRest.TabIndex = 11; // // FrmTestWebService // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(682, 521); this.Controls.Add(this.tabWebServices); + this.Location = new System.Drawing.Point(0, 0); this.Name = "FrmTestWebService"; this.Text = "FrmTestWebService"; this.tabWebServices.ResumeLayout(false); @@ -350,25 +359,25 @@ private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.Button btnTestSoap; private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox txtResultSoap; - private System.Windows.Forms.TextBox txtParametersSoap; - private System.Windows.Forms.TextBox txtMethodSoap; - private System.Windows.Forms.TextBox txtInterfaceSoap; - private System.Windows.Forms.TextBox txtUrlSoap; + private VAR.Toolbox.Controls.TextBoxMonospace txtResultSoap; + private VAR.Toolbox.Controls.TextBoxMonospace txtParametersSoap; + private VAR.Toolbox.Controls.TextBoxMonospace txtMethodSoap; + private VAR.Toolbox.Controls.TextBoxMonospace txtNamespaceUrlSoap; + private VAR.Toolbox.Controls.TextBoxMonospace txtUrlSoap; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox txtResultRest; + private VAR.Toolbox.Controls.TextBoxMonospace txtResultRest; private System.Windows.Forms.Button btnTestRest; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; private System.Windows.Forms.Label lblUrlApiMethod; private System.Windows.Forms.Label lblURL; - private System.Windows.Forms.TextBox txtBodyRest; - private System.Windows.Forms.TextBox txtParametersRest; - private System.Windows.Forms.TextBox txtUrlApiMethodRest; - private System.Windows.Forms.TextBox txtUrlRest; + private VAR.Toolbox.Controls.TextBoxMonospace txtBodyRest; + private VAR.Toolbox.Controls.TextBoxMonospace txtParametersRest; + private VAR.Toolbox.Controls.TextBoxMonospace txtUrlApiMethodRest; + private VAR.Toolbox.Controls.TextBoxMonospace txtUrlRest; } } \ No newline at end of file diff --git a/VAR.Toolbox/UI/Tools/FrmTestWebService.cs b/VAR.Toolbox/UI/Tools/FrmTestWebService.cs index 532e512..cdd7953 100644 --- a/VAR.Toolbox/UI/Tools/FrmTestWebService.cs +++ b/VAR.Toolbox/UI/Tools/FrmTestWebService.cs @@ -9,7 +9,7 @@ using System.Xml; namespace VAR.Toolbox.UI { - public partial class FrmTestWebService : Form, IToolForm + public partial class FrmTestWebService : Frame, IToolForm { public string ToolName { get { return "TestWebService"; } } @@ -25,11 +25,11 @@ namespace VAR.Toolbox.UI try { string url = txtUrlSoap.Text; - string iface = txtInterfaceSoap.Text; + string namespaceUrl = txtNamespaceUrlSoap.Text; string method = txtMethodSoap.Text; Dictionary parms = StringToDictionary(txtParametersSoap.Text); - Dictionary result = CallSoapMethod(url, iface, method, parms); + Dictionary result = CallSoapMethod(url, namespaceUrl, method, parms); txtResultSoap.Text = DictionaryToString(result); } diff --git a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs index 237fbd5..e386a2a 100644 --- a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs @@ -33,9 +33,9 @@ this.lblRemoteHost = new System.Windows.Forms.Label(); this.lblRemotePort = new System.Windows.Forms.Label(); this.lblLocalPort = new System.Windows.Forms.Label(); - this.txtRemoteHost = new System.Windows.Forms.TextBox(); - this.txtRemotePort = new System.Windows.Forms.TextBox(); - this.txtLocalPort = new System.Windows.Forms.TextBox(); + this.txtRemoteHost = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtRemotePort = new VAR.Toolbox.Controls.TextBoxMonospace(); + this.txtLocalPort = new VAR.Toolbox.Controls.TextBoxMonospace(); this.ctrOutput = new VAR.Toolbox.Controls.CtrOutput(); this.SuspendLayout(); // @@ -123,8 +123,6 @@ // // FrmTunnelTCP // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(451, 425); this.Controls.Add(this.ctrOutput); this.Controls.Add(this.txtLocalPort); @@ -151,9 +149,9 @@ private System.Windows.Forms.Label lblRemoteHost; private System.Windows.Forms.Label lblRemotePort; private System.Windows.Forms.Label lblLocalPort; - private System.Windows.Forms.TextBox txtRemoteHost; - private System.Windows.Forms.TextBox txtRemotePort; - private System.Windows.Forms.TextBox txtLocalPort; + private VAR.Toolbox.Controls.TextBoxMonospace txtRemoteHost; + private VAR.Toolbox.Controls.TextBoxMonospace txtRemotePort; + private VAR.Toolbox.Controls.TextBoxMonospace txtLocalPort; private VAR.Toolbox.Controls.CtrOutput ctrOutput; } } \ No newline at end of file diff --git a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs index c9326d6..63e3c03 100644 --- a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs +++ b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs @@ -2,11 +2,11 @@ using System.Net; using System.Net.Sockets; using System.Threading; -using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmTunnelTCP : Form, IToolForm + public partial class FrmTunnelTCP : Frame, IToolForm { public string ToolName { get { return "TunnelTCP"; } } diff --git a/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs b/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs index 87322f1..def47c6 100644 --- a/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs +++ b/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs @@ -74,8 +74,6 @@ // // FrmWebcam // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(558, 554); this.Controls.Add(this.cboWebcams); this.Controls.Add(this.btnStartStop); diff --git a/VAR.Toolbox/UI/Tools/FrmWebcam.cs b/VAR.Toolbox/UI/Tools/FrmWebcam.cs index 175aef1..7850683 100644 --- a/VAR.Toolbox/UI/Tools/FrmWebcam.cs +++ b/VAR.Toolbox/UI/Tools/FrmWebcam.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using VAR.Toolbox.Code; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class FrmWebcam : Form, IToolForm + public partial class FrmWebcam : Frame, IToolForm { public string ToolName { get { return "Webcam"; } } diff --git a/VAR.Toolbox/UI/Tools/PnlActivity.Designer.cs b/VAR.Toolbox/UI/Tools/PnlActivity.Designer.cs index 2877cdc..ccc56c1 100644 --- a/VAR.Toolbox/UI/Tools/PnlActivity.Designer.cs +++ b/VAR.Toolbox/UI/Tools/PnlActivity.Designer.cs @@ -32,7 +32,7 @@ this.grpActivity = new System.Windows.Forms.GroupBox(); this.lblActive = new System.Windows.Forms.Label(); this.lblActiveWindowTitle = new System.Windows.Forms.Label(); - this.txtCurrentActivity = new System.Windows.Forms.TextBox(); + this.txtCurrentActivity = new VAR.Toolbox.Controls.TextBoxNormal(); this.timTicker = new System.Windows.Forms.Timer(this.components); this.grpActivity.SuspendLayout(); this.SuspendLayout(); @@ -53,7 +53,7 @@ // lblActive // this.lblActive.AutoSize = true; - this.lblActive.Location = new System.Drawing.Point(7, 102); + this.lblActive.Location = new System.Drawing.Point(7, 109); this.lblActive.Name = "lblActive"; this.lblActive.Size = new System.Drawing.Size(37, 13); this.lblActive.TabIndex = 2; @@ -62,7 +62,7 @@ // lblActiveWindowTitle // this.lblActiveWindowTitle.AutoSize = true; - this.lblActiveWindowTitle.Location = new System.Drawing.Point(7, 85); + this.lblActiveWindowTitle.Location = new System.Drawing.Point(7, 81); this.lblActiveWindowTitle.Name = "lblActiveWindowTitle"; this.lblActiveWindowTitle.Size = new System.Drawing.Size(96, 13); this.lblActiveWindowTitle.TabIndex = 1; @@ -85,8 +85,6 @@ // // PnlActivity // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.grpActivity); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "PnlActivity"; @@ -102,7 +100,7 @@ private System.Windows.Forms.GroupBox grpActivity; private System.Windows.Forms.Label lblActive; private System.Windows.Forms.Label lblActiveWindowTitle; - private System.Windows.Forms.TextBox txtCurrentActivity; + private VAR.Toolbox.Controls.TextBoxNormal txtCurrentActivity; private System.Windows.Forms.Timer timTicker; } } diff --git a/VAR.Toolbox/UI/Tools/PnlActivity.cs b/VAR.Toolbox/UI/Tools/PnlActivity.cs index 04c2664..cc6944a 100644 --- a/VAR.Toolbox/UI/Tools/PnlActivity.cs +++ b/VAR.Toolbox/UI/Tools/PnlActivity.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Windows.Forms; using VAR.Json; using VAR.Toolbox.Code.Windows; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI.Tools { - public partial class PnlActivity : UserControl, IToolPanel + public partial class PnlActivity : SubFrame, IToolPanel { public PnlActivity() { diff --git a/VAR.Toolbox/UI/Tools/PnlCover.Designer.cs b/VAR.Toolbox/UI/Tools/PnlCover.Designer.cs index df353f6..8ecb9d2 100644 --- a/VAR.Toolbox/UI/Tools/PnlCover.Designer.cs +++ b/VAR.Toolbox/UI/Tools/PnlCover.Designer.cs @@ -119,7 +119,6 @@ // // PnlCover // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.Controls.Add(this.grpCover); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "PnlCover"; diff --git a/VAR.Toolbox/UI/Tools/PnlCover.cs b/VAR.Toolbox/UI/Tools/PnlCover.cs index a77a6c5..23bd9cd 100644 --- a/VAR.Toolbox/UI/Tools/PnlCover.cs +++ b/VAR.Toolbox/UI/Tools/PnlCover.cs @@ -2,10 +2,11 @@ using System.Windows.Forms; using VAR.Toolbox.Code; using VAR.Toolbox.Code.Windows; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class PnlCover : UserControl, IToolPanel + public partial class PnlCover : SubFrame, IToolPanel { public const string PreCoverEventName = "PreCover"; public const string PostCoverEventName = "PostCover"; diff --git a/VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs b/VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs index e023a56..eee9e13 100644 --- a/VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs +++ b/VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs @@ -168,7 +168,6 @@ // // PnlSuspension // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.Controls.Add(this.grpSuspension); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "PnlSuspension"; diff --git a/VAR.Toolbox/UI/Tools/PnlSuspension.cs b/VAR.Toolbox/UI/Tools/PnlSuspension.cs index 9c4c389..dce89df 100644 --- a/VAR.Toolbox/UI/Tools/PnlSuspension.cs +++ b/VAR.Toolbox/UI/Tools/PnlSuspension.cs @@ -2,10 +2,11 @@ using System.Windows.Forms; using VAR.Toolbox.Code; using VAR.Toolbox.Code.Windows; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI { - public partial class PnlSuspension : UserControl, IToolPanel + public partial class PnlSuspension : SubFrame, IToolPanel { public const string PreSuspendEventName = "PreSuspend"; diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.Designer.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.Designer.cs index 16efa06..cf7e9b7 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.Designer.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.Designer.cs @@ -33,21 +33,21 @@ this.btnExport = new System.Windows.Forms.Button(); this.btnImport = new System.Windows.Forms.Button(); this.cboImporters = new System.Windows.Forms.ComboBox(); - this.txtName = new System.Windows.Forms.TextBox(); + this.txtName = new VAR.Toolbox.Controls.TextBoxNormal(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); this.btnNextDay = new System.Windows.Forms.Button(); this.btnPreviousDay = new System.Windows.Forms.Button(); this.dtToday = new System.Windows.Forms.DateTimePicker(); - this.lsbWorkLog = new System.Windows.Forms.ListBox(); + this.lsbWorkLog = new VAR.Toolbox.Controls.ListBoxMonospace(); this.btnSearch = new System.Windows.Forms.Button(); this.btnStats = new System.Windows.Forms.Button(); this.lblWorkLogItemTime = new System.Windows.Forms.Label(); this.btnRename = new System.Windows.Forms.Button(); this.dtEnd = new System.Windows.Forms.DateTimePicker(); this.dtStart = new System.Windows.Forms.DateTimePicker(); - this.txtDescription = new System.Windows.Forms.TextBox(); - this.txtActivity = new System.Windows.Forms.TextBox(); + this.txtDescription = new VAR.Toolbox.Controls.TextBoxNormal(); + this.txtActivity = new VAR.Toolbox.Controls.TextBoxNormal(); this.btnDelete = new System.Windows.Forms.Button(); this.btnAdd = new System.Windows.Forms.Button(); this.btnSumary = new System.Windows.Forms.Button(); @@ -96,7 +96,7 @@ // // lblWorkLogTime // - this.lblWorkLogTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.lblWorkLogTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblWorkLogTime.Location = new System.Drawing.Point(273, 36); this.lblWorkLogTime.Name = "lblWorkLogTime"; @@ -198,14 +198,10 @@ // // lsbWorkLog // - this.lsbWorkLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.lsbWorkLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.lsbWorkLog.BackColor = System.Drawing.Color.Black; this.lsbWorkLog.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; - this.lsbWorkLog.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lsbWorkLog.ForeColor = System.Drawing.Color.Gray; - this.lsbWorkLog.FormattingEnabled = true; this.lsbWorkLog.ItemHeight = 12; this.lsbWorkLog.Location = new System.Drawing.Point(3, 60); this.lsbWorkLog.Name = "lsbWorkLog"; @@ -238,7 +234,7 @@ // // lblWorkLogItemTime // - this.lblWorkLogItemTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.lblWorkLogItemTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblWorkLogItemTime.Location = new System.Drawing.Point(136, 70); this.lblWorkLogItemTime.Name = "lblWorkLogItemTime"; @@ -281,8 +277,8 @@ // // txtDescription // - this.txtDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.txtDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtDescription.Location = new System.Drawing.Point(4, 147); this.txtDescription.Multiline = true; @@ -294,7 +290,7 @@ // // txtActivity // - this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtActivity.Location = new System.Drawing.Point(3, 93); this.txtActivity.Name = "txtActivity"; @@ -334,8 +330,6 @@ // // FrmWorkLog // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(721, 603); this.Controls.Add(this.splitWindow); this.Name = "FrmWorkLog"; @@ -355,9 +349,9 @@ private System.Windows.Forms.SplitContainer splitWindow; private System.Windows.Forms.DateTimePicker dtToday; - private System.Windows.Forms.ListBox lsbWorkLog; - private System.Windows.Forms.TextBox txtDescription; - private System.Windows.Forms.TextBox txtActivity; + private VAR.Toolbox.Controls.ListBoxMonospace lsbWorkLog; + private VAR.Toolbox.Controls.TextBoxNormal txtDescription; + private VAR.Toolbox.Controls.TextBoxNormal txtActivity; private System.Windows.Forms.Button btnDelete; private System.Windows.Forms.Button btnAdd; private System.Windows.Forms.DateTimePicker dtEnd; @@ -365,7 +359,7 @@ private System.Windows.Forms.Button btnNextDay; private System.Windows.Forms.Button btnPreviousDay; private System.Windows.Forms.Button btnSave; - private System.Windows.Forms.TextBox txtName; + private VAR.Toolbox.Controls.TextBoxNormal txtName; private System.Windows.Forms.Button btnLoad; private System.Windows.Forms.ComboBox cboImporters; private System.Windows.Forms.Button btnExport; diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.cs index b27141a..a7e0ba9 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.cs @@ -7,10 +7,11 @@ using System.Text; using System.Windows.Forms; using VAR.Json; using VAR.Toolbox.Code; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI.Tools.WorkLog { - public partial class FrmWorkLog : Form, IToolForm + public partial class FrmWorkLog : Frame, IToolForm { #region IToolForm diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs index 3211e90..464472b 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - this.lsbDays = new System.Windows.Forms.ListBox(); + this.lsbDays = new VAR.Toolbox.Controls.ListBoxNormal(); this.lblDateStart = new System.Windows.Forms.Label(); - this.txtActivity = new System.Windows.Forms.TextBox(); + this.txtActivity = new VAR.Toolbox.Controls.TextBoxNormal(); this.btnSearch = new System.Windows.Forms.Button(); this.btnClose = new System.Windows.Forms.Button(); this.lblDateEnd = new System.Windows.Forms.Label(); @@ -41,8 +41,8 @@ // // lsbDays // - this.lsbDays.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.lsbDays.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lsbDays.FormattingEnabled = true; this.lsbDays.Location = new System.Drawing.Point(12, 113); @@ -60,7 +60,7 @@ // // txtActivity // - this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtActivity.Location = new System.Drawing.Point(12, 12); this.txtActivity.Name = "txtActivity"; @@ -131,8 +131,6 @@ // // FrmWorkLogStats // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(417, 448); this.Controls.Add(this.dtpEnd); this.Controls.Add(this.dtpStart); @@ -153,9 +151,9 @@ #endregion - private System.Windows.Forms.ListBox lsbDays; + private VAR.Toolbox.Controls.ListBoxNormal lsbDays; private System.Windows.Forms.Label lblDateStart; - private System.Windows.Forms.TextBox txtActivity; + private VAR.Toolbox.Controls.TextBoxNormal txtActivity; private System.Windows.Forms.Button btnSearch; private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Label lblDateEnd; diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs index 9677f9e..4e07732 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI.Tools.WorkLog { - public partial class FrmWorkLogStats : Form + public partial class FrmWorkLogStats : Frame { public FrmWorkLogStats() { diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.Designer.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.Designer.cs index 2a3151f..dfc5a4d 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.Designer.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - this.lsbActivities = new System.Windows.Forms.ListBox(); + this.lsbActivities = new VAR.Toolbox.Controls.ListBoxNormal(); this.lblDateStart = new System.Windows.Forms.Label(); this.btnSearch = new System.Windows.Forms.Button(); this.btnClose = new System.Windows.Forms.Button(); @@ -37,13 +37,13 @@ this.dtpStart = new System.Windows.Forms.DateTimePicker(); this.dtpEnd = new System.Windows.Forms.DateTimePicker(); this.chkOnlyGroups = new System.Windows.Forms.CheckBox(); - this.txtActivity = new System.Windows.Forms.TextBox(); + this.txtActivity = new VAR.Toolbox.Controls.TextBoxNormal(); this.SuspendLayout(); // // lsbActivities // - this.lsbActivities.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.lsbActivities.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lsbActivities.FormattingEnabled = true; this.lsbActivities.Location = new System.Drawing.Point(12, 113); @@ -136,7 +136,7 @@ // // txtActivity // - this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtActivity.Location = new System.Drawing.Point(12, 422); this.txtActivity.Name = "txtActivity"; @@ -145,8 +145,6 @@ // // FrmWorkLogSumary // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(417, 448); this.Controls.Add(this.txtActivity); this.Controls.Add(this.chkOnlyGroups); @@ -168,7 +166,7 @@ #endregion - private System.Windows.Forms.ListBox lsbActivities; + private VAR.Toolbox.Controls.ListBoxNormal lsbActivities; private System.Windows.Forms.Label lblDateStart; private System.Windows.Forms.Button btnSearch; private System.Windows.Forms.Button btnClose; @@ -177,6 +175,6 @@ private System.Windows.Forms.DateTimePicker dtpStart; private System.Windows.Forms.DateTimePicker dtpEnd; private System.Windows.Forms.CheckBox chkOnlyGroups; - private System.Windows.Forms.TextBox txtActivity; + private VAR.Toolbox.Controls.TextBoxNormal txtActivity; } } \ No newline at end of file diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.cs index 64721cc..8baa675 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Windows.Forms; +using VAR.Toolbox.Controls; namespace VAR.Toolbox.UI.Tools.WorkLog { - public partial class FrmWorkLogSumary : Form + public partial class FrmWorkLogSumary : Frame { public FrmWorkLogSumary() { diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj index 8ae0713..c2d6cda 100644 --- a/VAR.Toolbox/VAR.Toolbox.csproj +++ b/VAR.Toolbox/VAR.Toolbox.csproj @@ -127,12 +127,31 @@ + Component Component + + Form + + + Component + + + Component + + + UserControl + + + Component + + + Component + Form @@ -221,15 +240,11 @@ PnlActivity.cs - - UserControl - + PnlCover.cs - - UserControl - + PnlSuspension.cs