diff --git a/ComputerResourceConsole.csproj b/ComputerResourceConsole.csproj
index bd52542876417fcdb242bda787486b0b6f415976..e43dc36f1f1714390933b628be8b52e4071a1ae7 100644
--- a/ComputerResourceConsole.csproj
+++ b/ComputerResourceConsole.csproj
@@ -161,6 +161,12 @@
frm_debug_text.cs
+
+ Form
+
+
+ frm_mdl.cs
+
Form
@@ -203,6 +209,9 @@
frm_debug_text.cs
+
+ frm_mdl.cs
+
frm_packing.cs
diff --git a/view/frm_console.Designer.cs b/view/frm_console.Designer.cs
index c136821f5f24d79acfcb386105a9052aa5ec7d11..8b40ad018c64cfffb20ebea315314f51972bb88c 100644
--- a/view/frm_console.Designer.cs
+++ b/view/frm_console.Designer.cs
@@ -40,8 +40,6 @@
this.openFirewallPortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openModelSersTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.containerVersionCheckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -52,7 +50,10 @@
this.openDiaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.batchDeploymentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.packingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mSDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mDLGeneratorToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.packingToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gb_container.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
@@ -64,11 +65,11 @@
this.gb_container.Controls.Add(this.l_ctn_status_tag);
this.gb_container.Controls.Add(this.bt_ctn_stop);
this.gb_container.Controls.Add(this.bt_ctn_start);
- this.gb_container.Location = new System.Drawing.Point(11, 52);
- this.gb_container.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.gb_container.Location = new System.Drawing.Point(9, 45);
+ this.gb_container.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.gb_container.Name = "gb_container";
- this.gb_container.Padding = new System.Windows.Forms.Padding(6, 5, 6, 5);
- this.gb_container.Size = new System.Drawing.Size(422, 158);
+ this.gb_container.Padding = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.gb_container.Size = new System.Drawing.Size(345, 135);
this.gb_container.TabIndex = 0;
this.gb_container.TabStop = false;
this.gb_container.Text = "Service Container";
@@ -76,28 +77,28 @@
// l_ctn_status
//
this.l_ctn_status.AutoSize = true;
- this.l_ctn_status.Location = new System.Drawing.Point(233, 49);
- this.l_ctn_status.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.l_ctn_status.Location = new System.Drawing.Point(191, 42);
+ this.l_ctn_status.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.l_ctn_status.Name = "l_ctn_status";
- this.l_ctn_status.Size = new System.Drawing.Size(0, 21);
+ this.l_ctn_status.Size = new System.Drawing.Size(0, 18);
this.l_ctn_status.TabIndex = 1;
//
// l_ctn_status_tag
//
this.l_ctn_status_tag.AutoSize = true;
- this.l_ctn_status_tag.Location = new System.Drawing.Point(33, 49);
- this.l_ctn_status_tag.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.l_ctn_status_tag.Location = new System.Drawing.Point(27, 42);
+ this.l_ctn_status_tag.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.l_ctn_status_tag.Name = "l_ctn_status_tag";
- this.l_ctn_status_tag.Size = new System.Drawing.Size(98, 21);
+ this.l_ctn_status_tag.Size = new System.Drawing.Size(80, 18);
this.l_ctn_status_tag.TabIndex = 1;
this.l_ctn_status_tag.Text = "Status: ";
//
// bt_ctn_stop
//
- this.bt_ctn_stop.Location = new System.Drawing.Point(227, 96);
- this.bt_ctn_stop.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.bt_ctn_stop.Location = new System.Drawing.Point(186, 82);
+ this.bt_ctn_stop.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.bt_ctn_stop.Name = "bt_ctn_stop";
- this.bt_ctn_stop.Size = new System.Drawing.Size(160, 40);
+ this.bt_ctn_stop.Size = new System.Drawing.Size(131, 34);
this.bt_ctn_stop.TabIndex = 0;
this.bt_ctn_stop.Text = "Stop";
this.bt_ctn_stop.UseVisualStyleBackColor = true;
@@ -105,10 +106,10 @@
//
// bt_ctn_start
//
- this.bt_ctn_start.Location = new System.Drawing.Point(22, 96);
- this.bt_ctn_start.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.bt_ctn_start.Location = new System.Drawing.Point(18, 82);
+ this.bt_ctn_start.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.bt_ctn_start.Name = "bt_ctn_start";
- this.bt_ctn_start.Size = new System.Drawing.Size(160, 40);
+ this.bt_ctn_start.Size = new System.Drawing.Size(131, 34);
this.bt_ctn_start.TabIndex = 0;
this.bt_ctn_start.Text = "Start";
this.bt_ctn_start.UseVisualStyleBackColor = true;
@@ -118,11 +119,12 @@
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.operationToolStripMenuItem,
+ this.toolsToolStripMenuItem,
this.infoToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Padding = new System.Windows.Forms.Padding(11, 4, 0, 4);
- this.menuStrip1.Size = new System.Drawing.Size(449, 40);
+ this.menuStrip1.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3);
+ this.menuStrip1.Size = new System.Drawing.Size(367, 34);
this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1";
//
@@ -132,53 +134,36 @@
this.openFirewallPortToolStripMenuItem,
this.openModelSersTableToolStripMenuItem,
this.openManagerToolStripMenuItem,
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem,
- this.packingToolStripMenuItem,
- this.containerVersionCheckToolStripMenuItem,
this.exitToolStripMenuItem1});
this.operationToolStripMenuItem.Name = "operationToolStripMenuItem";
- this.operationToolStripMenuItem.Size = new System.Drawing.Size(86, 32);
+ this.operationToolStripMenuItem.Size = new System.Drawing.Size(76, 28);
this.operationToolStripMenuItem.Text = "Opera";
//
// openFirewallPortToolStripMenuItem
//
this.openFirewallPortToolStripMenuItem.Name = "openFirewallPortToolStripMenuItem";
- this.openFirewallPortToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
+ this.openFirewallPortToolStripMenuItem.Size = new System.Drawing.Size(290, 28);
this.openFirewallPortToolStripMenuItem.Text = "Firewall Setting";
this.openFirewallPortToolStripMenuItem.Click += new System.EventHandler(this.openFirewallPortToolStripMenuItem_Click);
//
// openModelSersTableToolStripMenuItem
//
this.openModelSersTableToolStripMenuItem.Name = "openModelSersTableToolStripMenuItem";
- this.openModelSersTableToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
+ this.openModelSersTableToolStripMenuItem.Size = new System.Drawing.Size(290, 28);
this.openModelSersTableToolStripMenuItem.Text = "Services List";
this.openModelSersTableToolStripMenuItem.Click += new System.EventHandler(this.openModelSersTableToolStripMenuItem_Click);
//
// openManagerToolStripMenuItem
//
this.openManagerToolStripMenuItem.Name = "openManagerToolStripMenuItem";
- this.openManagerToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
+ this.openManagerToolStripMenuItem.Size = new System.Drawing.Size(290, 28);
this.openManagerToolStripMenuItem.Text = "Management Page";
this.openManagerToolStripMenuItem.Click += new System.EventHandler(this.openManagerToolStripMenuItem_Click);
//
- // modelServiceDebuggerToolStripMenuItemToolStripMenuItem
- //
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem.Name = "modelServiceDebuggerToolStripMenuItemToolStripMenuItem";
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem.Text = "MS Debugger...";
- this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.modelServiceDebuggerToolStripMenuItemToolStripMenuItem_Click);
- //
- // containerVersionCheckToolStripMenuItem
- //
- this.containerVersionCheckToolStripMenuItem.Name = "containerVersionCheckToolStripMenuItem";
- this.containerVersionCheckToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
- this.containerVersionCheckToolStripMenuItem.Text = "Container Version Check";
- this.containerVersionCheckToolStripMenuItem.Click += new System.EventHandler(this.containerVersionCheckToolStripMenuItem_Click);
- //
// exitToolStripMenuItem1
//
this.exitToolStripMenuItem1.Name = "exitToolStripMenuItem1";
- this.exitToolStripMenuItem1.Size = new System.Drawing.Size(332, 32);
+ this.exitToolStripMenuItem1.Size = new System.Drawing.Size(290, 28);
this.exitToolStripMenuItem1.Text = "Exit";
this.exitToolStripMenuItem1.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -189,26 +174,27 @@
this.updateToolStripMenuItem,
this.aboutToolStripMenuItem});
this.infoToolStripMenuItem.Name = "infoToolStripMenuItem";
- this.infoToolStripMenuItem.Size = new System.Drawing.Size(63, 32);
+ this.infoToolStripMenuItem.Size = new System.Drawing.Size(55, 28);
this.infoToolStripMenuItem.Text = "Info";
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(161, 32);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(146, 28);
this.helpToolStripMenuItem.Text = "Help";
this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click);
//
// updateToolStripMenuItem
//
this.updateToolStripMenuItem.Name = "updateToolStripMenuItem";
- this.updateToolStripMenuItem.Size = new System.Drawing.Size(161, 32);
- this.updateToolStripMenuItem.Text = "Update";
+ this.updateToolStripMenuItem.Size = new System.Drawing.Size(156, 28);
+ this.updateToolStripMenuItem.Text = "Update...";
+ this.updateToolStripMenuItem.Click += new System.EventHandler(this.updateToolStripMenuItem_Click);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(161, 32);
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 28);
this.aboutToolStripMenuItem.Text = "About...";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
@@ -226,19 +212,19 @@
this.openDiaToolStripMenuItem,
this.exitToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(229, 68);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(203, 60);
//
// openDiaToolStripMenuItem
//
this.openDiaToolStripMenuItem.Name = "openDiaToolStripMenuItem";
- this.openDiaToolStripMenuItem.Size = new System.Drawing.Size(228, 32);
+ this.openDiaToolStripMenuItem.Size = new System.Drawing.Size(202, 28);
this.openDiaToolStripMenuItem.Text = "Show Window";
this.openDiaToolStripMenuItem.Click += new System.EventHandler(this.openDiaToolStripMenuItem_Click);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(228, 32);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(202, 28);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@@ -249,24 +235,48 @@
this.batchDeploymentToolStripMenuItem.Text = "Batch Deployment";
this.batchDeploymentToolStripMenuItem.Click += new System.EventHandler(this.batchDeploymentToolStripMenuItem_Click);
//
- // packingToolStripMenuItem
+ // toolsToolStripMenuItem
+ //
+ this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mSDebuggerToolStripMenuItem,
+ this.mDLGeneratorToolStripMenuItem1,
+ this.packingToolStripMenuItem1});
+ this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+ this.toolsToolStripMenuItem.Size = new System.Drawing.Size(67, 28);
+ this.toolsToolStripMenuItem.Text = "Tools";
+ //
+ // mSDebuggerToolStripMenuItem
+ //
+ this.mSDebuggerToolStripMenuItem.Name = "mSDebuggerToolStripMenuItem";
+ this.mSDebuggerToolStripMenuItem.Size = new System.Drawing.Size(224, 28);
+ this.mSDebuggerToolStripMenuItem.Text = "MS Debugger...";
+ this.mSDebuggerToolStripMenuItem.Click += new System.EventHandler(this.mSDebuggerToolStripMenuItem_Click);
+ //
+ // mDLGeneratorToolStripMenuItem1
+ //
+ this.mDLGeneratorToolStripMenuItem1.Name = "mDLGeneratorToolStripMenuItem1";
+ this.mDLGeneratorToolStripMenuItem1.Size = new System.Drawing.Size(224, 28);
+ this.mDLGeneratorToolStripMenuItem1.Text = "MDL Generator...";
+ this.mDLGeneratorToolStripMenuItem1.Click += new System.EventHandler(this.mDLGeneratorToolStripMenuItem1_Click);
+ //
+ // packingToolStripMenuItem1
//
- this.packingToolStripMenuItem.Name = "packingToolStripMenuItem";
- this.packingToolStripMenuItem.Size = new System.Drawing.Size(332, 32);
- this.packingToolStripMenuItem.Text = "Packing...";
- this.packingToolStripMenuItem.Click += new System.EventHandler(this.packingToolStripMenuItem_Click);
+ this.packingToolStripMenuItem1.Name = "packingToolStripMenuItem1";
+ this.packingToolStripMenuItem1.Size = new System.Drawing.Size(224, 28);
+ this.packingToolStripMenuItem1.Text = "Packing...";
+ this.packingToolStripMenuItem1.Click += new System.EventHandler(this.packingToolStripMenuItem1_Click);
//
// frm_console
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(449, 217);
+ this.ClientSize = new System.Drawing.Size(367, 186);
this.Controls.Add(this.gb_container);
this.Controls.Add(this.menuStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.MaximizeBox = false;
this.Name = "frm_console";
this.Text = "Service Container Console";
@@ -301,12 +311,13 @@
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem openModelSersTableToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openManagerToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem modelServiceDebuggerToolStripMenuItemToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem containerVersionCheckToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem batchDeploymentToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem updateToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem packingToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mSDebuggerToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mDLGeneratorToolStripMenuItem1;
+ private System.Windows.Forms.ToolStripMenuItem packingToolStripMenuItem1;
}
}
diff --git a/view/frm_console.cs b/view/frm_console.cs
index d15f7102317c2139ac97e72f75b4a325eefa21fd..308191a22475237b550a166ffe177fb99a0cc475 100644
--- a/view/frm_console.cs
+++ b/view/frm_console.cs
@@ -26,6 +26,7 @@ namespace ComputerResourceConsole
private frm_debug _frm_debugger = null;
private frm_version _frm_version = null;
private frm_packing _frm_packing = null;
+ private frm_mdl _frm_mdl = null;
public frm_console()
{
@@ -235,8 +236,6 @@ namespace ComputerResourceConsole
private void containerVersionCheckToolStripMenuItem_Click(object sender, EventArgs e)
{
- this._frm_version = new frm_version();
- this._frm_version.Show();
}
@@ -252,5 +251,35 @@ namespace ComputerResourceConsole
this._frm_packing.Show();
}
+ private void mDLGeneratorToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this._frm_mdl = new frm_mdl();
+ this._frm_mdl.Show();
+ }
+
+ private void mSDebuggerToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this._frm_debugger = new frm_debug();
+ this._frm_debugger.Show();
+ }
+
+ private void mDLGeneratorToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ this._frm_mdl = new frm_mdl();
+ this._frm_mdl.Show();
+ }
+
+ private void packingToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ this._frm_packing = new frm_packing();
+ this._frm_packing.Show();
+ }
+
+ private void updateToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this._frm_version = new frm_version();
+ this._frm_version.Show();
+ }
+
}
}
diff --git a/view/frm_mdl.Designer.cs b/view/frm_mdl.Designer.cs
index ca8014de5c180fb16365845d89cf2b0865966a92..8bb10fae3e5a6ea154a10b0ddf9d5459b9ebbe9c 100644
--- a/view/frm_mdl.Designer.cs
+++ b/view/frm_mdl.Designer.cs
@@ -34,7 +34,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1001, 1012);
+ this.ClientSize = new System.Drawing.Size(1084, 1021);
this.Name = "frm_mdl";
this.Text = "frm_mdl";
this.ResumeLayout(false);