Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Step-Server & Client closing error + Siemens Nc bug fixes + Machine-Info data exchange fix

Browse Source
This commit is contained in:
CMS3762\carminatini
2018-01-29 17:10:30 +01:00
parent 3e8874090e
commit ecaff5fb7f
16 changed files with 253 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.UI/ServerControlWindow.Designer.cs
Generated
+43 -5
View File
@@ -61,6 +61,7 @@ namespace Step.UI
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.stopServerButton = new MetroFramework.Controls.MetroButton();
this.TestJSButton = new MetroFramework.Controls.MetroButton();
this.TXTstatus = new MetroFramework.Controls.MetroTextBox();
this.NotifyIconMenu.SuspendLayout();
this.metroTabControl1.SuspendLayout();
this.NCInfo.SuspendLayout();
@@ -106,10 +107,10 @@ namespace Step.UI
//
this.metroTabControl1.Controls.Add(this.NCInfo);
this.metroTabControl1.Controls.Add(this.ThreadsInfo);
this.metroTabControl1.Location = new System.Drawing.Point(12, 50);
this.metroTabControl1.Location = new System.Drawing.Point(12, 56);
this.metroTabControl1.Name = "metroTabControl1";
this.metroTabControl1.SelectedIndex = 0;
this.metroTabControl1.Size = new System.Drawing.Size(328, 329);
this.metroTabControl1.Size = new System.Drawing.Size(328, 323);
this.metroTabControl1.TabIndex = 7;
this.metroTabControl1.UseSelectable = true;
//
@@ -137,7 +138,7 @@ namespace Step.UI
this.NCInfo.HorizontalScrollbarSize = 10;
this.NCInfo.Location = new System.Drawing.Point(4, 38);
this.NCInfo.Name = "NCInfo";
this.NCInfo.Size = new System.Drawing.Size(320, 287);
this.NCInfo.Size = new System.Drawing.Size(320, 281);
this.NCInfo.TabIndex = 0;
this.NCInfo.Text = "NC Info";
this.NCInfo.VerticalScrollbarBarColor = true;
@@ -556,11 +557,48 @@ namespace Step.UI
this.TestJSButton.UseSelectable = true;
this.TestJSButton.Click += new System.EventHandler(this.TestJSButton_Click);
//
// TXTstatus
//
this.TXTstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
//
//
//
this.TXTstatus.CustomButton.Image = null;
this.TXTstatus.CustomButton.Location = new System.Drawing.Point(334, 1);
this.TXTstatus.CustomButton.Name = "";
this.TXTstatus.CustomButton.Size = new System.Drawing.Size(21, 21);
this.TXTstatus.CustomButton.Style = MetroFramework.MetroColorStyle.Blue;
this.TXTstatus.CustomButton.TabIndex = 1;
this.TXTstatus.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light;
this.TXTstatus.CustomButton.UseSelectable = true;
this.TXTstatus.CustomButton.Visible = false;
this.TXTstatus.Enabled = false;
this.TXTstatus.Lines = new string[] {
"..."};
this.TXTstatus.Location = new System.Drawing.Point(-1, 434);
this.TXTstatus.MaxLength = 32767;
this.TXTstatus.Name = "TXTstatus";
this.TXTstatus.PasswordChar = '\0';
this.TXTstatus.ReadOnly = true;
this.TXTstatus.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.TXTstatus.SelectedText = "";
this.TXTstatus.SelectionLength = 0;
this.TXTstatus.SelectionStart = 0;
this.TXTstatus.ShortcutsEnabled = true;
this.TXTstatus.Size = new System.Drawing.Size(356, 23);
this.TXTstatus.TabIndex = 8;
this.TXTstatus.Text = "...";
this.TXTstatus.UseSelectable = true;
this.TXTstatus.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.TXTstatus.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
//
// ServerControlWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(350, 446);
this.ClientSize = new System.Drawing.Size(350, 457);
this.Controls.Add(this.TXTstatus);
this.Controls.Add(this.stopServerButton);
this.Controls.Add(this.metroTabControl1);
this.Controls.Add(this.openUiButton);
@@ -574,7 +612,6 @@ namespace Step.UI
this.Resizable = false;
this.ShadowType = MetroFramework.Forms.MetroFormShadowType.AeroShadow;
this.ShowInTaskbar = false;
this.Text = "CMS Step";
this.Theme = MetroFramework.MetroThemeStyle.Default;
this.NotifyIconMenu.ResumeLayout(false);
this.metroTabControl1.ResumeLayout(false);
@@ -615,5 +652,6 @@ namespace Step.UI
private MetroFramework.Controls.MetroListView LISTThreadStatus;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
private MetroFramework.Controls.MetroTextBox TXTstatus;
}
}