Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completato test applicazione MAN, passo a gestione MDI parent/child x IOB-WIN...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-12-19 14:42:53 +01:00
parent ab31b11f88
commit 3525ba87f4
9 changed files with 164 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/CForm.Designer.cs
Generated
+38
View File
@@ -0,0 +1,38 @@
namespace IOB_MAN
{
partial class CForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Text = "CForm";
}
#endregion
}
}
IOB-MAN/CForm.cs
+20
View File
@@ -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();
}
}
}
IOB-MAN/IOB-MAN.csproj
+7
View File
@@ -45,6 +45,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CForm.Designer.cs">
<DependentUpon>CForm.cs</DependentUpon>
</Compile>
<Compile Include="IOBManPanel.cs">
<SubType>Form</SubType>
</Compile>
@@ -81,5 +87,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
IOB-MAN/IOBManPanel.Designer.cs
Generated
+64 -20
View File
@@ -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;
}
}
IOB-MAN/IOBManPanel.cs
+7
View File
@@ -184,6 +184,13 @@ namespace IOB_MAN
{ }
}
}
private void btnStartChild_Click(object sender, EventArgs e)
{
CForm child = new CForm();
child.MdiParent = this;
child.Show();
}
}
IOB-MAN/IOBManPanel.resx
+3
View File
@@ -123,4 +123,7 @@
<metadata name="MainTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>154, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>407, 17</value>
</metadata>
</root>
IOB-WIN.sln
+6
View File
@@ -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
IOB-WIN/IOB-WIN.csproj
+3
View File
@@ -54,6 +54,7 @@
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -177,10 +178,12 @@
<ProjectReference Include="..\CncLib\CncLib.vbproj">
<Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
<Name>CncLib</Name>
<EmbedInteropTypes>False</EmbedInteropTypes>
</ProjectReference>
<ProjectReference Include="..\IOB-UT\IOB-UT.csproj">
<Project>{90512e12-29fc-460d-94cc-648c2a072dbd}</Project>
<Name>IOB-UT</Name>
<EmbedInteropTypes>False</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>
<ItemGroup />
IOB-WIN/MainForm.Designer.cs
Generated
+16 -15
View File
@@ -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);