diff --git a/IOB-MAN/CForm.Designer.cs b/IOB-MAN/CForm.Designer.cs new file mode 100644 index 00000000..9ab0fa44 --- /dev/null +++ b/IOB-MAN/CForm.Designer.cs @@ -0,0 +1,38 @@ +namespace IOB_MAN +{ + partial class CForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "CForm"; + } + + #endregion + } +} \ No newline at end of file diff --git a/IOB-MAN/CForm.cs b/IOB-MAN/CForm.cs new file mode 100644 index 00000000..5a6d5447 --- /dev/null +++ b/IOB-MAN/CForm.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace IOB_MAN +{ + public partial class CForm : Form + { + public CForm() + { + InitializeComponent(); + } + } +} diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj index 79855b91..68105e19 100644 --- a/IOB-MAN/IOB-MAN.csproj +++ b/IOB-MAN/IOB-MAN.csproj @@ -45,6 +45,12 @@ + + Form + + + CForm.cs + Form @@ -81,5 +87,6 @@ + \ No newline at end of file diff --git a/IOB-MAN/IOBManPanel.Designer.cs b/IOB-MAN/IOBManPanel.Designer.cs index ec764a6f..7a6d8f19 100644 --- a/IOB-MAN/IOBManPanel.Designer.cs +++ b/IOB-MAN/IOBManPanel.Designer.cs @@ -31,18 +31,23 @@ this.components = new System.ComponentModel.Container(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.btnOpen = new System.Windows.Forms.Button(); - this.lblTopCent = new System.Windows.Forms.Label(); this.btnClose = new System.Windows.Forms.Button(); this.childList = new System.Windows.Forms.ListBox(); this.MainTimer = new System.Windows.Forms.Timer(this.components); + this.btnStartChild = new System.Windows.Forms.Button(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cHeckForUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.windowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // statusStrip1 // this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip1.Location = new System.Drawing.Point(0, 288); + this.statusStrip1.Location = new System.Drawing.Point(0, 712); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(681, 22); + this.statusStrip1.Size = new System.Drawing.Size(993, 22); this.statusStrip1.TabIndex = 0; this.statusStrip1.Text = "statusStrip1"; // @@ -56,20 +61,6 @@ this.btnOpen.UseVisualStyleBackColor = true; this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); // - // lblTopCent - // - this.lblTopCent.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.lblTopCent.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblTopCent.Location = new System.Drawing.Point(146, -1); - this.lblTopCent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lblTopCent.Name = "lblTopCent"; - this.lblTopCent.Size = new System.Drawing.Size(336, 33); - this.lblTopCent.TabIndex = 69; - this.lblTopCent.Text = "SERVER: n.a."; - this.lblTopCent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // btnClose // this.btnClose.Location = new System.Drawing.Point(152, 74); @@ -93,19 +84,68 @@ // this.MainTimer.Tick += new System.EventHandler(this.MainTimer_Tick); // + // btnStartChild + // + this.btnStartChild.Location = new System.Drawing.Point(24, 175); + this.btnStartChild.Name = "btnStartChild"; + this.btnStartChild.Size = new System.Drawing.Size(111, 23); + this.btnStartChild.TabIndex = 72; + this.btnStartChild.Text = "Start Child"; + this.btnStartChild.UseVisualStyleBackColor = true; + this.btnStartChild.Click += new System.EventHandler(this.btnStartChild_Click); + // + // menuStrip1 + // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.windowToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(993, 28); + this.menuStrip1.TabIndex = 75; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cHeckForUpdateToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F))); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(44, 24); + this.fileToolStripMenuItem.Text = "&File"; + // + // cHeckForUpdateToolStripMenuItem + // + this.cHeckForUpdateToolStripMenuItem.Name = "cHeckForUpdateToolStripMenuItem"; + this.cHeckForUpdateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.U))); + this.cHeckForUpdateToolStripMenuItem.Size = new System.Drawing.Size(247, 26); + this.cHeckForUpdateToolStripMenuItem.Text = "Check for &Update"; + // + // windowToolStripMenuItem + // + this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; + this.windowToolStripMenuItem.Size = new System.Drawing.Size(76, 24); + this.windowToolStripMenuItem.Text = "&Window"; + // // IOBManPanel // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(681, 310); + this.ClientSize = new System.Drawing.Size(993, 734); + this.Controls.Add(this.btnStartChild); this.Controls.Add(this.childList); this.Controls.Add(this.btnClose); - this.Controls.Add(this.lblTopCent); this.Controls.Add(this.btnOpen); this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.menuStrip1); + this.IsMdiContainer = true; + this.MainMenuStrip = this.menuStrip1; this.Name = "IOBManPanel"; this.Text = "IOB MANAGER"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.IOBManPanel_FormClosing); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -115,10 +155,14 @@ private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.Button btnOpen; - private System.Windows.Forms.Label lblTopCent; private System.Windows.Forms.Button btnClose; private System.Windows.Forms.ListBox childList; private System.Windows.Forms.Timer MainTimer; + private System.Windows.Forms.Button btnStartChild; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem cHeckForUpdateToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem windowToolStripMenuItem; } } diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index a8abea74..778a0499 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -184,6 +184,13 @@ namespace IOB_MAN { } } } + + private void btnStartChild_Click(object sender, EventArgs e) + { + CForm child = new CForm(); + child.MdiParent = this; + child.Show(); + } } diff --git a/IOB-MAN/IOBManPanel.resx b/IOB-MAN/IOBManPanel.resx index 730b62eb..a9241c3a 100644 --- a/IOB-MAN/IOBManPanel.resx +++ b/IOB-MAN/IOBManPanel.resx @@ -123,4 +123,7 @@ 154, 17 + + 407, 17 + \ No newline at end of file diff --git a/IOB-WIN.sln b/IOB-WIN.sln index 40616939..45639d22 100644 --- a/IOB-WIN.sln +++ b/IOB-WIN.sln @@ -8,10 +8,16 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{58E399F3-9D4E-49D3-AB35-9ED536543D50}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-UT", "IOB-UT\IOB-UT.csproj", "{90512E12-29FC-460D-94CC-648C2A072DBD}" + ProjectSection(ProjectDependencies) = postProject + {58E399F3-9D4E-49D3-AB35-9ED536543D50} = {58E399F3-9D4E-49D3-AB35-9ED536543D50} + EndProjectSection EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-MAN", "IOB-MAN\IOB-MAN.csproj", "{8DFE2AC9-611D-44D5-8E8F-204DCF01EDF8}" + ProjectSection(ProjectDependencies) = postProject + {ADCB8028-79C4-4896-A9A7-E3C5140FC00B} = {ADCB8028-79C4-4896-A9A7-E3C5140FC00B} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 22066d84..42db5cb9 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -54,6 +54,7 @@ ..\packages\NLog.4.4.12\lib\net45\NLog.dll + False @@ -177,10 +178,12 @@ {2d769ffd-1122-4276-a115-29246e6d23c5} CncLib + False {90512e12-29fc-460d-94cc-648c2a072dbd} IOB-UT + False diff --git a/IOB-WIN/MainForm.Designer.cs b/IOB-WIN/MainForm.Designer.cs index e9f45b24..ab1921d4 100644 --- a/IOB-WIN/MainForm.Designer.cs +++ b/IOB-WIN/MainForm.Designer.cs @@ -55,6 +55,7 @@ this.bIN = new System.Windows.Forms.Button(); this.bOUT = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.btnClose = new System.Windows.Forms.Button(); this.dump = new System.Windows.Forms.Button(); this.stop = new System.Windows.Forms.Button(); this.start = new System.Windows.Forms.Button(); @@ -76,7 +77,6 @@ this.label5 = new System.Windows.Forms.Label(); this.nLines = new System.Windows.Forms.TextBox(); this.displTimer = new System.Windows.Forms.Timer(this.components); - this.btnClose = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -201,14 +201,15 @@ // this.mLoadConf.Name = "mLoadConf"; this.mLoadConf.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.L))); - this.mLoadConf.Size = new System.Drawing.Size(214, 26); - this.mLoadConf.Text = "LOAD CONF"; + this.mLoadConf.Size = new System.Drawing.Size(244, 26); + this.mLoadConf.Text = "&LOAD CONF"; this.mLoadConf.Click += new System.EventHandler(this.mLoadConf_Click); // // mCheckUpdates // this.mCheckUpdates.Name = "mCheckUpdates"; - this.mCheckUpdates.Size = new System.Drawing.Size(214, 26); + this.mCheckUpdates.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.U))); + this.mCheckUpdates.Size = new System.Drawing.Size(244, 26); this.mCheckUpdates.Text = "CHECK &UPDATES"; this.mCheckUpdates.Click += new System.EventHandler(this.mCheckUpdates_Click); // @@ -331,6 +332,17 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "IOB Info"; // + // btnClose + // + this.btnClose.Location = new System.Drawing.Point(522, 19); + this.btnClose.Margin = new System.Windows.Forms.Padding(4); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(100, 28); + this.btnClose.TabIndex = 4; + this.btnClose.Text = "Close child"; + this.btnClose.UseVisualStyleBackColor = true; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // // dump // this.dump.Location = new System.Drawing.Point(397, 18); @@ -575,17 +587,6 @@ // this.displTimer.Tick += new System.EventHandler(this.displTimer_Tick); // - // btnClose - // - this.btnClose.Location = new System.Drawing.Point(522, 19); - this.btnClose.Margin = new System.Windows.Forms.Padding(4); - this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(100, 28); - this.btnClose.TabIndex = 4; - this.btnClose.Text = "Close child"; - this.btnClose.UseVisualStyleBackColor = true; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);