From e2b8e75c000291fe45fe9f58beaace5e4c0d1d64 Mon Sep 17 00:00:00 2001 From: arkypita Date: Mon, 15 Jul 2024 21:37:06 +0200 Subject: [PATCH] Add support for Japanese language --- LaserGRBL/AssemblyInfo.cs | 2 +- LaserGRBL/Firmware/FlashGrbl.Designer.cs | 195 +-- LaserGRBL/Firmware/FlashGrbl.resx | 658 ++++++++- LaserGRBL/Generator/CuttingTest.Designer.cs | 308 +--- LaserGRBL/Generator/CuttingTest.resx | 1175 +++++++++++++++ .../Generator/PowerVsSpeedForm.Designer.cs | 347 +---- LaserGRBL/Generator/PowerVsSpeedForm.resx | 1316 +++++++++++++++++ LaserGRBL/Generator/ShakeTest.Designer.cs | 159 +- LaserGRBL/Generator/ShakeTest.resx | 584 ++++++++ LaserGRBL/LaserGRBL.csproj | 81 + LaserGRBL/LaserLifeEdit.Designer.cs | 235 +-- LaserGRBL/LaserLifeEdit.resx | 619 +++++++- LaserGRBL/LaserUsage.Designer.cs | 228 +-- LaserGRBL/LaserUsage.resx | 746 ++++++++++ LaserGRBL/LegalDisclaimer.Designer.cs | 92 +- LaserGRBL/LegalDisclaimer.resx | 334 ++++- LaserGRBL/LicenseForm.pt-BR.resx | 304 ---- LaserGRBL/MainForm.Designer.cs | 155 +- LaserGRBL/MainForm.cs | 11 +- LaserGRBL/MainForm.resx | 446 +++--- .../ConvertSizeAndOptionForm.Designer.cs | 32 +- .../ConvertSizeAndOptionForm.resx | 48 +- .../ConvertSizeAndOptionForm.Designer.cs | 12 + .../ConvertSizeAndOptionForm.resx | 28 +- LaserGRBL/Telegram.cs | 2 +- setup.iss | 3 +- 26 files changed, 6186 insertions(+), 1934 deletions(-) delete mode 100644 LaserGRBL/LicenseForm.pt-BR.resx diff --git a/LaserGRBL/AssemblyInfo.cs b/LaserGRBL/AssemblyInfo.cs index f1f5d0300..756ea6953 100644 --- a/LaserGRBL/AssemblyInfo.cs +++ b/LaserGRBL/AssemblyInfo.cs @@ -31,5 +31,5 @@ // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // utilizzando l'asterisco (*) come descritto di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("7.11.0")] +[assembly: AssemblyVersion ("7.11.1")] [assembly: NeutralResourcesLanguage("en")] diff --git a/LaserGRBL/Firmware/FlashGrbl.Designer.cs b/LaserGRBL/Firmware/FlashGrbl.Designer.cs index 86eeaf3a7..5a2a4db2d 100644 --- a/LaserGRBL/Firmware/FlashGrbl.Designer.cs +++ b/LaserGRBL/Firmware/FlashGrbl.Designer.cs @@ -36,6 +36,7 @@ private void InitializeComponent() this.BtnOK = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.LblNotForOrtur = new System.Windows.Forms.Label(); this.LblWarning = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); @@ -50,7 +51,6 @@ private void InitializeComponent() this.BtnTarget = new LaserGRBL.UserControls.ImageButton(); this.BtnFirmware = new LaserGRBL.UserControls.ImageButton(); this.TT = new System.Windows.Forms.ToolTip(this.components); - this.LblNotForOrtur = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); @@ -61,134 +61,69 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(317, 230); - this.tableLayoutPanel1.TabIndex = 1; // // tableLayoutPanel2 // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 3; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.BtnCancel, 1, 0); this.tableLayoutPanel2.Controls.Add(this.BtnOK, 2, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 194); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(311, 33); - this.tableLayoutPanel2.TabIndex = 0; // // BtnCancel // this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCancel.Location = new System.Drawing.Point(154, 3); + resources.ApplyResources(this.BtnCancel, "BtnCancel"); this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.Size = new System.Drawing.Size(74, 27); - this.BtnCancel.TabIndex = 4; - this.BtnCancel.Text = "Cancel"; this.BtnCancel.UseVisualStyleBackColor = true; // // BtnOK // this.BtnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.BtnOK.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnOK.Location = new System.Drawing.Point(234, 3); + resources.ApplyResources(this.BtnOK, "BtnOK"); this.BtnOK.Name = "BtnOK"; - this.BtnOK.Size = new System.Drawing.Size(74, 27); - this.BtnOK.TabIndex = 5; - this.BtnOK.Text = "OK"; this.BtnOK.UseVisualStyleBackColor = true; this.BtnOK.Click += new System.EventHandler(this.BtnOK_Click); // // tableLayoutPanel3 // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 1; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 0, 0); this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel5, 0, 2); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 3; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(311, 185); - this.tableLayoutPanel3.TabIndex = 1; // // tableLayoutPanel4 // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.ColumnCount = 2; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.LblNotForOrtur, 1, 1); this.tableLayoutPanel4.Controls.Add(this.LblWarning, 1, 0); this.tableLayoutPanel4.Controls.Add(this.pictureBox1, 0, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 2; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(305, 58); - this.tableLayoutPanel4.TabIndex = 4; + // + // LblNotForOrtur + // + resources.ApplyResources(this.LblNotForOrtur, "LblNotForOrtur"); + this.LblNotForOrtur.ForeColor = System.Drawing.Color.Red; + this.LblNotForOrtur.Name = "LblNotForOrtur"; // // LblWarning // - this.LblWarning.Anchor = System.Windows.Forms.AnchorStyles.None; - this.LblWarning.AutoSize = true; + resources.ApplyResources(this.LblWarning, "LblWarning"); this.LblWarning.ForeColor = System.Drawing.Color.Red; - this.LblWarning.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.LblWarning.Location = new System.Drawing.Point(44, 6); - this.LblWarning.Margin = new System.Windows.Forms.Padding(2); this.LblWarning.Name = "LblWarning"; - this.LblWarning.Size = new System.Drawing.Size(255, 26); - this.LblWarning.TabIndex = 3; - this.LblWarning.Text = "Warning! This operation can damage your hardware.\r\nThe operation can be irreversi" + - "ble: use at your risk."; // // pictureBox1 // - this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(32, 32); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 3; this.pictureBox1.TabStop = false; // // tableLayoutPanel5 // - this.tableLayoutPanel5.AutoSize = true; - this.tableLayoutPanel5.ColumnCount = 3; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); this.tableLayoutPanel5.Controls.Add(this.CbTarget, 1, 0); this.tableLayoutPanel5.Controls.Add(this.LblTarget, 0, 0); this.tableLayoutPanel5.Controls.Add(this.CbFirmware, 1, 1); @@ -199,131 +134,87 @@ private void InitializeComponent() this.tableLayoutPanel5.Controls.Add(this.CbBaudRate, 1, 3); this.tableLayoutPanel5.Controls.Add(this.BtnTarget, 2, 0); this.tableLayoutPanel5.Controls.Add(this.BtnFirmware, 2, 1); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 67); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 5; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(305, 128); - this.tableLayoutPanel5.TabIndex = 5; // // CbTarget // - this.CbTarget.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.CbTarget, "CbTarget"); this.CbTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CbTarget.FormattingEnabled = true; this.CbTarget.Items.AddRange(new object[] { - "Arduino Uno", - "Arduino Nano"}); - this.CbTarget.Location = new System.Drawing.Point(70, 3); + resources.GetString("CbTarget.Items"), + resources.GetString("CbTarget.Items1")}); this.CbTarget.Name = "CbTarget"; - this.CbTarget.Size = new System.Drawing.Size(209, 21); - this.CbTarget.TabIndex = 0; this.CbTarget.SelectedIndexChanged += new System.EventHandler(this.CbTarget_SelectedIndexChanged); // // LblTarget // - this.LblTarget.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblTarget.AutoSize = true; - this.LblTarget.Location = new System.Drawing.Point(3, 7); + resources.ApplyResources(this.LblTarget, "LblTarget"); this.LblTarget.Name = "LblTarget"; - this.LblTarget.Size = new System.Drawing.Size(41, 13); - this.LblTarget.TabIndex = 2; - this.LblTarget.Text = "Target:"; // // CbFirmware // - this.CbFirmware.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.CbFirmware, "CbFirmware"); this.CbFirmware.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CbFirmware.FormattingEnabled = true; - this.CbFirmware.Location = new System.Drawing.Point(70, 30); this.CbFirmware.Name = "CbFirmware"; - this.CbFirmware.Size = new System.Drawing.Size(209, 21); - this.CbFirmware.TabIndex = 1; // // LblFirmware // - this.LblFirmware.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblFirmware.AutoSize = true; - this.LblFirmware.Location = new System.Drawing.Point(3, 34); + resources.ApplyResources(this.LblFirmware, "LblFirmware"); this.LblFirmware.Name = "LblFirmware"; - this.LblFirmware.Size = new System.Drawing.Size(52, 13); - this.LblFirmware.TabIndex = 0; - this.LblFirmware.Text = "Firmware:"; // // LblPort // - this.LblPort.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblPort.AutoSize = true; - this.LblPort.Location = new System.Drawing.Point(3, 61); + resources.ApplyResources(this.LblPort, "LblPort"); this.LblPort.Name = "LblPort"; - this.LblPort.Size = new System.Drawing.Size(29, 13); - this.LblPort.TabIndex = 1; - this.LblPort.Text = "Port:"; // // CbPort // this.CbPort.FormattingEnabled = true; - this.CbPort.Location = new System.Drawing.Point(70, 57); + resources.ApplyResources(this.CbPort, "CbPort"); this.CbPort.Name = "CbPort"; - this.CbPort.Size = new System.Drawing.Size(115, 21); - this.CbPort.TabIndex = 2; this.CbPort.TextChanged += new System.EventHandler(this.CbPort_TextChanged); // // LblSpeed // - this.LblSpeed.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblSpeed.AutoSize = true; - this.LblSpeed.Location = new System.Drawing.Point(3, 88); + resources.ApplyResources(this.LblSpeed, "LblSpeed"); this.LblSpeed.Name = "LblSpeed"; - this.LblSpeed.Size = new System.Drawing.Size(61, 13); - this.LblSpeed.TabIndex = 3; - this.LblSpeed.Text = "Baud Rate:"; // // CbBaudRate // this.CbBaudRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CbBaudRate.FormattingEnabled = true; - this.CbBaudRate.Location = new System.Drawing.Point(70, 84); + resources.ApplyResources(this.CbBaudRate, "CbBaudRate"); this.CbBaudRate.Name = "CbBaudRate"; - this.CbBaudRate.Size = new System.Drawing.Size(115, 21); - this.CbBaudRate.TabIndex = 3; // // BtnTarget // this.BtnTarget.AltImage = null; - this.BtnTarget.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.BtnTarget, "BtnTarget"); this.BtnTarget.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnTarget.Caption = null; + this.BtnTarget.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnTarget.Image = ((System.Drawing.Image)(resources.GetObject("BtnTarget.Image"))); - this.BtnTarget.Location = new System.Drawing.Point(285, 5); this.BtnTarget.Name = "BtnTarget"; - this.BtnTarget.Size = new System.Drawing.Size(17, 17); + this.BtnTarget.RoundedBorders = false; this.BtnTarget.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnTarget.TabIndex = 23; - this.TT.SetToolTip(this.BtnTarget, "Select exact kind of arduino board you want to upgrade.\r\nClick here for more info" + - "..."); + this.TT.SetToolTip(this.BtnTarget, resources.GetString("BtnTarget.ToolTip")); this.BtnTarget.UseAltImage = false; this.BtnTarget.Click += new System.EventHandler(this.BtnTarget_Click); // // BtnFirmware // this.BtnFirmware.AltImage = null; - this.BtnFirmware.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.BtnFirmware, "BtnFirmware"); this.BtnFirmware.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnFirmware.Caption = null; + this.BtnFirmware.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnFirmware.Image = ((System.Drawing.Image)(resources.GetObject("BtnFirmware.Image"))); - this.BtnFirmware.Location = new System.Drawing.Point(285, 32); this.BtnFirmware.Name = "BtnFirmware"; - this.BtnFirmware.Size = new System.Drawing.Size(17, 17); + this.BtnFirmware.RoundedBorders = false; this.BtnFirmware.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnFirmware.TabIndex = 24; - this.TT.SetToolTip(this.BtnFirmware, "Select the firmware you want to flash on your board\r\nClick here if you need more " + - "info about available versions..."); + this.TT.SetToolTip(this.BtnFirmware, resources.GetString("BtnFirmware.ToolTip")); this.BtnFirmware.UseAltImage = false; this.BtnFirmware.Click += new System.EventHandler(this.BtnFirmware_Click); // @@ -333,30 +224,14 @@ private void InitializeComponent() this.TT.InitialDelay = 500; this.TT.ReshowDelay = 100; // - // LblNotForOrtur - // - this.LblNotForOrtur.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblNotForOrtur.AutoSize = true; - this.LblNotForOrtur.ForeColor = System.Drawing.Color.Red; - this.LblNotForOrtur.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.LblNotForOrtur.Location = new System.Drawing.Point(40, 41); - this.LblNotForOrtur.Margin = new System.Windows.Forms.Padding(2); - this.LblNotForOrtur.Name = "LblNotForOrtur"; - this.LblNotForOrtur.Size = new System.Drawing.Size(240, 13); - this.LblNotForOrtur.TabIndex = 4; - this.LblNotForOrtur.Text = "This procedure is not intended for Ortur Engraver!"; - // // FlashGrbl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.BtnCancel; - this.ClientSize = new System.Drawing.Size(317, 230); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "FlashGrbl"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Flash Grbl Firmware"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); diff --git a/LaserGRBL/Firmware/FlashGrbl.resx b/LaserGRBL/Firmware/FlashGrbl.resx index 195a34e9c..fde4669e0 100644 --- a/LaserGRBL/Firmware/FlashGrbl.resx +++ b/LaserGRBL/Firmware/FlashGrbl.resx @@ -112,12 +112,207 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + True + + + + GrowAndShrink + + + 1 + + + True + + + GrowAndShrink + + + 3 + + + NoControl + + + + 154, 3 + + + 74, 27 + + + 4 + + + Cancel + + + BtnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + NoControl + + + 234, 3 + + + 74, 27 + + + 5 + + + OK + + + BtnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + Fill + + + 3, 194 + + + 1 + + + 311, 33 + + + 0 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnCancel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnOK" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + True + + + GrowAndShrink + + + 1 + + + True + + + 2 + + + Left + + + True + + + NoControl + + + 40, 41 + + + 2, 2, 2, 2 + + + 240, 13 + + + 4 + + + This procedure is not intended for Ortur Engraver! + + + LblNotForOrtur + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + None + + + True + + + NoControl + + + 44, 6 + + + 2, 2, 2, 2 + + + 255, 26 + + + 3 + + + Warning! This operation can damage your hardware. +The operation can be irreversible: use at your risk. + + + LblWarning + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + Left + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 @@ -140,9 +335,288 @@ XtjGdrzFysdqlo/ECOHHInieZWiDtvJZD7RH5EmibTw5DPkDqNV2ZjoWTs0AAAAASUVORK5CYII= - - 17, 17 - + + NoControl + + + 3, 3 + + + 32, 32 + + + AutoSize + + + 3 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + Fill + + + 3, 3 + + + 2 + + + 305, 58 + + + 4 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="LblNotForOrtur" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LblWarning" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + True + + + 3 + + + Left, Right + + + Arduino Uno + + + Arduino Nano + + + 70, 3 + + + 209, 21 + + + 0 + + + CbTarget + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 0 + + + Left + + + True + + + 3, 7 + + + 41, 13 + + + 2 + + + Target: + + + LblTarget + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 1 + + + Left, Right + + + 70, 30 + + + 209, 21 + + + 1 + + + CbFirmware + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 2 + + + Left + + + True + + + 3, 34 + + + 52, 13 + + + 0 + + + Firmware: + + + LblFirmware + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 3 + + + Left + + + True + + + 3, 61 + + + 29, 13 + + + 1 + + + Port: + + + LblPort + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 4 + + + 70, 57 + + + 115, 21 + + + 2 + + + CbPort + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 5 + + + Left + + + True + + + 3, 88 + + + 61, 13 + + + 3 + + + Baud Rate: + + + LblSpeed + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 6 + + + 70, 84 + + + 115, 21 + + + 3 + + + CbBaudRate + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 7 + + + Left + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -158,6 +632,37 @@ 2bCVq0RaJ5X9I9mIkt+LaQarb80ZCAAAAABJRU5ErkJggg== + + 285, 5 + + + 17, 17 + + + 23 + + + 17, 17 + + + Select exact kind of arduino board you want to upgrade. +Click here for more info... + + + BtnTarget + + + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel5 + + + 8 + + + Left + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -173,7 +678,146 @@ 2bCVq0RaJ5X9I9mIkt+LaQarb80ZCAAAAABJRU5ErkJggg== - + + 285, 32 + + 17, 17 + + + 24 + + + Select the firmware you want to flash on your board +Click here if you need more info about available versions... + + + BtnFirmware + + + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel5 + + + 9 + + + Fill + + + 3, 67 + + + 5 + + + 305, 128 + + + 5 + + + tableLayoutPanel5 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CbTarget" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LblTarget" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CbFirmware" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LblFirmware" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="LblPort" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CbPort" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LblSpeed" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CbBaudRate" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnTarget" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="BtnFirmware" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,50,AutoSize,0,Absolute,20,Absolute,20" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + Fill + + + 3, 3 + + + 3 + + + 311, 185 + + + 1 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel4" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel5" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 2 + + + 317, 230 + + + 1 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,AutoSize,0" /></TableLayoutSettings> + + + True + + 6, 13 + + + 317, 230 + + + CenterParent + + + Flash Grbl Firmware + + + TT + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + FlashGrbl + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/Generator/CuttingTest.Designer.cs b/LaserGRBL/Generator/CuttingTest.Designer.cs index 9d27a7c2f..e0df43802 100644 --- a/LaserGRBL/Generator/CuttingTest.Designer.cs +++ b/LaserGRBL/Generator/CuttingTest.Designer.cs @@ -79,127 +79,61 @@ private void InitializeComponent() // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(285, 244); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // // tableLayoutPanel1 // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 1, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 1; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(805, 265); - this.tableLayoutPanel1.TabIndex = 1; // // tableLayoutPanel2 // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel4, 0, 2); this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.GbParameters, 0, 1); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(294, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 3; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(508, 260); - this.tableLayoutPanel2.TabIndex = 1; // // tableLayoutPanel4 // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 3; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.BtnCancel, 1, 0); this.tableLayoutPanel4.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 224); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.Size = new System.Drawing.Size(502, 33); - this.tableLayoutPanel4.TabIndex = 5; // // BtnCancel // this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCancel.Location = new System.Drawing.Point(345, 3); + resources.ApplyResources(this.BtnCancel, "BtnCancel"); this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.Size = new System.Drawing.Size(74, 27); - this.BtnCancel.TabIndex = 98; - this.BtnCancel.Text = "Cancel"; this.BtnCancel.UseVisualStyleBackColor = true; // // BtnCreate // - this.BtnCreate.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCreate.Location = new System.Drawing.Point(425, 3); + resources.ApplyResources(this.BtnCreate, "BtnCreate"); this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.Size = new System.Drawing.Size(74, 27); - this.BtnCreate.TabIndex = 99; - this.BtnCreate.Text = "Create!"; this.BtnCreate.UseVisualStyleBackColor = true; this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); // // label1 // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.None; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(73, 2); - this.label1.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(361, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Generate cutting test for different combinations of speed and passes count."; // // GbParameters // - this.GbParameters.AutoSize = true; - this.GbParameters.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.GbParameters, "GbParameters"); this.GbParameters.Controls.Add(this.tableLayoutPanel3); - this.GbParameters.Location = new System.Drawing.Point(3, 20); this.GbParameters.Name = "GbParameters"; - this.GbParameters.Size = new System.Drawing.Size(445, 198); - this.GbParameters.TabIndex = 1; this.GbParameters.TabStop = false; - this.GbParameters.Text = "Parameters"; // // tableLayoutPanel3 // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 9; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Controls.Add(this.Ii_Sfixed, 2, 0); this.tableLayoutPanel3.Controls.Add(this.CBLaserON, 2, 4); this.tableLayoutPanel3.Controls.Add(this.label7, 0, 2); @@ -230,387 +164,243 @@ private void InitializeComponent() this.tableLayoutPanel3.Controls.Add(this.IISizeH, 4, 8); this.tableLayoutPanel3.Controls.Add(this.PhTbLabel, 6, 6); this.tableLayoutPanel3.Controls.Add(this.label13, 0, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 10; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(439, 179); - this.tableLayoutPanel3.TabIndex = 0; // // Ii_Sfixed // - this.Ii_Sfixed.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Sfixed, "Ii_Sfixed"); this.Ii_Sfixed.ForcedText = null; this.Ii_Sfixed.ForceMinMax = false; - this.Ii_Sfixed.Location = new System.Drawing.Point(114, 3); this.Ii_Sfixed.MaxValue = 1000; this.Ii_Sfixed.MinValue = 1; this.Ii_Sfixed.Name = "Ii_Sfixed"; - this.Ii_Sfixed.Size = new System.Drawing.Size(49, 15); - this.Ii_Sfixed.TabIndex = 0; // // CBLaserON // + this.CBLaserON.BackColor = System.Drawing.Color.White; this.tableLayoutPanel3.SetColumnSpan(this.CBLaserON, 3); - this.CBLaserON.Dock = System.Windows.Forms.DockStyle.Fill; + resources.ApplyResources(this.CBLaserON, "CBLaserON"); this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.ForeColor = System.Drawing.SystemColors.ControlText; this.CBLaserON.FormattingEnabled = true; - this.CBLaserON.Location = new System.Drawing.Point(114, 73); this.CBLaserON.Name = "CBLaserON"; - this.CBLaserON.Size = new System.Drawing.Size(141, 21); - this.CBLaserON.TabIndex = 8; // // label7 // - this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(3, 45); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(53, 13); - this.label7.TabIndex = 9; - this.label7.Text = "Speed (F)"; // // label2 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 24); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 0; - this.label2.Text = "Passes"; // // label3 // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(81, 24); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(27, 13); - this.label3.TabIndex = 1; - this.label3.Text = "from"; // // Ii_Pmin // - this.Ii_Pmin.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Pmin, "Ii_Pmin"); this.Ii_Pmin.ForcedText = null; this.Ii_Pmin.ForceMinMax = true; - this.Ii_Pmin.Location = new System.Drawing.Point(114, 23); this.Ii_Pmin.MaxValue = 20; this.Ii_Pmin.MinValue = 1; this.Ii_Pmin.Name = "Ii_Pmin"; - this.Ii_Pmin.Size = new System.Drawing.Size(49, 15); - this.Ii_Pmin.TabIndex = 0; this.Ii_Pmin.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.Ii_PCurrentValueChanged); // // label4 // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(180, 24); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(16, 13); - this.label4.TabIndex = 3; - this.label4.Text = "to"; // // Ii_Pmax // - this.Ii_Pmax.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Pmax, "Ii_Pmax"); this.Ii_Pmax.ForcedText = null; this.Ii_Pmax.ForceMinMax = true; - this.Ii_Pmax.Location = new System.Drawing.Point(202, 23); this.Ii_Pmax.MaxValue = 20; this.Ii_Pmax.MinValue = 1; this.Ii_Pmax.Name = "Ii_Pmax"; - this.Ii_Pmax.Size = new System.Drawing.Size(49, 15); - this.Ii_Pmax.TabIndex = 1; this.Ii_Pmax.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.Ii_PCurrentValueChanged); // // label8 // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(81, 45); + resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(27, 13); - this.label8.TabIndex = 10; - this.label8.Text = "from"; // // Ii_Fmin // - this.Ii_Fmin.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fmin, "Ii_Fmin"); this.Ii_Fmin.ForcedText = null; this.Ii_Fmin.ForceMinMax = false; - this.Ii_Fmin.Location = new System.Drawing.Point(114, 44); this.Ii_Fmin.MaxValue = 1000; this.Ii_Fmin.MinValue = 0; this.Ii_Fmin.Name = "Ii_Fmin"; - this.Ii_Fmin.Size = new System.Drawing.Size(49, 15); - this.Ii_Fmin.TabIndex = 4; this.Ii_Fmin.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // Ii_Fmax // - this.Ii_Fmax.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fmax, "Ii_Fmax"); this.Ii_Fmax.ForcedText = null; this.Ii_Fmax.ForceMinMax = false; - this.Ii_Fmax.Location = new System.Drawing.Point(202, 44); this.Ii_Fmax.MaxValue = 1000; this.Ii_Fmax.MinValue = 0; this.Ii_Fmax.Name = "Ii_Fmax"; - this.Ii_Fmax.Size = new System.Drawing.Size(49, 15); - this.Ii_Fmax.TabIndex = 5; this.Ii_Fmax.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // label9 // - this.label9.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(180, 45); + resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(16, 13); - this.label9.TabIndex = 12; - this.label9.Text = "to"; // // label10 // - this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(261, 45); + resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(32, 13); - this.label10.TabIndex = 14; - this.label10.Text = "steps"; // // Ii_Fsteps // - this.Ii_Fsteps.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fsteps, "Ii_Fsteps"); this.Ii_Fsteps.CurrentValue = 11; this.Ii_Fsteps.ForcedText = null; this.Ii_Fsteps.ForceMinMax = true; - this.Ii_Fsteps.Location = new System.Drawing.Point(299, 44); this.Ii_Fsteps.MaxValue = 20; this.Ii_Fsteps.MinValue = 1; this.Ii_Fsteps.Name = "Ii_Fsteps"; - this.Ii_Fsteps.Size = new System.Drawing.Size(28, 15); - this.Ii_Fsteps.TabIndex = 6; this.Ii_Fsteps.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // label11 // - this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(333, 45); + resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(48, 13); - this.label11.TabIndex = 16; - this.label11.Text = "step size"; // // LblLaserMode // - this.LblLaserMode.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblLaserMode.AutoSize = true; - this.LblLaserMode.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.LblLaserMode.Location = new System.Drawing.Point(3, 77); + resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); this.LblLaserMode.Name = "LblLaserMode"; - this.LblLaserMode.Size = new System.Drawing.Size(63, 13); - this.LblLaserMode.TabIndex = 25; - this.LblLaserMode.Text = "Laser Mode"; // // BtnOnOffInfo // this.BtnOnOffInfo.AltImage = null; - this.BtnOnOffInfo.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); - this.BtnOnOffInfo.Location = new System.Drawing.Point(261, 75); this.BtnOnOffInfo.Name = "BtnOnOffInfo"; - this.BtnOnOffInfo.Size = new System.Drawing.Size(17, 17); + this.BtnOnOffInfo.RoundedBorders = false; this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnOnOffInfo.TabIndex = 9; this.BtnOnOffInfo.UseAltImage = false; this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); // // Ii_FStepSize // - this.Ii_FStepSize.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.Ii_FStepSize.Enabled = false; + resources.ApplyResources(this.Ii_FStepSize, "Ii_FStepSize"); this.Ii_FStepSize.ForcedText = null; this.Ii_FStepSize.ForceMinMax = false; - this.Ii_FStepSize.Location = new System.Drawing.Point(387, 44); this.Ii_FStepSize.MaxValue = 1000; this.Ii_FStepSize.MinValue = 0; this.Ii_FStepSize.Name = "Ii_FStepSize"; - this.Ii_FStepSize.Size = new System.Drawing.Size(49, 15); - this.Ii_FStepSize.TabIndex = 7; // // label12 // - this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label12.AutoSize = true; - this.label12.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label12.Location = new System.Drawing.Point(3, 111); + resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(28, 13); - this.label12.TabIndex = 37; - this.label12.Text = "Text"; // // label15 // - this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label15.AutoSize = true; - this.label15.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label15.Location = new System.Drawing.Point(3, 142); + resources.ApplyResources(this.label15, "label15"); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(27, 13); - this.label15.TabIndex = 32; - this.label15.Text = "Size"; // // label18 // - this.label18.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(72, 111); + resources.ApplyResources(this.label18, "label18"); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(36, 13); - this.label18.TabIndex = 38; - this.label18.Text = "speed"; // // label16 // - this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label16.AutoSize = true; - this.label16.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label16.Location = new System.Drawing.Point(93, 142); - this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + resources.ApplyResources(this.label16, "label16"); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(18, 13); - this.label16.TabIndex = 35; - this.label16.Text = "W"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Ii_Ftext // - this.Ii_Ftext.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Ftext, "Ii_Ftext"); this.Ii_Ftext.ForcedText = null; this.Ii_Ftext.ForceMinMax = false; - this.Ii_Ftext.Location = new System.Drawing.Point(114, 110); this.Ii_Ftext.MaxValue = 1000; this.Ii_Ftext.MinValue = 0; this.Ii_Ftext.Name = "Ii_Ftext"; - this.Ii_Ftext.Size = new System.Drawing.Size(49, 15); - this.Ii_Ftext.TabIndex = 39; // // IISizeW // this.IISizeW.CurrentValue = 100F; this.IISizeW.DecimalPositions = 1; - this.IISizeW.Enabled = false; + resources.ApplyResources(this.IISizeW, "IISizeW"); this.IISizeW.ForceMinMax = false; - this.IISizeW.Location = new System.Drawing.Point(114, 142); this.IISizeW.MaxValue = 1000F; this.IISizeW.MinValue = 0F; this.IISizeW.Name = "IISizeW"; - this.IISizeW.Size = new System.Drawing.Size(49, 15); - this.IISizeW.TabIndex = 12; // // label19 // - this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(169, 111); + resources.ApplyResources(this.label19, "label19"); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(27, 13); - this.label19.TabIndex = 40; - this.label19.Text = "pow"; // // label17 // - this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label17.AutoSize = true; - this.label17.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label17.Location = new System.Drawing.Point(184, 142); - this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + resources.ApplyResources(this.label17, "label17"); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(15, 13); - this.label17.TabIndex = 36; - this.label17.Text = "H"; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Ii_Stext // - this.Ii_Stext.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Stext, "Ii_Stext"); this.Ii_Stext.ForcedText = null; this.Ii_Stext.ForceMinMax = false; - this.Ii_Stext.Location = new System.Drawing.Point(202, 110); this.Ii_Stext.MaxValue = 1000; this.Ii_Stext.MinValue = 0; this.Ii_Stext.Name = "Ii_Stext"; - this.Ii_Stext.Size = new System.Drawing.Size(49, 15); - this.Ii_Stext.TabIndex = 41; // // IISizeH // this.IISizeH.CurrentValue = 100F; this.IISizeH.DecimalPositions = 1; - this.IISizeH.Enabled = false; + resources.ApplyResources(this.IISizeH, "IISizeH"); this.IISizeH.ForceMinMax = false; - this.IISizeH.Location = new System.Drawing.Point(202, 142); this.IISizeH.MaxValue = 1000F; this.IISizeH.MinValue = 0F; this.IISizeH.Name = "IISizeH"; - this.IISizeH.Size = new System.Drawing.Size(49, 15); - this.IISizeH.TabIndex = 13; // // PhTbLabel // + this.PhTbLabel.BackColor = System.Drawing.Color.White; + this.PhTbLabel.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tableLayoutPanel3.SetColumnSpan(this.PhTbLabel, 3); - this.PhTbLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.PhTbLabel.Location = new System.Drawing.Point(299, 108); + resources.ApplyResources(this.PhTbLabel, "PhTbLabel"); + this.PhTbLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.PhTbLabel.Name = "PhTbLabel"; - this.PhTbLabel.Size = new System.Drawing.Size(137, 20); - this.PhTbLabel.TabIndex = 42; - this.PhTbLabel.WaterMark = "enter custom label"; + this.PhTbLabel.WaterMarkActiveColor = System.Drawing.Color.Gray; this.PhTbLabel.WaterMarkActiveForeColor = System.Drawing.Color.Gray; + this.PhTbLabel.WaterMarkColor = System.Drawing.Color.LightGray; this.PhTbLabel.WaterMarkFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.PhTbLabel.WaterMarkForeColor = System.Drawing.Color.LightGray; // // label13 // - this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.label13, "label13"); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(53, 13); - this.label13.TabIndex = 43; - this.label13.Text = "Power (S)"; // // CuttingTest // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.BtnCancel; - this.ClientSize = new System.Drawing.Size(805, 265); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "CuttingTest"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Cutting test generator"; this.Load += new System.EventHandler(this.GreyScaleForm_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); diff --git a/LaserGRBL/Generator/CuttingTest.resx b/LaserGRBL/Generator/CuttingTest.resx index 9bd1caf60..6f81db467 100644 --- a/LaserGRBL/Generator/CuttingTest.resx +++ b/LaserGRBL/Generator/CuttingTest.resx @@ -280,6 +280,635 @@ SDZCCBckGyGEA2b/D68nmNskbODpAAAAAElFTkSuQmCC + + 3, 3 + + + 285, 244 + + + + AutoSize + + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + GrowAndShrink + + + 2 + + + True + + + GrowAndShrink + + + 1 + + + True + + + GrowAndShrink + + + 3 + + + NoControl + + + 345, 3 + + + 74, 27 + + + 98 + + + Cancel + + + BtnCancel + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 0 + + + NoControl + + + 425, 3 + + + 74, 27 + + + 99 + + + Create! + + + BtnCreate + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 1 + + + Fill + + + 3, 219 + + + 1 + + + 502, 37 + + + 5 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnCancel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnCreate" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + None + + + True + + + 73, 2 + + + 2, 2, 2, 2 + + + 361, 13 + + + 0 + + + Generate cutting test for different combinations of speed and passes count. + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + True + + + GrowAndShrink + + + True + + + GrowAndShrink + + + 9 + + + Left + + + 114, 3 + + + 49, 15 + + + 0 + + + Ii_Sfixed + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 0 + + + Fill + + + 114, 73 + + + 141, 21 + + + 8 + + + CBLaserON + + + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 1 + + + Left + + + True + + + 3, 45 + + + 53, 13 + + + 9 + + + Speed (F) + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 2 + + + Left + + + True + + + 3, 24 + + + 41, 13 + + + 0 + + + Passes + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 3 + + + Right + + + True + + + 81, 24 + + + 27, 13 + + + 1 + + + from + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 4 + + + Left + + + 114, 23 + + + 49, 15 + + + 0 + + + Ii_Pmin + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 5 + + + Right + + + True + + + 180, 24 + + + 16, 13 + + + 3 + + + to + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 6 + + + Left + + + 202, 23 + + + 49, 15 + + + 1 + + + Ii_Pmax + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 7 + + + Right + + + True + + + 81, 45 + + + 27, 13 + + + 10 + + + from + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 8 + + + Left + + + 114, 44 + + + 49, 15 + + + 4 + + + Ii_Fmin + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 9 + + + Left + + + 202, 44 + + + 49, 15 + + + 5 + + + Ii_Fmax + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 10 + + + Right + + + True + + + 180, 45 + + + 16, 13 + + + 12 + + + to + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 11 + + + Right + + + True + + + 261, 45 + + + 32, 13 + + + 14 + + + steps + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 12 + + + Left + + + 299, 44 + + + 28, 15 + + + 6 + + + Ii_Fsteps + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 13 + + + Right + + + True + + + 333, 45 + + + 48, 13 + + + 16 + + + step size + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 14 + + + Left + + + True + + + NoControl + + + 3, 77 + + + 63, 13 + + + 25 + + + Laser Mode + + + LblLaserMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 15 + + + Left + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -295,4 +924,550 @@ 2bCVq0RaJ5X9I9mIkt+LaQarb80ZCAAAAABJRU5ErkJggg== + + 261, 75 + + + 17, 17 + + + 9 + + + BtnOnOffInfo + + + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 16 + + + Left + + + False + + + 387, 44 + + + 49, 15 + + + 7 + + + Ii_FStepSize + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 17 + + + Left + + + True + + + NoControl + + + 3, 109 + + + 28, 13 + + + 37 + + + Text + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 18 + + + Left + + + True + + + NoControl + + + 3, 137 + + + 27, 13 + + + 32 + + + Size + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 19 + + + Right + + + True + + + 72, 109 + + + 36, 13 + + + 38 + + + speed + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 20 + + + Right + + + True + + + NoControl + + + 93, 137 + + + 3, 0, 0, 0 + + + 18, 13 + + + 35 + + + W + + + MiddleCenter + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 21 + + + Left + + + 114, 108 + + + 49, 15 + + + 39 + + + Ii_Ftext + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 22 + + + False + + + 114, 137 + + + 49, 15 + + + 12 + + + IISizeW + + + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 23 + + + Right + + + True + + + 169, 109 + + + 27, 13 + + + 40 + + + pow + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 24 + + + Right + + + True + + + NoControl + + + 184, 137 + + + 3, 0, 0, 0 + + + 15, 13 + + + 36 + + + H + + + MiddleCenter + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 25 + + + Left + + + 202, 108 + + + 49, 15 + + + 41 + + + Ii_Stext + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 26 + + + False + + + 202, 137 + + + 49, 15 + + + 13 + + + IISizeH + + + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 27 + + + Fill + + + 299, 108 + + + 137, 13 + + + 42 + + + enter custom label + + + PhTbLabel + + + LaserGRBL.UserControls.PlaceholderTextBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 28 + + + Left + + + True + + + 3, 3 + + + 53, 13 + + + 43 + + + Power (S) + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 29 + + + Fill + + + 3, 16 + + + 10 + + + 439, 174 + + + 0 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GbParameters + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="Ii_Sfixed" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBLaserON" Row="4" RowSpan="1" Column="2" ColumnSpan="3" /><Control Name="label7" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Pmin" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label4" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="Ii_Pmax" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="label8" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Fmin" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="Ii_Fmax" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="label9" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="label10" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="Ii_Fsteps" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="label11" Row="2" RowSpan="1" Column="7" ColumnSpan="1" /><Control Name="LblLaserMode" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnOnOffInfo" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="Ii_FStepSize" Row="2" RowSpan="1" Column="8" ColumnSpan="1" /><Control Name="label12" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label15" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label18" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label16" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Ftext" Row="6" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="IISizeW" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label19" Row="6" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="label17" Row="8" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="Ii_Stext" Row="6" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="IISizeH" Row="8" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="PhTbLabel" Row="6" RowSpan="1" Column="6" ColumnSpan="3" /><Control Name="label13" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,20,AutoSize,0,AutoSize,0,Absolute,8,AutoSize,0,Absolute,8,AutoSize,0,Absolute,8,Absolute,20,Absolute,20" /></TableLayoutSettings> + + + 3, 20 + + + 445, 193 + + + 1 + + + Parameters + + + GbParameters + + + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel2 + + + 2 + + + Fill + + + 294, 3 + + + 3 + + + 508, 259 + + + 1 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel4" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GbParameters" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 1 + + + 805, 265 + + + 1 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + True + + + 6, 13 + + + True + + + GrowAndShrink + + + 805, 265 + + + CenterParent + + + Cutting test generator + + + CuttingTest + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs b/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs index 838670f75..f1b2aaeec 100644 --- a/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs +++ b/LaserGRBL/Generator/PowerVsSpeedForm.Designer.cs @@ -85,127 +85,61 @@ private void InitializeComponent() // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(289, 259); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // // tableLayoutPanel1 // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 1, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 1; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(805, 265); - this.tableLayoutPanel1.TabIndex = 1; // // tableLayoutPanel2 // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel4, 0, 2); this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.GbParameters, 0, 1); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(298, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 3; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(504, 264); - this.tableLayoutPanel2.TabIndex = 1; // // tableLayoutPanel4 // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 3; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.BtnCancel, 1, 0); this.tableLayoutPanel4.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 228); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.Size = new System.Drawing.Size(498, 33); - this.tableLayoutPanel4.TabIndex = 5; // // BtnCancel // this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCancel.Location = new System.Drawing.Point(341, 3); + resources.ApplyResources(this.BtnCancel, "BtnCancel"); this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.Size = new System.Drawing.Size(74, 27); - this.BtnCancel.TabIndex = 98; - this.BtnCancel.Text = "Cancel"; this.BtnCancel.UseVisualStyleBackColor = true; // // BtnCreate // - this.BtnCreate.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCreate.Location = new System.Drawing.Point(421, 3); + resources.ApplyResources(this.BtnCreate, "BtnCreate"); this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.Size = new System.Drawing.Size(74, 27); - this.BtnCreate.TabIndex = 99; - this.BtnCreate.Text = "Create!"; this.BtnCreate.UseVisualStyleBackColor = true; this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); // // label1 // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.None; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(94, 2); - this.label1.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(315, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Generate test map for different combinations of power and speed."; // // GbParameters // - this.GbParameters.AutoSize = true; - this.GbParameters.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.GbParameters, "GbParameters"); this.GbParameters.Controls.Add(this.tableLayoutPanel3); - this.GbParameters.Location = new System.Drawing.Point(3, 20); this.GbParameters.Name = "GbParameters"; - this.GbParameters.Size = new System.Drawing.Size(445, 202); - this.GbParameters.TabIndex = 1; this.GbParameters.TabStop = false; - this.GbParameters.Text = "Parameters"; // // tableLayoutPanel3 // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 9; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Controls.Add(this.CBLaserON, 2, 3); this.tableLayoutPanel3.Controls.Add(this.label7, 0, 1); this.tableLayoutPanel3.Controls.Add(this.label6, 7, 0); @@ -241,256 +175,165 @@ private void InitializeComponent() this.tableLayoutPanel3.Controls.Add(this.Ii_Stext, 4, 6); this.tableLayoutPanel3.Controls.Add(this.IISizeH, 4, 8); this.tableLayoutPanel3.Controls.Add(this.PhTbLabel, 6, 6); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 10; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(439, 183); - this.tableLayoutPanel3.TabIndex = 0; // // CBLaserON // + this.CBLaserON.BackColor = System.Drawing.Color.White; this.tableLayoutPanel3.SetColumnSpan(this.CBLaserON, 3); - this.CBLaserON.Dock = System.Windows.Forms.DockStyle.Fill; + resources.ApplyResources(this.CBLaserON, "CBLaserON"); this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.ForeColor = System.Drawing.SystemColors.ControlText; this.CBLaserON.FormattingEnabled = true; - this.CBLaserON.Location = new System.Drawing.Point(114, 53); this.CBLaserON.Name = "CBLaserON"; - this.CBLaserON.Size = new System.Drawing.Size(141, 21); - this.CBLaserON.TabIndex = 8; // // label7 // - this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(3, 25); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(53, 13); - this.label7.TabIndex = 9; - this.label7.Text = "Speed (F)"; // // label6 // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(333, 4); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(48, 13); - this.label6.TabIndex = 7; - this.label6.Text = "step size"; // // Ii_Ssteps // - this.Ii_Ssteps.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Ssteps, "Ii_Ssteps"); this.Ii_Ssteps.CurrentValue = 11; this.Ii_Ssteps.ForcedText = null; this.Ii_Ssteps.ForceMinMax = true; - this.Ii_Ssteps.Location = new System.Drawing.Point(299, 3); this.Ii_Ssteps.MaxValue = 20; this.Ii_Ssteps.MinValue = 1; this.Ii_Ssteps.Name = "Ii_Ssteps"; - this.Ii_Ssteps.Size = new System.Drawing.Size(28, 15); - this.Ii_Ssteps.TabIndex = 2; this.Ii_Ssteps.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiS_CurrentValueChanged); // // label5 // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(261, 4); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(32, 13); - this.label5.TabIndex = 5; - this.label5.Text = "steps"; // // label2 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 4); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 13); - this.label2.TabIndex = 0; - this.label2.Text = "Power (S)"; // // label3 // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(81, 4); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(27, 13); - this.label3.TabIndex = 1; - this.label3.Text = "from"; // // Ii_Smin // - this.Ii_Smin.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Smin, "Ii_Smin"); this.Ii_Smin.ForcedText = null; this.Ii_Smin.ForceMinMax = false; - this.Ii_Smin.Location = new System.Drawing.Point(114, 3); this.Ii_Smin.MaxValue = 1000; this.Ii_Smin.MinValue = 0; this.Ii_Smin.Name = "Ii_Smin"; - this.Ii_Smin.Size = new System.Drawing.Size(49, 15); - this.Ii_Smin.TabIndex = 0; this.Ii_Smin.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiS_CurrentValueChanged); // // label4 // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(184, 4); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(16, 13); - this.label4.TabIndex = 3; - this.label4.Text = "to"; // // Ii_Smax // - this.Ii_Smax.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Smax, "Ii_Smax"); this.Ii_Smax.ForcedText = null; this.Ii_Smax.ForceMinMax = false; - this.Ii_Smax.Location = new System.Drawing.Point(206, 3); this.Ii_Smax.MaxValue = 1000; this.Ii_Smax.MinValue = 0; this.Ii_Smax.Name = "Ii_Smax"; - this.Ii_Smax.Size = new System.Drawing.Size(49, 15); - this.Ii_Smax.TabIndex = 1; this.Ii_Smax.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiS_CurrentValueChanged); // // label8 // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(81, 25); + resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(27, 13); - this.label8.TabIndex = 10; - this.label8.Text = "from"; // // Ii_Fmin // - this.Ii_Fmin.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fmin, "Ii_Fmin"); this.Ii_Fmin.ForcedText = null; this.Ii_Fmin.ForceMinMax = false; - this.Ii_Fmin.Location = new System.Drawing.Point(114, 24); this.Ii_Fmin.MaxValue = 1000; this.Ii_Fmin.MinValue = 0; this.Ii_Fmin.Name = "Ii_Fmin"; - this.Ii_Fmin.Size = new System.Drawing.Size(49, 15); - this.Ii_Fmin.TabIndex = 4; this.Ii_Fmin.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // Ii_Fmax // - this.Ii_Fmax.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fmax, "Ii_Fmax"); this.Ii_Fmax.ForcedText = null; this.Ii_Fmax.ForceMinMax = false; - this.Ii_Fmax.Location = new System.Drawing.Point(206, 24); this.Ii_Fmax.MaxValue = 1000; this.Ii_Fmax.MinValue = 0; this.Ii_Fmax.Name = "Ii_Fmax"; - this.Ii_Fmax.Size = new System.Drawing.Size(49, 15); - this.Ii_Fmax.TabIndex = 5; this.Ii_Fmax.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // label9 // - this.label9.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(184, 25); + resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(16, 13); - this.label9.TabIndex = 12; - this.label9.Text = "to"; // // label10 // - this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(261, 25); + resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(32, 13); - this.label10.TabIndex = 14; - this.label10.Text = "steps"; // // Ii_Fsteps // - this.Ii_Fsteps.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Fsteps, "Ii_Fsteps"); this.Ii_Fsteps.CurrentValue = 11; this.Ii_Fsteps.ForcedText = null; this.Ii_Fsteps.ForceMinMax = true; - this.Ii_Fsteps.Location = new System.Drawing.Point(299, 24); this.Ii_Fsteps.MaxValue = 20; this.Ii_Fsteps.MinValue = 1; this.Ii_Fsteps.Name = "Ii_Fsteps"; - this.Ii_Fsteps.Size = new System.Drawing.Size(28, 15); - this.Ii_Fsteps.TabIndex = 6; this.Ii_Fsteps.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IiF_CurrentValueChanged); // // label11 // - this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(333, 25); + resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(48, 13); - this.label11.TabIndex = 16; - this.label11.Text = "step size"; // // LblLaserMode // - this.LblLaserMode.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblLaserMode.AutoSize = true; - this.LblLaserMode.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.LblLaserMode.Location = new System.Drawing.Point(3, 57); + resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); this.LblLaserMode.Name = "LblLaserMode"; - this.LblLaserMode.Size = new System.Drawing.Size(63, 13); - this.LblLaserMode.TabIndex = 25; - this.LblLaserMode.Text = "Laser Mode"; // // BtnOnOffInfo // this.BtnOnOffInfo.AltImage = null; - this.BtnOnOffInfo.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); - this.BtnOnOffInfo.Location = new System.Drawing.Point(261, 55); this.BtnOnOffInfo.Name = "BtnOnOffInfo"; - this.BtnOnOffInfo.Size = new System.Drawing.Size(17, 17); + this.BtnOnOffInfo.RoundedBorders = false; this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnOnOffInfo.TabIndex = 9; this.BtnOnOffInfo.UseAltImage = false; this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); // // label13 // - this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label13.AutoSize = true; - this.label13.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label13.Location = new System.Drawing.Point(3, 82); + resources.ApplyResources(this.label13, "label13"); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(39, 13); - this.label13.TabIndex = 28; - this.label13.Text = "Quality"; // // UDQuality // + this.UDQuality.BackColor = System.Drawing.Color.White; + this.UDQuality.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220))))); this.UDQuality.DecimalPlaces = 3; - this.UDQuality.Location = new System.Drawing.Point(113, 79); - this.UDQuality.Margin = new System.Windows.Forms.Padding(2); + this.UDQuality.Increment = new decimal(new int[] { + 1, + 0, + 0, + 0}); + resources.ApplyResources(this.UDQuality, "UDQuality"); this.UDQuality.Maximum = new decimal(new int[] { 50, 0, @@ -502,8 +345,6 @@ private void InitializeComponent() 0, 0}); this.UDQuality.Name = "UDQuality"; - this.UDQuality.Size = new System.Drawing.Size(55, 20); - this.UDQuality.TabIndex = 10; this.UDQuality.Value = new decimal(new int[] { 3, 0, @@ -512,186 +353,120 @@ private void InitializeComponent() // // label14 // - this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label14.AutoSize = true; + resources.ApplyResources(this.label14, "label14"); this.tableLayoutPanel3.SetColumnSpan(this.label14, 2); - this.label14.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label14.Location = new System.Drawing.Point(173, 82); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 13); - this.label14.TabIndex = 30; - this.label14.Text = "Lines/mm"; // // Ii_SStepSize // - this.Ii_SStepSize.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.Ii_SStepSize.Enabled = false; + resources.ApplyResources(this.Ii_SStepSize, "Ii_SStepSize"); this.Ii_SStepSize.ForcedText = null; this.Ii_SStepSize.ForceMinMax = false; - this.Ii_SStepSize.Location = new System.Drawing.Point(387, 3); this.Ii_SStepSize.MaxValue = 1000; this.Ii_SStepSize.MinValue = 0; this.Ii_SStepSize.Name = "Ii_SStepSize"; - this.Ii_SStepSize.Size = new System.Drawing.Size(49, 15); - this.Ii_SStepSize.TabIndex = 3; // // Ii_FStepSize // - this.Ii_FStepSize.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.Ii_FStepSize.Enabled = false; + resources.ApplyResources(this.Ii_FStepSize, "Ii_FStepSize"); this.Ii_FStepSize.ForcedText = null; this.Ii_FStepSize.ForceMinMax = false; - this.Ii_FStepSize.Location = new System.Drawing.Point(387, 24); this.Ii_FStepSize.MaxValue = 1000; this.Ii_FStepSize.MinValue = 0; this.Ii_FStepSize.Name = "Ii_FStepSize"; - this.Ii_FStepSize.Size = new System.Drawing.Size(49, 15); - this.Ii_FStepSize.TabIndex = 7; // // label12 // - this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label12.AutoSize = true; - this.label12.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label12.Location = new System.Drawing.Point(3, 115); + resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(28, 13); - this.label12.TabIndex = 37; - this.label12.Text = "Text"; // // label15 // - this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label15.AutoSize = true; - this.label15.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label15.Location = new System.Drawing.Point(3, 146); + resources.ApplyResources(this.label15, "label15"); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(27, 13); - this.label15.TabIndex = 32; - this.label15.Text = "Size"; // // label18 // - this.label18.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(72, 115); + resources.ApplyResources(this.label18, "label18"); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(36, 13); - this.label18.TabIndex = 38; - this.label18.Text = "speed"; // // label16 // - this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label16.AutoSize = true; - this.label16.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label16.Location = new System.Drawing.Point(93, 146); - this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + resources.ApplyResources(this.label16, "label16"); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(18, 13); - this.label16.TabIndex = 35; - this.label16.Text = "W"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Ii_Ftext // - this.Ii_Ftext.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Ftext, "Ii_Ftext"); this.Ii_Ftext.ForcedText = null; this.Ii_Ftext.ForceMinMax = false; - this.Ii_Ftext.Location = new System.Drawing.Point(114, 114); this.Ii_Ftext.MaxValue = 1000; this.Ii_Ftext.MinValue = 0; this.Ii_Ftext.Name = "Ii_Ftext"; - this.Ii_Ftext.Size = new System.Drawing.Size(49, 15); - this.Ii_Ftext.TabIndex = 39; // // IISizeW // this.IISizeW.CurrentValue = 100F; this.IISizeW.DecimalPositions = 1; this.IISizeW.ForceMinMax = false; - this.IISizeW.Location = new System.Drawing.Point(114, 146); + resources.ApplyResources(this.IISizeW, "IISizeW"); this.IISizeW.MaxValue = 1000F; this.IISizeW.MinValue = 0F; this.IISizeW.Name = "IISizeW"; - this.IISizeW.Size = new System.Drawing.Size(49, 15); - this.IISizeW.TabIndex = 12; // // label19 // - this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(173, 115); + resources.ApplyResources(this.label19, "label19"); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(27, 13); - this.label19.TabIndex = 40; - this.label19.Text = "pow"; // // label17 // - this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label17.AutoSize = true; - this.label17.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label17.Location = new System.Drawing.Point(188, 146); - this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + resources.ApplyResources(this.label17, "label17"); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(15, 13); - this.label17.TabIndex = 36; - this.label17.Text = "H"; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Ii_Stext // - this.Ii_Stext.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.Ii_Stext, "Ii_Stext"); this.Ii_Stext.ForcedText = null; this.Ii_Stext.ForceMinMax = false; - this.Ii_Stext.Location = new System.Drawing.Point(206, 114); this.Ii_Stext.MaxValue = 1000; this.Ii_Stext.MinValue = 0; this.Ii_Stext.Name = "Ii_Stext"; - this.Ii_Stext.Size = new System.Drawing.Size(49, 15); - this.Ii_Stext.TabIndex = 41; // // IISizeH // this.IISizeH.CurrentValue = 100F; this.IISizeH.DecimalPositions = 1; this.IISizeH.ForceMinMax = false; - this.IISizeH.Location = new System.Drawing.Point(206, 146); + resources.ApplyResources(this.IISizeH, "IISizeH"); this.IISizeH.MaxValue = 1000F; this.IISizeH.MinValue = 0F; this.IISizeH.Name = "IISizeH"; - this.IISizeH.Size = new System.Drawing.Size(49, 15); - this.IISizeH.TabIndex = 13; // // PhTbLabel // + this.PhTbLabel.BackColor = System.Drawing.Color.White; + this.PhTbLabel.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tableLayoutPanel3.SetColumnSpan(this.PhTbLabel, 3); - this.PhTbLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.PhTbLabel.Location = new System.Drawing.Point(299, 112); + resources.ApplyResources(this.PhTbLabel, "PhTbLabel"); + this.PhTbLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.PhTbLabel.Name = "PhTbLabel"; - this.PhTbLabel.Size = new System.Drawing.Size(137, 20); - this.PhTbLabel.TabIndex = 42; - this.PhTbLabel.WaterMark = "enter custom label"; + this.PhTbLabel.WaterMarkActiveColor = System.Drawing.Color.Gray; this.PhTbLabel.WaterMarkActiveForeColor = System.Drawing.Color.Gray; + this.PhTbLabel.WaterMarkColor = System.Drawing.Color.LightGray; this.PhTbLabel.WaterMarkFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.PhTbLabel.WaterMarkForeColor = System.Drawing.Color.LightGray; // // PowerVsSpeedForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.BtnCancel; - this.ClientSize = new System.Drawing.Size(805, 265); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PowerVsSpeedForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Power Vs Speed test generator"; this.Load += new System.EventHandler(this.GreyScaleForm_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); diff --git a/LaserGRBL/Generator/PowerVsSpeedForm.resx b/LaserGRBL/Generator/PowerVsSpeedForm.resx index b7fa89007..f3b3615ca 100644 --- a/LaserGRBL/Generator/PowerVsSpeedForm.resx +++ b/LaserGRBL/Generator/PowerVsSpeedForm.resx @@ -283,6 +283,695 @@ ouSJ5KMoSplE8lEUpUwi+SiKUgYB/h9RRkoEi9I66gAAAABJRU5ErkJggg== + + 3, 3 + + + 289, 259 + + + + AutoSize + + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + GrowAndShrink + + + 2 + + + True + + + GrowAndShrink + + + 1 + + + True + + + GrowAndShrink + + + 3 + + + NoControl + + + 341, 3 + + + 74, 27 + + + 98 + + + Cancel + + + BtnCancel + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 0 + + + NoControl + + + 421, 3 + + + 74, 27 + + + 99 + + + Create! + + + BtnCreate + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 1 + + + Fill + + + 3, 223 + + + 1 + + + 498, 33 + + + 5 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnCancel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnCreate" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + None + + + True + + + 94, 2 + + + 2, 2, 2, 2 + + + 315, 13 + + + 0 + + + Generate test map for different combinations of power and speed. + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + True + + + GrowAndShrink + + + True + + + GrowAndShrink + + + 9 + + + Fill + + + 114, 53 + + + 141, 21 + + + 8 + + + CBLaserON + + + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 0 + + + Left + + + True + + + 3, 25 + + + 53, 13 + + + 9 + + + Speed (F) + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 1 + + + Right + + + True + + + 333, 4 + + + 48, 13 + + + 7 + + + step size + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 2 + + + Left + + + 299, 3 + + + 28, 15 + + + 2 + + + Ii_Ssteps + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 3 + + + Right + + + True + + + 261, 4 + + + 32, 13 + + + 5 + + + steps + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 4 + + + Left + + + True + + + 3, 4 + + + 53, 13 + + + 0 + + + Power (S) + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 5 + + + Right + + + True + + + 81, 4 + + + 27, 13 + + + 1 + + + from + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 6 + + + Left + + + 114, 3 + + + 49, 15 + + + 0 + + + Ii_Smin + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 7 + + + Right + + + True + + + 184, 4 + + + 16, 13 + + + 3 + + + to + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 8 + + + Left + + + 206, 3 + + + 49, 15 + + + 1 + + + Ii_Smax + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 9 + + + Right + + + True + + + 81, 25 + + + 27, 13 + + + 10 + + + from + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 10 + + + Left + + + 114, 24 + + + 49, 15 + + + 4 + + + Ii_Fmin + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 11 + + + Left + + + 206, 24 + + + 49, 15 + + + 5 + + + Ii_Fmax + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 12 + + + Right + + + True + + + 184, 25 + + + 16, 13 + + + 12 + + + to + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 13 + + + Right + + + True + + + 261, 25 + + + 32, 13 + + + 14 + + + steps + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 14 + + + Left + + + 299, 24 + + + 28, 15 + + + 6 + + + Ii_Fsteps + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 15 + + + Right + + + True + + + 333, 25 + + + 48, 13 + + + 16 + + + step size + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 16 + + + Left + + + True + + + NoControl + + + 3, 57 + + + 63, 13 + + + 25 + + + Laser Mode + + + LblLaserMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 17 + + + Left + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -298,4 +987,631 @@ 2bCVq0RaJ5X9I9mIkt+LaQarb80ZCAAAAABJRU5ErkJggg== + + 261, 55 + + + 17, 17 + + + 9 + + + BtnOnOffInfo + + + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 18 + + + Left + + + True + + + NoControl + + + 3, 82 + + + 39, 13 + + + 28 + + + Quality + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 19 + + + 113, 79 + + + 2, 2, 2, 2 + + + 55, 20 + + + 10 + + + UDQuality + + + LaserGRBL.UserControls.NumericInput.NumericUpDown, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 20 + + + Left + + + True + + + NoControl + + + 173, 82 + + + 53, 13 + + + 30 + + + Lines/mm + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 21 + + + Left + + + False + + + 387, 3 + + + 49, 15 + + + 3 + + + Ii_SStepSize + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 22 + + + Left + + + False + + + 387, 24 + + + 49, 15 + + + 7 + + + Ii_FStepSize + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 23 + + + Left + + + True + + + NoControl + + + 3, 113 + + + 28, 13 + + + 37 + + + Text + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 24 + + + Left + + + True + + + NoControl + + + 3, 141 + + + 27, 13 + + + 32 + + + Size + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 25 + + + Right + + + True + + + 72, 113 + + + 36, 13 + + + 38 + + + speed + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 26 + + + Right + + + True + + + NoControl + + + 93, 141 + + + 3, 0, 0, 0 + + + 18, 13 + + + 35 + + + W + + + MiddleCenter + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 27 + + + Left + + + 114, 112 + + + 49, 15 + + + 39 + + + Ii_Ftext + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 28 + + + 114, 141 + + + 49, 15 + + + 12 + + + IISizeW + + + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 29 + + + Right + + + True + + + 173, 113 + + + 27, 13 + + + 40 + + + pow + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 30 + + + Right + + + True + + + NoControl + + + 188, 141 + + + 3, 0, 0, 0 + + + 15, 13 + + + 36 + + + H + + + MiddleCenter + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 31 + + + Left + + + 206, 112 + + + 49, 15 + + + 41 + + + Ii_Stext + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 32 + + + 206, 141 + + + 49, 15 + + + 13 + + + IISizeH + + + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 33 + + + Fill + + + 299, 112 + + + 137, 13 + + + 42 + + + enter custom label + + + PhTbLabel + + + LaserGRBL.UserControls.PlaceholderTextBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel3 + + + 34 + + + Fill + + + 3, 16 + + + 10 + + + 439, 178 + + + 0 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GbParameters + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBLaserON" Row="3" RowSpan="1" Column="2" ColumnSpan="3" /><Control Name="label7" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label6" Row="0" RowSpan="1" Column="7" ColumnSpan="1" /><Control Name="Ii_Ssteps" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="label5" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Smin" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label4" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="Ii_Smax" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="label8" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Fmin" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="Ii_Fmax" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="label9" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="label10" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="Ii_Fsteps" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="label11" Row="1" RowSpan="1" Column="7" ColumnSpan="1" /><Control Name="LblLaserMode" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnOnOffInfo" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="label13" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UDQuality" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label14" Row="4" RowSpan="1" Column="3" ColumnSpan="2" /><Control Name="Ii_SStepSize" Row="0" RowSpan="1" Column="8" ColumnSpan="1" /><Control Name="Ii_FStepSize" Row="1" RowSpan="1" Column="8" ColumnSpan="1" /><Control Name="label12" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label15" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label18" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label16" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="Ii_Ftext" Row="6" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="IISizeW" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label19" Row="6" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="label17" Row="8" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="Ii_Stext" Row="6" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="IISizeH" Row="8" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="PhTbLabel" Row="6" RowSpan="1" Column="6" ColumnSpan="3" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,8,AutoSize,0,AutoSize,0,Absolute,8,AutoSize,0,Absolute,8,Absolute,20,Absolute,20" /></TableLayoutSettings> + + + 3, 20 + + + 445, 197 + + + 1 + + + Parameters + + + GbParameters + + + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel2 + + + 2 + + + Fill + + + 298, 3 + + + 3 + + + 504, 259 + + + 1 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel4" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GbParameters" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 1 + + + 805, 265 + + + 1 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + True + + + 6, 13 + + + True + + + GrowAndShrink + + + 805, 265 + + + CenterParent + + + Power Vs Speed test generator + + + PowerVsSpeedForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/Generator/ShakeTest.Designer.cs b/LaserGRBL/Generator/ShakeTest.Designer.cs index 65b88700f..daa2ccabe 100644 --- a/LaserGRBL/Generator/ShakeTest.Designer.cs +++ b/LaserGRBL/Generator/ShakeTest.Designer.cs @@ -57,101 +57,49 @@ private void InitializeComponent() // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.White; - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; this.tableLayoutPanel5.SetRowSpan(this.pictureBox1, 4); - this.pictureBox1.Size = new System.Drawing.Size(300, 366); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // // tableLayoutPanel4 // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 3; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.BtnCancel, 1, 0); this.tableLayoutPanel4.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(309, 317); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.Size = new System.Drawing.Size(609, 52); - this.tableLayoutPanel4.TabIndex = 6; // // BtnCancel // this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCancel.Location = new System.Drawing.Point(452, 3); + resources.ApplyResources(this.BtnCancel, "BtnCancel"); this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.Size = new System.Drawing.Size(74, 27); - this.BtnCancel.TabIndex = 6; - this.BtnCancel.Text = "Cancel"; this.BtnCancel.UseVisualStyleBackColor = true; // // BtnCreate // - this.BtnCreate.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCreate.Location = new System.Drawing.Point(532, 3); + resources.ApplyResources(this.BtnCreate, "BtnCreate"); this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.Size = new System.Drawing.Size(74, 27); - this.BtnCreate.TabIndex = 7; - this.BtnCreate.Text = "Create!"; this.BtnCreate.UseVisualStyleBackColor = true; this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(310, 4); - this.label1.Margin = new System.Windows.Forms.Padding(4); - this.label1.MaximumSize = new System.Drawing.Size(600, 0); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(598, 247); - this.label1.TabIndex = 0; - this.label1.Text = resources.GetString("label1.Text"); // // tableLayoutPanel5 // - this.tableLayoutPanel5.AutoSize = true; - this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel4, 1, 3); this.tableLayoutPanel5.Controls.Add(this.label1, 1, 0); this.tableLayoutPanel5.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel6, 1, 2); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 4; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.Size = new System.Drawing.Size(921, 372); - this.tableLayoutPanel5.TabIndex = 1; // // tableLayoutPanel6 // - this.tableLayoutPanel6.AutoSize = true; - this.tableLayoutPanel6.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel6.ColumnCount = 7; - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); this.tableLayoutPanel6.Controls.Add(this.label8, 3, 0); this.tableLayoutPanel6.Controls.Add(this.label2, 0, 0); this.tableLayoutPanel6.Controls.Add(this.label3, 0, 1); @@ -164,157 +112,102 @@ private void InitializeComponent() this.tableLayoutPanel6.Controls.Add(this.CbAxis, 2, 0); this.tableLayoutPanel6.Controls.Add(this.label7, 1, 0); this.tableLayoutPanel6.Controls.Add(this.IiAxisLen, 4, 0); - this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(309, 263); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - this.tableLayoutPanel6.RowCount = 2; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.Size = new System.Drawing.Size(609, 48); - this.tableLayoutPanel6.TabIndex = 1; // // label8 // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(202, 7); + resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(40, 13); - this.label8.TabIndex = 10; - this.label8.Text = "Lenght"; // // label2 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 7); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(51, 13); - this.label2.TabIndex = 0; - this.label2.Text = "Test type"; // // label3 // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 31); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(83, 13); - this.label3.TabIndex = 1; - this.label3.Text = "Cross engraving"; // // label5 // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(92, 31); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(38, 13); - this.label5.TabIndex = 4; - this.label5.Text = "Speed"; // // IiCrossSpeed // this.IiCrossSpeed.CurrentValue = 1000; this.IiCrossSpeed.ForcedText = null; this.IiCrossSpeed.ForceMinMax = false; - this.IiCrossSpeed.Location = new System.Drawing.Point(136, 30); + resources.ApplyResources(this.IiCrossSpeed, "IiCrossSpeed"); this.IiCrossSpeed.MaxValue = 10000; this.IiCrossSpeed.MinValue = 10; this.IiCrossSpeed.Name = "IiCrossSpeed"; - this.IiCrossSpeed.Size = new System.Drawing.Size(60, 15); - this.IiCrossSpeed.TabIndex = 4; // // label4 // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(314, 7); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(60, 13); - this.label4.TabIndex = 2; - this.label4.Text = "Limit speed"; // // CbLimit // + this.CbLimit.BackColor = System.Drawing.Color.White; this.CbLimit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbLimit.ForeColor = System.Drawing.SystemColors.ControlText; this.CbLimit.FormattingEnabled = true; - this.CbLimit.Location = new System.Drawing.Point(380, 3); - this.CbLimit.MaxDropDownItems = 6; + resources.ApplyResources(this.CbLimit, "CbLimit"); this.CbLimit.Name = "CbLimit"; - this.CbLimit.Size = new System.Drawing.Size(146, 21); - this.CbLimit.TabIndex = 3; // // label6 // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(202, 31); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(37, 13); - this.label6.TabIndex = 7; - this.label6.Text = "Power"; // // IiCrossPower // this.IiCrossPower.CurrentValue = 100; this.IiCrossPower.ForcedText = null; this.IiCrossPower.ForceMinMax = false; - this.IiCrossPower.Location = new System.Drawing.Point(248, 30); + resources.ApplyResources(this.IiCrossPower, "IiCrossPower"); this.IiCrossPower.MaxValue = 1000; this.IiCrossPower.MinValue = 1; this.IiCrossPower.Name = "IiCrossPower"; - this.IiCrossPower.Size = new System.Drawing.Size(60, 15); - this.IiCrossPower.TabIndex = 5; // // CbAxis // + this.CbAxis.BackColor = System.Drawing.Color.White; this.CbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbAxis.ForeColor = System.Drawing.SystemColors.ControlText; this.CbAxis.FormattingEnabled = true; this.CbAxis.Items.AddRange(new object[] { - "X", - "Y"}); - this.CbAxis.Location = new System.Drawing.Point(136, 3); + resources.GetString("CbAxis.Items"), + resources.GetString("CbAxis.Items1")}); + resources.ApplyResources(this.CbAxis, "CbAxis"); this.CbAxis.Name = "CbAxis"; - this.CbAxis.Size = new System.Drawing.Size(60, 21); - this.CbAxis.TabIndex = 1; this.CbAxis.SelectedIndexChanged += new System.EventHandler(this.CbAxis_SelectedIndexChanged); // // label7 // - this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(92, 7); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(26, 13); - this.label7.TabIndex = 9; - this.label7.Text = "Axis"; // // IiAxisLen // - this.IiAxisLen.Anchor = System.Windows.Forms.AnchorStyles.Left; + resources.ApplyResources(this.IiAxisLen, "IiAxisLen"); this.IiAxisLen.CurrentValue = 100; this.IiAxisLen.ForcedText = null; this.IiAxisLen.ForceMinMax = false; - this.IiAxisLen.Location = new System.Drawing.Point(248, 6); this.IiAxisLen.MinValue = 50; this.IiAxisLen.Name = "IiAxisLen"; - this.IiAxisLen.Size = new System.Drawing.Size(60, 15); - this.IiAxisLen.TabIndex = 2; // // ShakeTest // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.BtnCancel; - this.ClientSize = new System.Drawing.Size(921, 372); this.Controls.Add(this.tableLayoutPanel5); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "ShakeTest"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Shake Test"; this.Load += new System.EventHandler(this.ShakeTest_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tableLayoutPanel4.ResumeLayout(false); diff --git a/LaserGRBL/Generator/ShakeTest.resx b/LaserGRBL/Generator/ShakeTest.resx index 3029fe8a5..344f55e64 100644 --- a/LaserGRBL/Generator/ShakeTest.resx +++ b/LaserGRBL/Generator/ShakeTest.resx @@ -117,6 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + @@ -352,6 +356,130 @@ 9AA1w/x0/wD/2Q== + + 3, 3 + + + + True + + + GrowAndShrink + + + 2 + + + True + + + GrowAndShrink + + + 3 + + + NoControl + + + 452, 3 + + + 74, 27 + + + 6 + + + Cancel + + + BtnCancel + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 0 + + + NoControl + + + 532, 3 + + + 74, 27 + + + 7 + + + Create! + + + BtnCreate + + + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 1 + + + Fill + + + 309, 317 + + + 1 + + + 609, 52 + + + 6 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnCancel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnCreate" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + True + + + 310, 4 + + + 4, 4, 4, 4 + + + 600, 0 + + + 598, 247 + + + 0 + This test allows you to check the reliability of your machine in performing rapid movements without position misalignments. It is a fundamental test for fine-tuning of your engraver. @@ -370,4 +498,460 @@ If your engraver is unable to complete this test successfully you will need to c If these conditions are met, but the machine is not able to perform this test successfully, you can try to slightly decrease the speed limits set in the "Grbl Configuration ($110-$111)" or maximum accelerations. + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 1 + + + True + + + GrowAndShrink + + + 7 + + + Left + + + True + + + 202, 7 + + + 40, 13 + + + 10 + + + Lenght + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 0 + + + Left + + + True + + + 3, 7 + + + 51, 13 + + + 0 + + + Test type + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 1 + + + Left + + + True + + + 3, 31 + + + 83, 13 + + + 1 + + + Cross engraving + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 2 + + + Left + + + True + + + 92, 31 + + + 38, 13 + + + 4 + + + Speed + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 3 + + + 136, 30 + + + 60, 15 + + + 4 + + + IiCrossSpeed + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel6 + + + 4 + + + Left + + + True + + + 314, 7 + + + 60, 13 + + + 2 + + + Limit speed + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 5 + + + 380, 3 + + + 6 + + + 146, 21 + + + 3 + + + CbLimit + + + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel6 + + + 6 + + + Left + + + True + + + 202, 31 + + + 37, 13 + + + 7 + + + Power + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 7 + + + 248, 30 + + + 60, 15 + + + 5 + + + IiCrossPower + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel6 + + + 8 + + + X + + + Y + + + 136, 3 + + + 60, 21 + + + 1 + + + CbAxis + + + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel6 + + + 9 + + + Left + + + True + + + 92, 7 + + + 26, 13 + + + 9 + + + Axis + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel6 + + + 10 + + + Left + + + 248, 6 + + + 60, 15 + + + 2 + + + IiAxisLen + + + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel6 + + + 11 + + + Fill + + + 309, 263 + + + 2 + + + 609, 48 + + + 1 + + + tableLayoutPanel6 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 3 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label8" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IiCrossSpeed" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label4" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="CbLimit" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="label6" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="IiCrossPower" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="CbAxis" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label7" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IiAxisLen" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 4 + + + 921, 372 + + + 1 + + + tableLayoutPanel5 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel4" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBox1" Row="0" RowSpan="4" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel6" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,Absolute,5,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + 300, 366 + + + AutoSize + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 2 + + + True + + + 6, 13 + + + True + + + GrowAndShrink + + + 921, 372 + + + CenterParent + + + Shake Test + + + ShakeTest + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/LaserGRBL.csproj b/LaserGRBL/LaserGRBL.csproj index 268adcf6f..4817352be 100644 --- a/LaserGRBL/LaserGRBL.csproj +++ b/LaserGRBL/LaserGRBL.csproj @@ -1051,12 +1051,21 @@ DiscoveryForm.cs + + NewVersionForm.cs + NewVersionForm.cs + + NewVersionForm.cs + NewVersionForm.cs + + ConnectLogForm.cs + ConnectLogForm.cs @@ -1066,6 +1075,9 @@ ConnectLogForm.cs + + CustomButtonForm.cs + CustomButtonForm.cs @@ -1078,6 +1090,9 @@ CustomButtonForm.cs + + ExceptionManager.cs + ExceptionManager.cs @@ -1087,27 +1102,81 @@ PowerVsSpeedForm.cs + + ShakeTest.cs + + + ShakeTest.cs + ShakeTest.cs + + GrblConfig.cs + GrblConfig.cs + + HotkeyManagerForm.cs + HotkeyManagerForm.cs + + IssueDetectorForm.cs + IssueDetectorForm.cs + + LaserLifeEdit.cs + LaserLifeEdit.cs LaserSelector.cs + + LaserUsage.cs + LaserUsage.cs + + LegalDisclaimer.cs + + + LegalDisclaimer.cs + + + MainForm.cs + + + ConvertSizeAndOptionForm.cs + + + RasterToLaserForm.cs + + + ResolutionHelperForm.cs + + + ResumeJobForm.cs + + + RunFromPositionForm.cs + + + SaveOptionForm.cs + + + SettingsForm.cs + + + ConvertSizeAndOptionForm.cs + GrblPanel3D.cs @@ -1291,15 +1360,27 @@ OrturWiFiConfig.cs + + OrturWiFiConfigPrompt.cs + + + OrturWiFiConfigPrompt.cs + OrturWiFiConfigPrompt.cs DiscoveryForm.cs + + DiscoveryForm.cs + DiscoveryForm.cs + + DiscoveryForm.cs + DiscoveryForm.cs diff --git a/LaserGRBL/LaserLifeEdit.Designer.cs b/LaserGRBL/LaserLifeEdit.Designer.cs index ff0149d7d..87c10ac2d 100644 --- a/LaserGRBL/LaserLifeEdit.Designer.cs +++ b/LaserGRBL/LaserLifeEdit.Designer.cs @@ -31,53 +31,42 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LaserLifeEdit)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.TbModel = new System.Windows.Forms.TextBox(); + this.TbLaserName = new System.Windows.Forms.TextBox(); this.TbBrand = new System.Windows.Forms.TextBox(); + this.TbModel = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.DiPower = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.label6 = new System.Windows.Forms.Label(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.label7 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.TbLaserName = new System.Windows.Forms.TextBox(); this.DtpPurchaseDate = new System.Windows.Forms.DateTimePicker(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.label6 = new System.Windows.Forms.Label(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.BtnCancel = new System.Windows.Forms.Button(); this.BtnSave = new System.Windows.Forms.Button(); - this.DiPower = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.tableLayoutPanel4.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 0); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 0, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(459, 457); - this.tableLayoutPanel1.TabIndex = 0; // // tableLayoutPanel2 // - this.tableLayoutPanel2.ColumnCount = 2; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.TbLaserName, 1, 0); this.tableLayoutPanel2.Controls.Add(this.TbBrand, 1, 1); this.tableLayoutPanel2.Controls.Add(this.TbModel, 1, 2); @@ -89,251 +78,137 @@ private void InitializeComponent() this.tableLayoutPanel2.Controls.Add(this.label3, 0, 1); this.tableLayoutPanel2.Controls.Add(this.label4, 0, 2); this.tableLayoutPanel2.Controls.Add(this.label5, 0, 3); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 6; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 114F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(453, 397); - this.tableLayoutPanel2.TabIndex = 0; // - // TbModel + // TbLaserName // - this.TbModel.Dock = System.Windows.Forms.DockStyle.Fill; - this.TbModel.Location = new System.Drawing.Point(250, 55); - this.TbModel.Name = "TbModel"; - this.TbModel.Size = new System.Drawing.Size(200, 20); - this.TbModel.TabIndex = 2; + resources.ApplyResources(this.TbLaserName, "TbLaserName"); + this.TbLaserName.Name = "TbLaserName"; + this.TbLaserName.TextChanged += new System.EventHandler(this.TbLaserName_TextChanged); // // TbBrand // - this.TbBrand.Dock = System.Windows.Forms.DockStyle.Fill; - this.TbBrand.Location = new System.Drawing.Point(250, 29); + resources.ApplyResources(this.TbBrand, "TbBrand"); this.TbBrand.Name = "TbBrand"; - this.TbBrand.Size = new System.Drawing.Size(200, 20); - this.TbBrand.TabIndex = 1; + // + // TbModel + // + resources.ApplyResources(this.TbModel, "TbModel"); + this.TbModel.Name = "TbModel"; + // + // tableLayoutPanel4 + // + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.DiPower, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.label6, 1, 0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // + // DiPower + // + this.DiPower.CurrentValue = 0F; + this.DiPower.ForceMinMax = false; + resources.ApplyResources(this.DiPower, "DiPower"); + this.DiPower.MaxValue = 100F; + this.DiPower.MinValue = -100F; + this.DiPower.Name = "DiPower"; + this.DiPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.DiPower_CurrentValueChanged); + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; // // tableLayoutPanel5 // - this.tableLayoutPanel5.ColumnCount = 2; + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); this.tableLayoutPanel2.SetColumnSpan(this.tableLayoutPanel5, 2); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel5.Controls.Add(this.label7, 1, 0); this.tableLayoutPanel5.Controls.Add(this.pictureBox1, 0, 0); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 134); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 1; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(447, 260); - this.tableLayoutPanel5.TabIndex = 22; // // label7 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(167, 6); - this.label7.Margin = new System.Windows.Forms.Padding(3, 6, 3, 0); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(276, 234); - this.label7.TabIndex = 12; - this.label7.Text = resources.GetString("label7.Text"); // // pictureBox1 // - this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(158, 254); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 11; this.pictureBox1.TabStop = false; // // label1 // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 6); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Name"; // // label2 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 111); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(78, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Purchase Date"; - // - // TbLaserName - // - this.TbLaserName.Dock = System.Windows.Forms.DockStyle.Fill; - this.TbLaserName.Location = new System.Drawing.Point(250, 3); - this.TbLaserName.Name = "TbLaserName"; - this.TbLaserName.Size = new System.Drawing.Size(200, 20); - this.TbLaserName.TabIndex = 0; - this.TbLaserName.TextChanged += new System.EventHandler(this.TbLaserName_TextChanged); // // DtpPurchaseDate // - this.DtpPurchaseDate.Dock = System.Windows.Forms.DockStyle.Fill; - this.DtpPurchaseDate.Location = new System.Drawing.Point(250, 108); + resources.ApplyResources(this.DtpPurchaseDate, "DtpPurchaseDate"); this.DtpPurchaseDate.Name = "DtpPurchaseDate"; - this.DtpPurchaseDate.Size = new System.Drawing.Size(200, 20); - this.DtpPurchaseDate.TabIndex = 4; // // label3 // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 32); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(35, 13); - this.label3.TabIndex = 4; - this.label3.Text = "Brand"; // // label4 // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 58); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(36, 13); - this.label4.TabIndex = 5; - this.label4.Text = "Model"; // // label5 // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(3, 85); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(73, 13); - this.label5.TabIndex = 6; - this.label5.Text = "Optical Power"; - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 2; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.Controls.Add(this.DiPower, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.label6, 1, 0); - this.tableLayoutPanel4.Location = new System.Drawing.Point(250, 81); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(109, 21); - this.tableLayoutPanel4.TabIndex = 10; - // - // label6 - // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(88, 4); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(18, 13); - this.label6.TabIndex = 10; - this.label6.Text = "W"; // // tableLayoutPanel3 // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 3; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Controls.Add(this.BtnCancel, 1, 0); this.tableLayoutPanel3.Controls.Add(this.BtnSave, 2, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 406); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.Size = new System.Drawing.Size(453, 48); - this.tableLayoutPanel3.TabIndex = 1; // // BtnCancel // this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.BtnCancel.Image = ((System.Drawing.Image)(resources.GetObject("BtnCancel.Image"))); - this.BtnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnCancel.Location = new System.Drawing.Point(243, 3); + resources.ApplyResources(this.BtnCancel, "BtnCancel"); this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.Size = new System.Drawing.Size(107, 42); - this.BtnCancel.TabIndex = 5; - this.BtnCancel.Text = "Cancel"; - this.BtnCancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnCancel.UseVisualStyleBackColor = true; // // BtnSave // - this.BtnSave.AutoSize = true; - this.BtnSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.BtnSave, "BtnSave"); this.BtnSave.DialogResult = System.Windows.Forms.DialogResult.OK; - this.BtnSave.Image = ((System.Drawing.Image)(resources.GetObject("BtnSave.Image"))); - this.BtnSave.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnSave.Location = new System.Drawing.Point(356, 3); this.BtnSave.Name = "BtnSave"; - this.BtnSave.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2); - this.BtnSave.Size = new System.Drawing.Size(94, 42); - this.BtnSave.TabIndex = 6; - this.BtnSave.Text = "Save"; - this.BtnSave.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnSave.UseVisualStyleBackColor = true; this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click); // - // DiPower - // - this.DiPower.CurrentValue = 0F; - this.DiPower.ForceMinMax = false; - this.DiPower.Location = new System.Drawing.Point(3, 3); - this.DiPower.MaxValue = 100F; - this.DiPower.MinValue = -100F; - this.DiPower.Name = "DiPower"; - this.DiPower.Size = new System.Drawing.Size(79, 15); - this.DiPower.TabIndex = 3; - this.DiPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.DiPower_CurrentValueChanged); - // // LaserLifeEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.BtnCancel; - this.ClientSize = new System.Drawing.Size(459, 457); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "LaserLifeEdit"; this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Edit Laser"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); this.tableLayoutPanel5.ResumeLayout(false); this.tableLayoutPanel5.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel3.PerformLayout(); this.ResumeLayout(false); diff --git a/LaserGRBL/LaserLifeEdit.resx b/LaserGRBL/LaserLifeEdit.resx index 9ba039bf3..f5cc4aaa1 100644 --- a/LaserGRBL/LaserLifeEdit.resx +++ b/LaserGRBL/LaserLifeEdit.resx @@ -117,6 +117,192 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + 2 + + + + Fill + + + + 250, 3 + + + 200, 20 + + + 0 + + + TbLaserName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + Fill + + + 250, 29 + + + 200, 20 + + + 1 + + + TbBrand + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + Fill + + + 250, 55 + + + 200, 20 + + + 2 + + + TbModel + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 2 + + + True + + + GrowAndShrink + + + 2 + + + 3, 3 + + + 79, 15 + + + 3 + + + DiPower + + + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 0 + + + Left + + + True + + + 88, 4 + + + 18, 13 + + + 10 + + + W + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + 250, 81 + + + 1 + + + 109, 21 + + + 10 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 3 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="DiPower" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label6" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,AutoSize,0" /><Rows Styles="AutoSize,0,Absolute,21" /></TableLayoutSettings> + + + 2 + + + True + + + 167, 6 + + + 3, 6, 3, 0 + + + 276, 234 + + + 12 + Name: A brief quick name for you, just to identify this module quickly. @@ -128,7 +314,21 @@ Optical Power: The optical power of the laser module expressed in W (watt). Some Most laser modules have a label with this information. If not, please refer to engraver specification in user manual or manifacturer website. - + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 0 + + + Top + iVBORw0KGgoAAAANSUhEUgAAAJ4AAAEECAYAAADZD43qAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1707,6 +1907,273 @@ Most laser modules have a label with this information. If not, please refer to e qbkDAAAAAElFTkSuQmCC + + 3, 3 + + + 158, 254 + + + AutoSize + + + 11 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 1 + + + Fill + + + 3, 134 + + + 1 + + + 447, 260 + + + 22 + + + tableLayoutPanel5 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 4 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label7" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,50" /><Rows Styles="Percent,50,Absolute,260" /></TableLayoutSettings> + + + Left + + + True + + + 3, 6 + + + 35, 13 + + + 0 + + + Name + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 5 + + + Left + + + True + + + 3, 111 + + + 78, 13 + + + 1 + + + Purchase Date + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 6 + + + Fill + + + 250, 108 + + + 200, 20 + + + 4 + + + DtpPurchaseDate + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 7 + + + Left + + + True + + + 3, 32 + + + 35, 13 + + + 4 + + + Brand + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 8 + + + Left + + + True + + + 3, 58 + + + 36, 13 + + + 5 + + + Model + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 9 + + + Left + + + True + + + 3, 85 + + + 73, 13 + + + 6 + + + Optical Power + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 10 + + + Fill + + + 3, 3 + + + 6 + + + 453, 397 + + + 0 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="TbLaserName" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="TbBrand" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="TbModel" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutPanel4" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutPanel5" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DtpPurchaseDate" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label4" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0,Absolute,20" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,114,Absolute,20" /></TableLayoutSettings> + + + True + + + GrowAndShrink + + + 3 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -1751,6 +2218,42 @@ Most laser modules have a label with this information. If not, please refer to e 6XB1fqwv68+M0TeqPrMJmG6zAX/LWNgMqKoBgMb/ABKeL43Qvc1XAAAAAElFTkSuQmCC + + NoControl + + + 243, 3 + + + 107, 42 + + + 5 + + + Cancel + + + ImageBeforeText + + + BtnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 0 + + + True + + + GrowAndShrink + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABF0RVh0U29m @@ -1773,4 +2276,118 @@ Most laser modules have a label with this information. If not, please refer to e AABJRU5ErkJggg== + + NoControl + + + 356, 3 + + + 10, 2, 10, 2 + + + 94, 42 + + + 6 + + + Save + + + ImageBeforeText + + + BtnSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 1 + + + Fill + + + 3, 406 + + + 1 + + + 453, 48 + + + 1 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnCancel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnSave" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,33333,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 2 + + + 459, 457 + + + 0 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,AutoSize,0" /></TableLayoutSettings> + + + True + + + 6, 13 + + + 459, 457 + + + CenterParent + + + Edit Laser + + + LaserLifeEdit + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/LaserUsage.Designer.cs b/LaserGRBL/LaserUsage.Designer.cs index 8da10a4ce..e64ee5d1f 100644 --- a/LaserGRBL/LaserUsage.Designer.cs +++ b/LaserGRBL/LaserUsage.Designer.cs @@ -40,6 +40,7 @@ private void InitializeComponent() this.BtnEdit = new System.Windows.Forms.Button(); this.BtnRemove = new System.Windows.Forms.Button(); this.BtnAddNew = new System.Windows.Forms.Button(); + this.Preview = new LaserGRBL.UserControls.UsageClassPreview(); this.LVLasers = new System.Windows.Forms.ListView(); this.ChName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ChBrand = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -54,7 +55,6 @@ private void InitializeComponent() this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.label2 = new System.Windows.Forms.Label(); this.BtnClose = new System.Windows.Forms.Button(); - this.Preview = new LaserGRBL.UserControls.UsageClassPreview(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -65,196 +65,89 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 0); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 0, 1); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel5, 0, 2); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1018, 470); - this.tableLayoutPanel1.TabIndex = 0; // // tableLayoutPanel2 // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 2; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1012, 63); - this.tableLayoutPanel2.TabIndex = 0; // // pictureBox1 // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(64, 57); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // // label1 // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(73, 18); - this.label1.Margin = new System.Windows.Forms.Padding(3); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(925, 26); - this.label1.TabIndex = 1; - this.label1.Text = resources.GetString("label1.Text"); // // tableLayoutPanel3 // - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 69.64029F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 1, 0); this.tableLayoutPanel3.Controls.Add(this.LVLasers, 0, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 72); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1012, 341); - this.tableLayoutPanel3.TabIndex = 0; // // tableLayoutPanel4 // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 1; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.BtnUnmark, 0, 4); this.tableLayoutPanel4.Controls.Add(this.BtnMark, 0, 3); this.tableLayoutPanel4.Controls.Add(this.BtnEdit, 0, 0); this.tableLayoutPanel4.Controls.Add(this.BtnRemove, 0, 2); this.tableLayoutPanel4.Controls.Add(this.BtnAddNew, 0, 1); this.tableLayoutPanel4.Controls.Add(this.Preview, 0, 6); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(889, 3); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 7; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(120, 335); - this.tableLayoutPanel4.TabIndex = 0; // // BtnUnmark // - this.BtnUnmark.AutoSize = true; - this.BtnUnmark.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnUnmark.Dock = System.Windows.Forms.DockStyle.Fill; - this.BtnUnmark.Image = ((System.Drawing.Image)(resources.GetObject("BtnUnmark.Image"))); - this.BtnUnmark.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnUnmark.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnUnmark.Location = new System.Drawing.Point(3, 155); + resources.ApplyResources(this.BtnUnmark, "BtnUnmark"); this.BtnUnmark.Name = "BtnUnmark"; - this.BtnUnmark.Padding = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.BtnUnmark.Size = new System.Drawing.Size(114, 32); - this.BtnUnmark.TabIndex = 5; - this.BtnUnmark.Text = "Unmark dead"; - this.BtnUnmark.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnUnmark.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnUnmark.UseVisualStyleBackColor = true; - this.BtnUnmark.Visible = false; this.BtnUnmark.Click += new System.EventHandler(this.BtnUnmark_Click); // // BtnMark // - this.BtnMark.AutoSize = true; - this.BtnMark.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnMark.Dock = System.Windows.Forms.DockStyle.Fill; - this.BtnMark.Image = ((System.Drawing.Image)(resources.GetObject("BtnMark.Image"))); - this.BtnMark.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnMark.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnMark.Location = new System.Drawing.Point(3, 117); + resources.ApplyResources(this.BtnMark, "BtnMark"); this.BtnMark.Name = "BtnMark"; - this.BtnMark.Padding = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.BtnMark.Size = new System.Drawing.Size(114, 32); - this.BtnMark.TabIndex = 4; - this.BtnMark.Text = "Mark as dead"; - this.BtnMark.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnMark.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnMark.UseVisualStyleBackColor = true; this.BtnMark.Click += new System.EventHandler(this.BtnMark_Click); // // BtnEdit // - this.BtnEdit.AutoSize = true; - this.BtnEdit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnEdit.Dock = System.Windows.Forms.DockStyle.Fill; - this.BtnEdit.Image = ((System.Drawing.Image)(resources.GetObject("BtnEdit.Image"))); - this.BtnEdit.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnEdit.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnEdit.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.BtnEdit, "BtnEdit"); this.BtnEdit.Name = "BtnEdit"; - this.BtnEdit.Padding = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.BtnEdit.Size = new System.Drawing.Size(114, 32); - this.BtnEdit.TabIndex = 1; - this.BtnEdit.Text = "Edit"; - this.BtnEdit.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnEdit.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnEdit.UseVisualStyleBackColor = true; this.BtnEdit.Click += new System.EventHandler(this.BtnEdit_Click); // // BtnRemove // - this.BtnRemove.AutoSize = true; - this.BtnRemove.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnRemove.Dock = System.Windows.Forms.DockStyle.Fill; - this.BtnRemove.Image = ((System.Drawing.Image)(resources.GetObject("BtnRemove.Image"))); - this.BtnRemove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnRemove.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnRemove.Location = new System.Drawing.Point(3, 79); + resources.ApplyResources(this.BtnRemove, "BtnRemove"); this.BtnRemove.Name = "BtnRemove"; - this.BtnRemove.Padding = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.BtnRemove.Size = new System.Drawing.Size(114, 32); - this.BtnRemove.TabIndex = 3; - this.BtnRemove.Text = "Remove"; - this.BtnRemove.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnRemove.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnRemove.UseVisualStyleBackColor = true; this.BtnRemove.Click += new System.EventHandler(this.BtnRemove_Click); // // BtnAddNew // - this.BtnAddNew.AutoSize = true; - this.BtnAddNew.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnAddNew.Dock = System.Windows.Forms.DockStyle.Fill; - this.BtnAddNew.Image = ((System.Drawing.Image)(resources.GetObject("BtnAddNew.Image"))); - this.BtnAddNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnAddNew.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnAddNew.Location = new System.Drawing.Point(3, 41); + resources.ApplyResources(this.BtnAddNew, "BtnAddNew"); this.BtnAddNew.Name = "BtnAddNew"; - this.BtnAddNew.Padding = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.BtnAddNew.Size = new System.Drawing.Size(114, 32); - this.BtnAddNew.TabIndex = 2; - this.BtnAddNew.Text = "Add"; - this.BtnAddNew.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnAddNew.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnAddNew.UseVisualStyleBackColor = true; this.BtnAddNew.Click += new System.EventHandler(this.BtnAddNew_Click); // + // Preview + // + resources.ApplyResources(this.Preview, "Preview"); + this.Preview.LifeCounter = null; + this.Preview.Name = "Preview"; + // // LVLasers // this.LVLasers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -268,14 +161,11 @@ private void InitializeComponent() this.ChDateBuy, this.ChDateStartM, this.ChDateEndL}); - this.LVLasers.Dock = System.Windows.Forms.DockStyle.Fill; + resources.ApplyResources(this.LVLasers, "LVLasers"); this.LVLasers.FullRowSelect = true; this.LVLasers.GridLines = true; this.LVLasers.HideSelection = false; - this.LVLasers.Location = new System.Drawing.Point(3, 3); this.LVLasers.Name = "LVLasers"; - this.LVLasers.Size = new System.Drawing.Size(880, 335); - this.LVLasers.TabIndex = 0; this.LVLasers.UseCompatibleStateImageBehavior = false; this.LVLasers.View = System.Windows.Forms.View.Details; this.LVLasers.SelectedIndexChanged += new System.EventHandler(this.LVLasers_SelectedIndexChanged); @@ -283,125 +173,73 @@ private void InitializeComponent() // // ChName // - this.ChName.Text = "Name"; - this.ChName.Width = 80; + resources.ApplyResources(this.ChName, "ChName"); // // ChBrand // - this.ChBrand.Text = "Brand"; - this.ChBrand.Width = 80; + resources.ApplyResources(this.ChBrand, "ChBrand"); // // ChModel // - this.ChModel.Text = "Model"; - this.ChModel.Width = 80; + resources.ApplyResources(this.ChModel, "ChModel"); // // ChRunTime // - this.ChRunTime.Text = "Run Time"; - this.ChRunTime.Width = 80; + resources.ApplyResources(this.ChRunTime, "ChRunTime"); // // ChPowerTime // - this.ChPowerTime.Text = "Power Time"; - this.ChPowerTime.Width = 80; + resources.ApplyResources(this.ChPowerTime, "ChPowerTime"); // // ChStressTime // - this.ChStressTime.Text = "Stress Time"; - this.ChStressTime.Width = 80; + resources.ApplyResources(this.ChStressTime, "ChStressTime"); // // ChAvgPow // - this.ChAvgPow.Text = "Avg Pow"; - this.ChAvgPow.Width = 80; + resources.ApplyResources(this.ChAvgPow, "ChAvgPow"); // // ChDateBuy // - this.ChDateBuy.Text = "Purchase Date"; - this.ChDateBuy.Width = 90; + resources.ApplyResources(this.ChDateBuy, "ChDateBuy"); // // ChDateStartM // - this.ChDateStartM.Text = "Monitoring Start"; - this.ChDateStartM.Width = 90; + resources.ApplyResources(this.ChDateStartM, "ChDateStartM"); // // ChDateEndL // - this.ChDateEndL.Text = "Death Date"; - this.ChDateEndL.Width = 90; + resources.ApplyResources(this.ChDateEndL, "ChDateEndL"); // // tableLayoutPanel5 // - this.tableLayoutPanel5.AutoSize = true; - this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); this.tableLayoutPanel5.Controls.Add(this.label2, 0, 0); this.tableLayoutPanel5.Controls.Add(this.BtnClose, 1, 0); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 419); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 1; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.Size = new System.Drawing.Size(1012, 48); - this.tableLayoutPanel5.TabIndex = 1; // // label2 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 17); - this.label2.Margin = new System.Windows.Forms.Padding(3); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(373, 13); - this.label2.TabIndex = 8; - this.label2.Text = "Please click on \"edit\" and fill in all the information related to your laser modu" + - "le."; // // BtnClose // - this.BtnClose.AutoSize = true; - this.BtnClose.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.BtnClose.Image = ((System.Drawing.Image)(resources.GetObject("BtnClose.Image"))); - this.BtnClose.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BtnClose.Location = new System.Drawing.Point(914, 3); + resources.ApplyResources(this.BtnClose, "BtnClose"); this.BtnClose.Name = "BtnClose"; - this.BtnClose.Padding = new System.Windows.Forms.Padding(10, 2, 10, 2); - this.BtnClose.Size = new System.Drawing.Size(95, 42); - this.BtnClose.TabIndex = 6; - this.BtnClose.Text = "Close"; - this.BtnClose.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.BtnClose.UseVisualStyleBackColor = true; this.BtnClose.Click += new System.EventHandler(this.BtnClose_Click); // - // Preview - // - this.Preview.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.Preview.LifeCounter = null; - this.Preview.Location = new System.Drawing.Point(3, 198); - this.Preview.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0); - this.Preview.Name = "Preview"; - this.Preview.Size = new System.Drawing.Size(114, 137); - this.Preview.TabIndex = 7; - // // LaserUsage // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1018, 470); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "LaserUsage"; this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Laser Lifespan - Monitoring Tool"; this.Load += new System.EventHandler(this.LaserUsage_Load); this.Shown += new System.EventHandler(this.LaserUsage_Shown); this.tableLayoutPanel1.ResumeLayout(false); diff --git a/LaserGRBL/LaserUsage.resx b/LaserGRBL/LaserUsage.resx index 8e0b75f69..c71ee94fb 100644 --- a/LaserGRBL/LaserUsage.resx +++ b/LaserGRBL/LaserUsage.resx @@ -117,6 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + True + + + + GrowAndShrink + + + 2 + @@ -228,9 +242,114 @@ AElFTkSuQmCC + + 3, 3 + + + 64, 57 + + + AutoSize + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + Left + + + True + + + 73, 18 + + + 3, 3, 3, 3 + + + 925, 26 + + + 1 + LaserGRBL tracks the useful life of your lasers, to let you know how much each laser module has been used. If you have more than one machine or laser module you can add them with the "add" button. In this case LaserGRBL will ask you which laser you are using at the time of connection, so as to assign consumption to the right module each time. + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + Fill + + + 3, 3 + + + 1 + + + 1012, 63 + + + 0 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + 2 + + + True + + + GrowAndShrink + + + 1 + + + True + + + GrowAndShrink + + + Fill + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH @@ -302,6 +421,57 @@ RK5CYII= + + MiddleLeft + + + NoControl + + + 3, 155 + + + 5, 2, 5, 2 + + + 114, 32 + + + 5 + + + Unmark dead + + + MiddleLeft + + + ImageBeforeText + + + False + + + BtnUnmark + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + True + + + GrowAndShrink + + + Fill + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAABKtJREFUSEu1 @@ -328,6 +498,54 @@ SUVORK5CYII= + + MiddleLeft + + + NoControl + + + 3, 117 + + + 5, 2, 5, 2 + + + 114, 32 + + + 4 + + + Mark as dead + + + MiddleLeft + + + ImageBeforeText + + + BtnMark + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + True + + + GrowAndShrink + + + Fill + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAABBtJREFUSEt9 @@ -351,6 +569,54 @@ r0W5Tver+lv+47yk9vb2PuMD/MAjItk/lee+hpj4YXoAAAAASUVORK5CYII= + + MiddleLeft + + + NoControl + + + 3, 3 + + + 5, 2, 5, 2 + + + 114, 32 + + + 1 + + + Edit + + + MiddleLeft + + + ImageBeforeText + + + BtnEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + True + + + GrowAndShrink + + + Fill + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAABSJJREFUSEuF @@ -379,6 +645,54 @@ RU5ErkJggg== + + MiddleLeft + + + NoControl + + + 3, 79 + + + 5, 2, 5, 2 + + + 114, 32 + + + 3 + + + Remove + + + MiddleLeft + + + ImageBeforeText + + + BtnRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 3 + + + True + + + GrowAndShrink + + + Fill + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAABRlJREFUSEu1 @@ -406,6 +720,264 @@ 4mKWQCBwIXItKioa+4xcaUY7IpHIuaKiwkmlUo1pa2uzswAwfwHiTPaRcE9GLAAAAABJRU5ErkJggg== + + MiddleLeft + + + NoControl + + + 3, 41 + + + 5, 2, 5, 2 + + + 114, 32 + + + 2 + + + Add + + + MiddleLeft + + + ImageBeforeText + + + BtnAddNew + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 4 + + + Top, Bottom, Left, Right + + + 3, 198 + + + 3, 3, 3, 0 + + + 114, 137 + + + 7 + + + Preview + + + LaserGRBL.UserControls.UsageClassPreview, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel4 + + + 5 + + + Fill + + + 889, 3 + + + 7 + + + 120, 335 + + + 0 + + + tableLayoutPanel4 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnUnmark" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnMark" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnEdit" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnRemove" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnAddNew" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="Preview" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,5,Percent,100" /></TableLayoutSettings> + + + Name + + + 80 + + + Brand + + + 80 + + + Model + + + 80 + + + Run Time + + + 80 + + + Power Time + + + 80 + + + Stress Time + + + 80 + + + Avg Pow + + + 80 + + + Purchase Date + + + 90 + + + Monitoring Start + + + 90 + + + Death Date + + + 90 + + + Fill + + + 3, 3 + + + 880, 335 + + + 0 + + + LVLasers + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 1 + + + Fill + + + 3, 72 + + + 1 + + + 1012, 341 + + + 0 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel4" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="LVLasers" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,69,64029,AutoSize,0" /><Rows Styles="Percent,50" /></TableLayoutSettings> + + + True + + + GrowAndShrink + + + 2 + + + Left + + + True + + + 3, 17 + + + 3, 3, 3, 3 + + + 373, 13 + + + 8 + + + Please click on "edit" and fill in all the information related to your laser module. + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 0 + + + True + + + GrowAndShrink + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABF0RVh0U29m @@ -428,6 +1000,108 @@ AABJRU5ErkJggg== + + NoControl + + + 914, 3 + + + 10, 2, 10, 2 + + + 95, 42 + + + 6 + + + Close + + + ImageBeforeText + + + BtnClose + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel5 + + + 1 + + + Fill + + + 3, 419 + + + 1 + + + 1012, 48 + + + 1 + + + tableLayoutPanel5 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnClose" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + Fill + + + 0, 0 + + + 3 + + + 1018, 470 + + + 0 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel5" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0" /></TableLayoutSettings> + + + True + + + 6, 13 + + + 1018, 470 + AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA @@ -877,4 +1551,76 @@ P/4B/wAA//H/////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA + + CenterParent + + + Laser Lifespan - Monitoring Tool + + + ChName + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChBrand + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChModel + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChRunTime + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChPowerTime + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChStressTime + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChAvgPow + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChDateBuy + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChDateStartM + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChDateEndL + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LaserUsage + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/LegalDisclaimer.Designer.cs b/LaserGRBL/LegalDisclaimer.Designer.cs index 6b9bab6db..6972130ea 100644 --- a/LaserGRBL/LegalDisclaimer.Designer.cs +++ b/LaserGRBL/LegalDisclaimer.Designer.cs @@ -45,147 +45,75 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.LblFree, 0, 1); this.tableLayoutPanel1.Controls.Add(this.LblNotToy, 1, 0); this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.LblHaveFun, 1, 2); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 3); this.tableLayoutPanel1.Controls.Add(this.LlTranslate, 0, 2); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 4; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(683, 313); - this.tableLayoutPanel1.TabIndex = 0; // // LblFree // - this.LblFree.AutoSize = true; + resources.ApplyResources(this.LblFree, "LblFree"); this.tableLayoutPanel1.SetColumnSpan(this.LblFree, 2); - this.LblFree.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblFree.Location = new System.Drawing.Point(5, 139); - this.LblFree.Margin = new System.Windows.Forms.Padding(5); this.LblFree.Name = "LblFree"; - this.LblFree.Padding = new System.Windows.Forms.Padding(5); - this.LblFree.Size = new System.Drawing.Size(659, 74); - this.LblFree.TabIndex = 3; - this.LblFree.Text = resources.GetString("LblFree.Text"); // // LblNotToy // - this.LblNotToy.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LblNotToy.AutoSize = true; - this.LblNotToy.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblNotToy.Location = new System.Drawing.Point(139, 6); - this.LblNotToy.Margin = new System.Windows.Forms.Padding(5); + resources.ApplyResources(this.LblNotToy, "LblNotToy"); this.LblNotToy.Name = "LblNotToy"; - this.LblNotToy.Padding = new System.Windows.Forms.Padding(5); - this.LblNotToy.Size = new System.Drawing.Size(457, 122); - this.LblNotToy.TabIndex = 2; - this.LblNotToy.Text = resources.GetString("LblNotToy.Text"); // // pictureBox1 // - this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(128, 128); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; // // LblHaveFun // - this.LblHaveFun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.LblHaveFun.AutoSize = true; - this.LblHaveFun.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LblHaveFun.Location = new System.Drawing.Point(562, 223); - this.LblHaveFun.Margin = new System.Windows.Forms.Padding(5); + resources.ApplyResources(this.LblHaveFun, "LblHaveFun"); this.LblHaveFun.Name = "LblHaveFun"; - this.LblHaveFun.Padding = new System.Windows.Forms.Padding(5); - this.LblHaveFun.Size = new System.Drawing.Size(116, 26); - this.LblHaveFun.TabIndex = 4; - this.LblHaveFun.Text = "Have fun, safely!"; // // tableLayoutPanel2 // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 2; + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel1.SetColumnSpan(this.tableLayoutPanel2, 2); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel2.Controls.Add(this.BtnAccept, 1, 0); this.tableLayoutPanel2.Controls.Add(this.CbIHaveRead, 0, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 257); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(677, 53); - this.tableLayoutPanel2.TabIndex = 7; // // BtnAccept // - this.BtnAccept.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.BtnAccept.Enabled = false; - this.BtnAccept.Location = new System.Drawing.Point(578, 7); + resources.ApplyResources(this.BtnAccept, "BtnAccept"); this.BtnAccept.Name = "BtnAccept"; - this.BtnAccept.Size = new System.Drawing.Size(96, 39); - this.BtnAccept.TabIndex = 6; - this.BtnAccept.Text = "Accept"; this.BtnAccept.UseVisualStyleBackColor = true; this.BtnAccept.Click += new System.EventHandler(this.BtnAccept_Click); // // CbIHaveRead // - this.CbIHaveRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CbIHaveRead.AutoSize = true; - this.CbIHaveRead.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.CbIHaveRead.Location = new System.Drawing.Point(3, 20); + resources.ApplyResources(this.CbIHaveRead, "CbIHaveRead"); this.CbIHaveRead.Name = "CbIHaveRead"; - this.CbIHaveRead.Padding = new System.Windows.Forms.Padding(5); - this.CbIHaveRead.Size = new System.Drawing.Size(411, 30); - this.CbIHaveRead.TabIndex = 5; - this.CbIHaveRead.Text = "I have read, understood, and I accept these conditions"; this.CbIHaveRead.UseVisualStyleBackColor = true; this.CbIHaveRead.CheckedChanged += new System.EventHandler(this.CbIHaveRead_CheckedChanged); // // LlTranslate // - this.LlTranslate.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.LlTranslate.AutoSize = true; - this.LlTranslate.Location = new System.Drawing.Point(5, 224); - this.LlTranslate.Margin = new System.Windows.Forms.Padding(5); + resources.ApplyResources(this.LlTranslate, "LlTranslate"); this.LlTranslate.Name = "LlTranslate"; - this.LlTranslate.Padding = new System.Windows.Forms.Padding(5); - this.LlTranslate.Size = new System.Drawing.Size(92, 23); - this.LlTranslate.TabIndex = 8; this.LlTranslate.TabStop = true; - this.LlTranslate.Text = "google translate"; this.LlTranslate.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LlTranslate_LinkClicked); // // LegalDisclaimer // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(683, 313); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "LegalDisclaimer"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Legal Disclaimer"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/LaserGRBL/LegalDisclaimer.resx b/LaserGRBL/LegalDisclaimer.resx index d5eb0ffe3..86a7fb04f 100644 --- a/LaserGRBL/LegalDisclaimer.resx +++ b/LaserGRBL/LegalDisclaimer.resx @@ -117,9 +117,72 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + True + + + + Microsoft Sans Serif, 9.75pt + + + 5, 139 + + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 659, 74 + + + 3 + LaserGRBL is a free software distributed without warranties and may contain bugs. The use of this program is conditioned on the acceptance of the risks that follow the use of laser devices, risks that cannot be prevented and eliminated by the software. It is the user's responsibility to take adequate precautions and use protective devices during use. + + LblFree + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + Left + + + True + + + Microsoft Sans Serif, 9.75pt + + + 139, 6 + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 457, 122 + + + 2 + Laser engraver are not toys! - Always take precautions to protect your eyesight @@ -129,7 +192,21 @@ - Never leave the machine unattended - Refer to the engraver manual for use, safety and maintenance instructions - + + LblNotToy + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + None + iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN @@ -258,4 +335,259 @@ zoHan7ChCpsL9qKyXQdxnUSgkTLFX4aULQZuNkZOhipspaVgCv4fQoc1Zjffjt4AAAAASUVORK5CYII= + + 3, 3 + + + 128, 128 + + + AutoSize + + + 1 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + Top, Right + + + True + + + Microsoft Sans Serif, 9.75pt + + + 562, 223 + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 116, 26 + + + 4 + + + Have fun, safely! + + + LblHaveFun + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + True + + + GrowAndShrink + + + 2 + + + Right + + + False + + + 578, 7 + + + 96, 39 + + + 6 + + + Accept + + + BtnAccept + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + Bottom, Left + + + True + + + Microsoft Sans Serif, 9.75pt, style=Bold + + + 3, 20 + + + 5, 5, 5, 5 + + + 411, 30 + + + 5 + + + I have read, understood, and I accept these conditions + + + CbIHaveRead + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + Fill + + + 3, 257 + + + 1 + + + 677, 53 + + + 7 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="BtnAccept" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="CbIHaveRead" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + Left + + + True + + + 5, 224 + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 92, 23 + + + 8 + + + google translate + + + LlTranslate + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + Fill + + + 0, 0 + + + 4 + + + 683, 313 + + + 0 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="LblFree" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="LblNotToy" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="LblHaveFun" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="LlTranslate" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,50" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + True + + + 6, 13 + + + 683, 313 + + + CenterScreen + + + Legal Disclaimer + + + LegalDisclaimer + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/LaserGRBL/LicenseForm.pt-BR.resx b/LaserGRBL/LicenseForm.pt-BR.resx deleted file mode 100644 index e89bcb92d..000000000 --- a/LaserGRBL/LicenseForm.pt-BR.resx +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LICENÇA PÚBLICA GERAL GNU -Versão 3, 29 de junho de 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Todos têm permissão para copiar e distribuir cópias literais deste documento de licença, mas não é permitido alterá-lo. - -Preâmbulo -A Licença Pública Geral GNU é uma licença copyleft gratuita para software e outros tipos de obras. - -As licenças para a maioria dos softwares e outros trabalhos práticos são projetadas para tirar sua liberdade de compartilhar e alterar os trabalhos. Por outro lado, a Licença Pública Geral GNU destina-se a garantir a sua liberdade de compartilhar e alterar todas as versões de um programa – para garantir que ele permaneça software livre para todos os seus usuários. Nós, a Free Software Foundation, usamos a Licença Pública Geral GNU para a maioria dos nossos softwares; aplica-se também a qualquer outro trabalho divulgado desta forma pelos seus autores. Você também pode aplicá-lo aos seus programas. - -Quando falamos de software livre, estamos nos referindo à liberdade, não ao preço. Nossas licenças públicas gerais são projetadas para garantir que você tenha a liberdade de distribuir cópias de software gratuito (e cobrar por elas, se desejar), que receba o código-fonte ou possa obtê-lo se desejar, que possa alterar o software ou usar partes dele em novos programas gratuitos, e que você sabe que pode fazer essas coisas. - -Para proteger os seus direitos, precisamos de evitar que outras pessoas lhe neguem esses direitos ou lhe peçam que renuncie a eles. Portanto, você tem certas responsabilidades se distribuir cópias do software ou se modificá-lo: responsabilidades de respeitar a liberdade de outras pessoas. - -Por exemplo, se você distribuir cópias de tal programa, seja gratuitamente ou mediante pagamento, deverá transmitir aos destinatários as mesmas liberdades que recebeu. Você deve garantir que eles também recebam ou possam obter o código-fonte. E você deve mostrar-lhes estes termos para que conheçam seus direitos. - -Os desenvolvedores que usam a GNU GPL protegem seus direitos em duas etapas: (1) reivindicam os direitos autorais do software e (2) oferecem a você esta licença, dando-lhe permissão legal para copiá-lo, distribuí-lo e/ou modificá-lo. - -Para proteção dos desenvolvedores e autores, a GPL explica claramente que não há garantia para este software livre. Para o bem dos usuários e dos autores, a GPL exige que as versões modificadas sejam marcadas como alteradas, para que seus problemas não sejam atribuídos erroneamente aos autores de versões anteriores. - -Alguns dispositivos são projetados para negar aos usuários acesso para instalar ou executar versões modificadas do software dentro deles, embora o fabricante possa fazê-lo. Isto é fundamentalmente incompatível com o objectivo de proteger a liberdade dos utilizadores de alterar o software. O padrão sistemático de tal abuso ocorre na área dos produtos de uso individual, que é precisamente onde é mais inaceitável. Portanto, criamos esta versão da GPL para proibir a prática desses produtos. Se tais problemas surgirem substancialmente noutros domínios, estamos prontos a alargar esta disposição a esses domínios em versões futuras da GPL, conforme necessário para proteger a liberdade dos utilizadores. - -Finalmente, todo programa é constantemente ameaçado por patentes de software. Os Estados não devem permitir que as patentes restrinjam o desenvolvimento e a utilização de software em computadores de uso geral, mas naqueles que o fazem, desejamos evitar o perigo especial de que as patentes aplicadas a um programa livre possam torná-lo efectivamente proprietário. Para evitar isso, a GPL garante que as patentes não podem ser usadas para tornar o programa não-livre. - -Seguem os termos e condições precisos para cópia, distribuição e modificação. - -TERMOS E CONDIÇÕES -0. Definições. -“Esta Licença” refere-se à versão 3 da Licença Pública Geral GNU. - -“Direitos autorais” também significa leis semelhantes a direitos autorais que se aplicam a outros tipos de obras, como máscaras semicondutoras. - -“O Programa” refere-se a qualquer trabalho protegido por direitos autorais licenciado sob esta Licença. Cada licenciado é tratado como “você”. “Licenciados” e “destinatários” podem ser indivíduos ou organizações. - -“Modificar” uma obra significa copiar ou adaptar a totalidade ou parte da obra de uma forma que exija permissão de direitos autorais, exceto a realização de uma cópia exata. O trabalho resultante é chamado de “versão modificada” do trabalho anterior ou de trabalho “baseado” no trabalho anterior. - -Uma “obra coberta” significa o Programa não modificado ou uma obra baseada no Programa. - -“Propagar” uma obra significa fazer qualquer coisa com ela que, sem permissão, o tornaria direta ou secundariamente responsável pela violação da lei de direitos autorais aplicável, exceto executá-la em um computador ou modificar uma cópia privada. A propagação inclui cópia, distribuição (com ou sem modificação), disponibilização ao público e, em alguns países, também outras atividades. - -“Transmitir” uma obra significa qualquer tipo de propagação que permita a terceiros fazer ou receber cópias. A mera interação com um usuário através de uma rede de computadores, sem transferência de cópia, não é transmitida. - -Uma interface de usuário interativa exibe “Avisos Legais Apropriados” na medida em que inclui um recurso conveniente e bem visível que (1) exibe um aviso de direitos autorais apropriado e (2) informa ao usuário que não há garantia para o trabalho (exceto para na medida em que as garantias são fornecidas), que os licenciados podem transmitir o trabalho sob esta Licença e como visualizar uma cópia desta Licença. Se a interface apresentar uma lista de comandos ou opções do usuário, como um menu, um item de destaque na lista atende a esse critério. - -1. Código Fonte. -O “código-fonte” de uma obra significa a forma preferida da obra para fazer modificações nela. “Código objeto” significa qualquer forma de obra que não seja a fonte. - -Uma “Interface Padrão” significa uma interface que é um padrão oficial definido por um órgão de padronização reconhecido ou, no caso de interfaces especificadas para uma linguagem de programação específica, uma que é amplamente utilizada entre desenvolvedores que trabalham nessa linguagem. - -As “Bibliotecas de Sistema” de um trabalho executável incluem qualquer coisa, exceto o trabalho como um todo, que (a) esteja incluído na forma normal de empacotamento de um Componente Principal, mas que não faça parte desse Componente Principal, e (b) serve apenas para permitir o uso do trabalho com aquele Componente Principal ou para implementar uma Interface Padrão para a qual uma implementação está disponível ao público em forma de código-fonte. Um “Componente Principal”, neste contexto, significa um componente essencial importante (kernel, sistema de janelas e assim por diante) do sistema operacional específico (se houver) no qual o trabalho executável é executado, ou um compilador usado para produzir o trabalho, ou um interpretador de código objeto usado para executá-lo. - -A “Fonte Correspondente” para uma obra em forma de código-objeto significa todo o código-fonte necessário para gerar, instalar e (para uma obra executável) executar o código-objeto e modificar a obra, incluindo scripts para controlar essas atividades. No entanto, não inclui as Bibliotecas de Sistema do trabalho, nem ferramentas de uso geral ou programas gratuitos geralmente disponíveis que são usados ​​sem modificações na execução dessas atividades, mas que não fazem parte do trabalho. Por exemplo, a Fonte Correspondente inclui arquivos de definição de interface associados aos arquivos de origem do trabalho e o código-fonte para bibliotecas compartilhadas e subprogramas vinculados dinamicamente que o trabalho foi projetado especificamente para exigir, como por comunicação íntima de dados ou fluxo de controle entre esses subprogramas e outras partes do trabalho. - -A Fonte Correspondente não precisa incluir nada que os usuários possam regenerar automaticamente de outras partes da Fonte Correspondente. - -A Fonte Correspondente para uma obra em forma de código-fonte é essa mesma obra. - -2. Permissões básicas. -Todos os direitos concedidos sob esta Licença são concedidos durante a vigência dos direitos autorais do Programa e são irrevogáveis, desde que as condições declaradas sejam atendidas. Esta Licença afirma explicitamente a sua permissão ilimitada para executar o Programa não modificado. O resultado da execução de uma obra coberta é coberto por esta Licença somente se o resultado, dado o seu conteúdo, constituir uma obra coberta. Esta Licença reconhece seus direitos de uso justo ou outro equivalente, conforme previsto pela lei de direitos autorais. - -Você pode criar, executar e propagar trabalhos cobertos que não transmite, sem condições, desde que sua licença permaneça em vigor. Você pode transmitir trabalhos cobertos a terceiros com o único propósito de que eles façam modificações exclusivamente para você, ou fornecer-lhe facilidades para executar esses trabalhos, desde que você cumpra os termos desta Licença ao transmitir todo o material sobre o qual você não tem controle. direito autoral. Aqueles que fizerem ou executarem os trabalhos cobertos para você deverão fazê-lo exclusivamente em seu nome, sob sua direção e controle, em termos que os proíbam de fazer quaisquer cópias de seu material protegido por direitos autorais fora do relacionamento com você. - -O transporte sob quaisquer outras circunstâncias é permitido somente nas condições indicadas abaixo. O sublicenciamento não é permitido; a seção 10 torna isso desnecessário. - -3. Protegendo os Direitos Legais dos Usuários da Lei Anti-Evasão. -Nenhuma obra abrangida será considerada parte de uma medida tecnológica eficaz ao abrigo de qualquer lei aplicável que cumpra as obrigações previstas no artigo 11.º do tratado de direitos de autor da OMPI adoptado em 20 de Dezembro de 1996, ou de leis semelhantes que proíbam ou restrinjam a evasão de tais medidas. - -Ao transmitir uma obra coberta, você renuncia a qualquer poder legal para proibir a evasão de medidas tecnológicas, na medida em que tal evasão seja efetuada pelo exercício de direitos sob esta Licença com relação à obra coberta, e você renuncia a qualquer intenção de limitar a operação ou modificação do trabalho coberto. trabalho como meio de fazer cumprir, contra os usuários do trabalho, os seus direitos legais ou de terceiros de proibir a evasão de medidas tecnológicas. - -4. Transmissão de cópias literais. -Você pode transmitir cópias literais do código-fonte do Programa conforme o recebe, em qualquer meio, desde que publique de forma visível e apropriada em cada cópia um aviso de direitos autorais apropriado; manter intactos todos os avisos declarando que esta Licença e quaisquer termos não permissivos adicionados de acordo com a seção 7 se aplicam ao código; manter intactos todos os avisos de ausência de qualquer garantia; e forneça a todos os destinatários uma cópia desta Licença junto com o Programa. - -Você pode cobrar qualquer preço ou nenhum preço por cada cópia que transmitir e pode oferecer suporte ou proteção de garantia mediante o pagamento de uma taxa. - -5. Transmissão de versões de fontes modificadas. -Você poderá transmitir um trabalho baseado no Programa, ou as modificações para produzi-lo a partir do Programa, na forma de código-fonte sob os termos da seção 4, desde que você também atenda a todas estas condições: - -a) O trabalho deve conter avisos em destaque informando que você o modificou e informando uma data relevante. -b) O trabalho deve conter avisos proeminentes informando que foi lançado sob esta Licença e quaisquer condições adicionadas na seção 7. Este requisito modifica o requisito na seção 4 para “manter intactos todos os avisos”. -c) Você deve licenciar a obra inteira, como um todo, sob esta Licença para qualquer pessoa que possua uma cópia. Esta Licença será, portanto, aplicável, juntamente com quaisquer termos adicionais aplicáveis ​​da seção 7, à totalidade da obra e a todas as suas partes, independentemente de como elas sejam embaladas. Esta Licença não dá permissão para licenciar o trabalho de qualquer outra forma, mas não invalida tal permissão se você a tiver recebido separadamente. -d) Se o trabalho possuir interfaces de usuário interativas, cada uma deverá exibir Avisos Legais Apropriados; entretanto, se o Programa tiver interfaces interativas que não exibem Avisos Legais Apropriados, seu trabalho não precisará obrigar eles a fazê-lo. -Uma compilação de uma obra coberta com outras obras separadas e independentes, que não são, por sua natureza, extensões da obra coberta, e que não são combinadas com ela de modo a formar um programa maior, em ou sobre um volume de armazenamento ou distribuição meio, é chamado de “agregado” se a compilação e seus direitos autorais resultantes não forem usados ​​para limitar o acesso ou os direitos legais dos usuários da compilação além do que as obras individuais permitem. A inclusão de uma obra coberta num agregado não faz com que esta Licença se aplique às outras partes do agregado. - -6. Transmissão de formulários não originais. -Você pode transmitir um trabalho coberto em forma de código objeto sob os termos das seções 4 e 5, desde que você também transmita a Fonte Correspondente legível por máquina sob os termos desta Licença, de uma destas maneiras: - -a) Transmitir o código objeto ou incorporado em um produto físico (incluindo um meio de distribuição físico), acompanhado da Fonte Correspondente fixada em um meio físico durável normalmente usado para intercâmbio de software. -b) Transmitir o código objeto em, ou incorporado em, um produto físico (incluindo um meio de distribuição físico), acompanhado de uma oferta por escrito, válida por pelo menos três anos e válida enquanto você oferecer peças de reposição ou suporte ao cliente para esse modelo de produto, para fornecer a qualquer pessoa que possua o código objeto (1) uma cópia da Fonte Correspondente para todo o software no produto coberto por esta Licença, em um meio físico durável normalmente usado para intercâmbio de software, por um preço não mais do que o seu custo razoável de realizar fisicamente esta transmissão da fonte, ou (2) acesso para copiar a Fonte Correspondente de um servidor de rede sem nenhum custo. -c) Transmitir cópias individuais do código objeto com uma cópia da oferta por escrito para fornecer a Fonte Correspondente. Esta alternativa é permitida apenas ocasionalmente e de forma não comercial, e somente se você recebeu o código objeto com tal oferta, de acordo com a subseção 6b. -d) Transmitir o código objeto oferecendo acesso a partir de um local designado (gratuito ou mediante pagamento), e oferecer acesso equivalente à Fonte Correspondente da mesma forma, através do mesmo local, sem custo adicional. Você não precisa exigir que os destinatários copiem a Fonte Correspondente junto com o código do objeto. Se o local para copiar o código-objeto for um servidor de rede, a Fonte Correspondente poderá estar em um servidor diferente (operado por você ou por terceiros) que suporte recursos de cópia equivalentes, desde que você mantenha instruções claras ao lado do código-objeto informando para onde copiar. encontre a fonte correspondente. Independentemente do servidor que hospeda a Fonte Correspondente, você permanece obrigado a garantir que ela esteja disponível pelo tempo necessário para satisfazer esses requisitos. -e) Transmitir o código-objeto usando transmissão ponto a ponto, desde que você informe outros pares onde o código-objeto e a fonte correspondente do trabalho estão sendo oferecidos ao público em geral gratuitamente nos termos da subseção 6d. -Uma parte separável do código-objeto, cujo código-fonte é excluído da Fonte Correspondente como uma Biblioteca do Sistema, não precisa ser incluída na transmissão do trabalho do código-objeto. - -Um “Produto de Usuário” é (1) um “produto de consumo”, o que significa qualquer propriedade pessoal tangível que normalmente é usada para fins pessoais, familiares ou domésticos, ou (2) qualquer coisa projetada ou vendida para incorporação em uma residência. Ao determinar se um produto é um produto de consumo, os casos duvidosos serão resolvidos em favor da cobertura. Para um determinado produto recebido por um determinado usuário, “normalmente usado” refere-se ao uso típico ou comum daquela classe de produto, independentemente do status do usuário específico ou da maneira como o usuário específico realmente usa, ou espera ou espera usar o produto. Um produto é um produto de consumo, independentemente de o produto ter utilizações comerciais, industriais ou não de consumo substanciais, a menos que tais utilizações representem o único modo significativo de utilização do produto. - -“Informações de Instalação” para um Produto do Usuário significa quaisquer métodos, procedimentos, chaves de autorização ou outras informações necessárias para instalar e executar versões modificadas de um trabalho coberto nesse Produto do Usuário a partir de uma versão modificada de sua Fonte Correspondente. As informações devem ser suficientes para garantir que o funcionamento contínuo do código-objeto modificado não seja, em caso algum, impedido ou interferido apenas porque a modificação foi feita. - -Se você transmitir um código-objeto que funcione sob esta seção em, ou com, ou especificamente para uso em, um Produto do Usuário, e a transmissão ocorrer como parte de uma transação na qual o direito de posse e uso do Produto do Usuário é transferido para o destinatário em caráter perpétuo ou por prazo determinado (independentemente de como a transação seja caracterizada), a Fonte Correspondente veiculada nesta seção deverá ser acompanhada das Informações de Instalação. Mas este requisito não se aplica se nem você nem terceiros mantiverem a capacidade de instalar código-objeto modificado no Produto do Usuário (por exemplo, o trabalho foi instalado em ROM). - -A exigência de fornecer Informações de Instalação não inclui a exigência de continuar a fornecer serviço de suporte, garantia ou atualizações para um trabalho que tenha sido modificado ou instalado pelo destinatário, ou para o Produto do Usuário no qual tenha sido modificado ou instalado. O acesso a uma rede pode ser negado quando a própria modificação afeta material e negativamente a operação da rede ou viola as regras e protocolos de comunicação através da rede. - -A fonte correspondente transmitida e as informações de instalação fornecidas, de acordo com esta seção, devem estar em um formato documentado publicamente (e com uma implementação disponível ao público na forma de código-fonte) e não devem exigir nenhuma senha ou chave especial para descompactar, ler ou copiando. - -7. Termos Adicionais. -“Permissões adicionais” são termos que complementam os termos desta Licença, abrindo exceções a uma ou mais de suas condições. Permissões adicionais que sejam aplicáveis ​​a todo o Programa serão tratadas como se estivessem incluídas nesta Licença, na medida em que sejam válidas sob a lei aplicável. Se permissões adicionais se aplicarem apenas a parte do Programa, essa parte poderá ser usada separadamente sob essas permissões, mas todo o Programa permanecerá regido por esta Licença, independentemente das permissões adicionais. - -Ao transmitir uma cópia de uma obra coberta, você pode, a seu critério, remover quaisquer permissões adicionais dessa cópia ou de qualquer parte dela. (Permissões adicionais podem ser escritas para exigir sua própria remoção em certos casos quando você modifica o trabalho.) Você pode colocar permissões adicionais em material adicionado por você a um trabalho coberto, para o qual você tem ou pode conceder permissão de direitos autorais apropriada. - -Não obstante qualquer outra disposição desta Licença, para material adicionado a uma obra coberta, você poderá (se autorizado pelos detentores dos direitos autorais desse material) complementar os termos desta Licença com os termos: - -a) Isenção de garantia ou limitação de responsabilidade diferentemente dos termos das seções 15 e 16 desta Licença; ou -b) Exigir a preservação de avisos legais razoáveis ​​especificados ou atribuições de autor nesse material ou nos Avisos Legais Apropriados exibidos por obras que o contenham; ou -c) Proibir a deturpação da origem desse material, ou exigir que versões modificadas de tal material sejam marcadas de forma razoável como diferentes da versão original; ou -d) Limitar a utilização para fins publicitários de nomes de licenciantes ou autores do material; ou -e) Recusar-se a conceder direitos sob a lei de marcas para uso de alguns nomes comerciais, marcas registradas ou marcas de serviço; ou -f) Exigir indenização dos licenciantes e autores desse material por qualquer pessoa que transmita o material (ou versões modificadas dele) com suposições contratuais de responsabilidade para o destinatário, por qualquer responsabilidade que essas suposições contratuais imponham diretamente a esses licenciantes e autores. -Todos os outros termos adicionais não permissivos são considerados “restrições adicionais” dentro do significado da seção 10. Se o Programa tal como você o recebeu, ou qualquer parte dele, contiver um aviso declarando que é regido por esta Licença junto com um termo que é uma restrição adicional, você pode remover esse termo. Se um documento de licença contiver uma restrição adicional, mas permitir o relicenciamento ou transmissão sob esta Licença, você poderá adicionar a um material de trabalho coberto regido pelos termos desse documento de licença, desde que a restrição adicional não sobreviva a tal relicenciamento ou transmissão. - -Se você adicionar termos a um trabalho coberto de acordo com esta seção, deverá colocar, nos arquivos de origem relevantes, uma declaração dos termos adicionais que se aplicam a esses arquivos ou um aviso indicando onde encontrar os termos aplicáveis. - -Termos adicionais, permissivos ou não permissivos, podem ser declarados na forma de uma licença escrita separadamente ou declarados como exceções; os requisitos acima se aplicam de qualquer maneira. - -8. Rescisão. -Você não pode propagar ou modificar uma obra coberta, exceto conforme expressamente previsto nesta Licença. Qualquer tentativa de propagá-la ou modificá-la será nula e encerrará automaticamente seus direitos sob esta Licença (incluindo quaisquer licenças de patente concedidas sob o terceiro parágrafo da seção 11). - -No entanto, se você cessar todas as violações desta Licença, então sua licença de um determinado detentor de direitos autorais será restabelecida (a) provisoriamente, a menos e até que o detentor dos direitos autorais rescinda explícita e definitivamente sua licença, e (b) permanentemente, se o detentor dos direitos autorais falhar notificá-lo da violação por algum meio razoável antes de 60 dias após a cessação. - -Além disso, sua licença de um determinado detentor de direitos autorais será restabelecida permanentemente se o detentor dos direitos autorais notificá-lo da violação por algum meio razoável. Esta é a primeira vez que você recebe um aviso de violação desta Licença (para qualquer trabalho) desse detentor de direitos autorais, e você sanará a violação antes de 30 dias após o recebimento da notificação. - -A rescisão de seus direitos sob esta seção não encerra as licenças das partes que receberam cópias ou direitos de você sob esta Licença. Se os seus direitos foram rescindidos e não restabelecidos permanentemente, você não se qualifica para receber novas licenças para o mesmo material nos termos da seção 10. - -9. Aceitação não necessária para cópias. -Você não é obrigado a aceitar esta Licença para receber ou executar uma cópia do Programa. A propagação auxiliar de uma obra abrangida que ocorra apenas como consequência da utilização da transmissão peer-to-peer para receber uma cópia também não requer aceitação. No entanto, nada além desta Licença lhe concede permissão para propagar ou modificar qualquer trabalho coberto. Essas ações infringem os direitos autorais se você não aceitar esta Licença. Portanto, ao modificar ou propagar uma obra coberta, você indica sua aceitação desta Licença para fazê-lo. - -10. Licenciamento Automático de Destinatários Downstream. -Cada vez que você transmite uma obra coberta, o destinatário recebe automaticamente uma licença dos licenciantes originais para executar, modificar e propagar essa obra, sujeita a esta Licença. Você não é responsável por garantir a conformidade de terceiros com esta Licença. - -Uma “transação de entidade” é uma transação que transfere o controle de uma organização, ou substancialmente todos os ativos de uma, ou subdivide uma organização, ou funde organizações. Se a propagação de uma obra coberta resultar de uma transação de entidade, cada parte dessa transação que recebe uma cópia da obra também recebe quaisquer licenças para a obra que o antecessor interessado da parte tinha ou poderia conceder nos termos do parágrafo anterior, além de um direito de posse da Fonte Correspondente do trabalho do antecessor em interesse, se o antecessor o tiver ou puder obtê-lo com esforços razoáveis. - -Você não poderá impor quaisquer restrições adicionais ao exercício dos direitos concedidos ou afirmados sob esta Licença. Por exemplo, você não pode impor uma taxa de licença, royalties ou outro encargo pelo exercício dos direitos concedidos sob esta Licença, e não pode iniciar um litígio (incluindo uma reclamação cruzada ou reconvenção em uma ação judicial) alegando que qualquer reivindicação de patente foi infringida fazendo, usando, vendendo, colocando à venda ou importando o Programa ou qualquer parte dele. - -11. Patentes. -Um “colaborador” é um detentor de direitos autorais que autoriza o uso sob esta Licença do Programa ou de um trabalho no qual o Programa se baseia. A obra assim licenciada é chamada de “versão do contribuidor”. - -As “reivindicações de patente essenciais” de um contribuidor são todas as reivindicações de patente pertencentes ou controladas pelo contribuidor, já adquiridas ou adquiridas posteriormente, que seriam infringidas de alguma maneira, permitida por esta Licença, de fazer, usar ou vender sua versão do contribuidor, mas não incluem reivindicações que seriam infringidas apenas como consequência de modificações adicionais na versão do contribuidor. Para fins desta definição, “controle” inclui o direito de conceder sublicenças de patentes de maneira consistente com os requisitos desta Licença. - -Cada contribuidor concede a você uma licença de patente não exclusiva, mundial e isenta de royalties sob as reivindicações de patente essenciais do contribuidor, para fazer, usar, vender, colocar à venda, importar e de outra forma executar, modificar e propagar o conteúdo de sua versão do contribuidor. - -Nos três parágrafos seguintes, uma “licença de patente” é qualquer acordo ou compromisso expresso, independentemente da denominação, de não fazer cumprir uma patente (como uma permissão expressa para praticar uma patente ou pacto de não processar por violação de patente). “Conceder” tal licença de patente a uma parte significa fazer tal acordo ou compromisso de não fazer valer uma patente contra a parte. - -Se você transmitir uma obra coberta, contando conscientemente com uma licença de patente, e a Fonte Correspondente da obra não estiver disponível para qualquer pessoa copiar, gratuitamente e sob os termos desta Licença, através de um servidor de rede disponível publicamente ou outro prontamente acessível significa, então você deve (1) fazer com que a Fonte Correspondente esteja disponível, ou (2) providenciar a privação do benefício da licença de patente para este trabalho específico, ou (3) providenciar, de maneira consistente com o requisitos desta Licença, para estender a licença de patente aos destinatários a jusante. “Confiar conscientemente” significa que você tem conhecimento real de que, se não fosse pela licença de patente, a transmissão da obra coberta em um país, ou o uso da obra coberta pelo destinatário em um país, infringiria uma ou mais patentes identificáveis ​​naquele país que você têm motivos para acreditar que são válidos. - -Se, de acordo com ou em conexão com uma única transação ou acordo, você transmitir ou propagar através da aquisição de transmissão de uma obra coberta e conceder uma licença de patente a algumas das partes que recebem a obra coberta, autorizando-as a usar, propagar, modificar ou transmitir uma cópia específica da obra coberta, a licença de patente que você concede será automaticamente estendida a todos os destinatários da obra coberta e das obras baseadas nela. - -Uma licença de patente é “discriminatória” se não incluir no âmbito de sua cobertura, proibir o exercício ou estiver condicionada ao não exercício de um ou mais dos direitos especificamente concedidos sob esta Licença. Você não poderá transmitir um trabalho coberto se for parte de um acordo com um terceiro que atua no ramo de distribuição de software, sob o qual você efetua o pagamento ao terceiro com base na extensão de sua atividade de transmissão do trabalho, e sob o qual o terceiro concede, a qualquer uma das partes que receberia o trabalho coberto de você, uma licença de patente discriminatória (a) em conexão com cópias do trabalho coberto transmitidas por você (ou cópias feitas a partir dessas cópias), ou ( b) principalmente para e em conexão com produtos ou compilações específicas que contenham o trabalho coberto, a menos que você tenha celebrado esse acordo ou que a licença de patente tenha sido concedida antes de 28 de março de 2007. - -Nada nesta Licença deve ser interpretado como excluindo ou limitando qualquer licença implícita ou outras defesas contra infrações que possam estar disponíveis para você de acordo com a lei de patentes aplicável. - -12. Nenhuma renúncia à liberdade dos outros. -Se condições forem impostas a você (seja por ordem judicial, acordo ou de outra forma) que contradigam as condições desta Licença, elas não isentarão você das condições desta Licença. Se você não puder transmitir uma obra coberta de modo a satisfazer simultaneamente suas obrigações sob esta Licença e quaisquer outras obrigações pertinentes, então, como consequência, você não poderá transmiti-la de forma alguma. Por exemplo, se você concordar com os termos que o obrigam a cobrar royalties para posterior transmissão daqueles a quem você transmite o Programa, a única maneira de satisfazer ambos os termos e esta Licença seria abster-se totalmente de transmitir o Programa. - -13. Use com a Licença Pública Geral GNU Affero. -Não obstante qualquer outra disposição desta Licença, você tem permissão para vincular ou combinar qualquer trabalho coberto com um trabalho licenciado sob a versão 3 da Licença Pública Geral GNU Affero em um único trabalho combinado e transmitir o trabalho resultante. Os termos desta Licença continuarão a ser aplicados à parte que é a obra coberta, mas os requisitos especiais da Licença Pública Geral GNU Affero, seção 13, relativos à interação através de uma rede serão aplicados à combinação como tal. - -14. Versões Revisadas desta Licença. -A Free Software Foundation pode publicar versões revisadas e/ou novas da Licença Pública Geral GNU de tempos em tempos. Essas novas versões serão semelhantes em espírito à versão atual, mas poderão diferir em detalhes para abordar novos problemas ou preocupações. - -Cada versão recebe um número de versão distinto. Se o Programa especificar que uma determinada versão numerada da Licença Pública Geral GNU “ou qualquer versão posterior” se aplica a ele, você terá a opção de seguir os termos e condições dessa versão numerada ou de qualquer versão posterior publicada pelo Software Livre. Fundação. Se o Programa não especificar um número de versão da Licença Pública Geral GNU, você poderá escolher qualquer versão já publicada pela Free Software Foundation. - -Se o Programa especificar que um proxy pode decidir quais versões futuras da Licença Pública Geral GNU podem ser usadas, a declaração pública de aceitação de uma versão desse proxy autoriza permanentemente o Cliente a escolher essa versão para o Programa. - -Versões de licença posteriores podem conceder permissões adicionais ou diferentes. No entanto, nenhuma obrigação adicional é imposta a qualquer autor ou detentor de direitos autorais como resultado de sua escolha de seguir uma versão posterior. - -15. Isenção de Garantia. -NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA MEDIDA PERMITIDA PELA LEI APLICÁVEL. EXCETO QUANDO DECLARADO EM CONTRÁRIO POR ESCRITO, OS DETENTORES DOS DIREITOS AUTORAIS E/OU OUTRAS PARTES FORNECEM O PROGRAMA “ - - - LaserGRBL é um software gratuito, disponível para uso hobby e profissional, conforme licença GPL v3.0. O código-fonte está disponível em https://github.com/arkypita/LaserGRBL e pode ser editado gratuitamente sob os termos da licença GPL. - -Os direitos autorais do projeto LaserGRBL são de Diego Settimi (arkypita), exceto o código de terceiros que pertence aos seus respectivos proprietários. Você acha o LaserGRBL útil? Apoie o projeto com uma doação! - - \ No newline at end of file diff --git a/LaserGRBL/MainForm.Designer.cs b/LaserGRBL/MainForm.Designer.cs index 975305f2a..99af0f1c6 100644 --- a/LaserGRBL/MainForm.Designer.cs +++ b/LaserGRBL/MainForm.Designer.cs @@ -31,6 +31,9 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.ConnectionForm = new LaserGRBL.ConnectLogForm(); + this.JogForm = new LaserGRBL.JogForm(); + this.PreviewForm = new LaserGRBL.PreviewForm(); this.StatusBar = new System.Windows.Forms.StatusStrip(); this.TTLLines = new System.Windows.Forms.ToolStripStatusLabel(); this.TTTLines = new System.Windows.Forms.ToolStripStatusLabel(); @@ -97,10 +100,17 @@ private void InitializeComponent() this.nightyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.previewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.zoomInToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.zoomOutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); this.showLaserOffMovementsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showExecutedCommandsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.lineSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showBoundingBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.crossCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autosizeModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.drawingAreaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.movingAreaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.lineSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pxToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.pxToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.pxToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); @@ -108,10 +118,6 @@ private void InitializeComponent() this.pxToolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator(); this.showDiagnosticDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showBoundingBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.crossCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.drawingAreaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.movingAreaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.linguaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MNEnglish = new System.Windows.Forms.ToolStripMenuItem(); this.MNItalian = new System.Windows.Forms.ToolStripMenuItem(); @@ -166,12 +172,7 @@ private void InitializeComponent() this.licenseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AwakeTimer = new System.Windows.Forms.Timer(this.components); this.MultipleInstanceTimer = new System.Windows.Forms.Timer(this.components); - this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); - this.zoomInToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.zoomOutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ConnectionForm = new LaserGRBL.ConnectLogForm(); - this.JogForm = new LaserGRBL.JogForm(); - this.PreviewForm = new LaserGRBL.PreviewForm(); + this.japaneseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -196,6 +197,21 @@ private void InitializeComponent() this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved); this.splitContainer1.Paint += new System.Windows.Forms.PaintEventHandler(this.SplitContainer1_Paint); // + // ConnectionForm + // + resources.ApplyResources(this.ConnectionForm, "ConnectionForm"); + this.ConnectionForm.Name = "ConnectionForm"; + // + // JogForm + // + resources.ApplyResources(this.JogForm, "JogForm"); + this.JogForm.Name = "JogForm"; + // + // PreviewForm + // + resources.ApplyResources(this.PreviewForm, "PreviewForm"); + this.PreviewForm.Name = "PreviewForm"; + // // StatusBar // this.StatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -658,8 +674,8 @@ private void InitializeComponent() this.showLaserOffMovementsToolStripMenuItem, this.showExecutedCommandsToolStripMenuItem, this.showBoundingBoxToolStripMenuItem, - this.crossCursorToolStripMenuItem, - this.autosizeModeToolStripMenuItem, + this.crossCursorToolStripMenuItem, + this.autosizeModeToolStripMenuItem, this.lineSizeToolStripMenuItem, this.toolStripMenuItem9, this.showDiagnosticDataToolStripMenuItem}); @@ -672,6 +688,23 @@ private void InitializeComponent() resources.ApplyResources(this.autoSizeToolStripMenuItem, "autoSizeToolStripMenuItem"); this.autoSizeToolStripMenuItem.Click += new System.EventHandler(this.autoSizeToolStripMenuItem_Click); // + // zoomInToolStripMenuItem + // + this.zoomInToolStripMenuItem.Name = "zoomInToolStripMenuItem"; + resources.ApplyResources(this.zoomInToolStripMenuItem, "zoomInToolStripMenuItem"); + this.zoomInToolStripMenuItem.Click += new System.EventHandler(this.zoomInToolStripMenuItem_Click); + // + // zoomOutToolStripMenuItem + // + this.zoomOutToolStripMenuItem.Name = "zoomOutToolStripMenuItem"; + resources.ApplyResources(this.zoomOutToolStripMenuItem, "zoomOutToolStripMenuItem"); + this.zoomOutToolStripMenuItem.Click += new System.EventHandler(this.zoomOutToolStripMenuItem_Click); + // + // toolStripMenuItem10 + // + this.toolStripMenuItem10.Name = "toolStripMenuItem10"; + resources.ApplyResources(this.toolStripMenuItem10, "toolStripMenuItem10"); + // // showLaserOffMovementsToolStripMenuItem // this.showLaserOffMovementsToolStripMenuItem.CheckOnClick = true; @@ -679,6 +712,13 @@ private void InitializeComponent() resources.ApplyResources(this.showLaserOffMovementsToolStripMenuItem, "showLaserOffMovementsToolStripMenuItem"); this.showLaserOffMovementsToolStripMenuItem.Click += new System.EventHandler(this.showLaserOffMovementsToolStripMenuItem_Click); // + // showExecutedCommandsToolStripMenuItem + // + this.showExecutedCommandsToolStripMenuItem.CheckOnClick = true; + this.showExecutedCommandsToolStripMenuItem.Name = "showExecutedCommandsToolStripMenuItem"; + resources.ApplyResources(this.showExecutedCommandsToolStripMenuItem, "showExecutedCommandsToolStripMenuItem"); + this.showExecutedCommandsToolStripMenuItem.Click += new System.EventHandler(this.showExecutedCommandsToolStripMenuItem_Click); + // // showBoundingBoxToolStripMenuItem // this.showBoundingBoxToolStripMenuItem.CheckOnClick = true; @@ -693,12 +733,29 @@ private void InitializeComponent() resources.ApplyResources(this.crossCursorToolStripMenuItem, "crossCursorToolStripMenuItem"); this.crossCursorToolStripMenuItem.Click += new System.EventHandler(this.crossCursorToolStripMenuItem_Click); // - // showExecutedCommandsToolStripMenuItem + // autosizeModeToolStripMenuItem // - this.showExecutedCommandsToolStripMenuItem.CheckOnClick = true; - this.showExecutedCommandsToolStripMenuItem.Name = "showExecutedCommandsToolStripMenuItem"; - resources.ApplyResources(this.showExecutedCommandsToolStripMenuItem, "showExecutedCommandsToolStripMenuItem"); - this.showExecutedCommandsToolStripMenuItem.Click += new System.EventHandler(this.showExecutedCommandsToolStripMenuItem_Click); + this.autosizeModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.drawingAreaToolStripMenuItem, + this.movingAreaToolStripMenuItem}); + this.autosizeModeToolStripMenuItem.Name = "autosizeModeToolStripMenuItem"; + resources.ApplyResources(this.autosizeModeToolStripMenuItem, "autosizeModeToolStripMenuItem"); + // + // drawingAreaToolStripMenuItem + // + this.drawingAreaToolStripMenuItem.CheckOnClick = true; + this.drawingAreaToolStripMenuItem.Name = "drawingAreaToolStripMenuItem"; + resources.ApplyResources(this.drawingAreaToolStripMenuItem, "drawingAreaToolStripMenuItem"); + this.drawingAreaToolStripMenuItem.Tag = "Drawing area"; + this.drawingAreaToolStripMenuItem.Click += new System.EventHandler(this.drawingAreaToolStripMenuItem_Click); + // + // movingAreaToolStripMenuItem + // + this.movingAreaToolStripMenuItem.CheckOnClick = true; + this.movingAreaToolStripMenuItem.Name = "movingAreaToolStripMenuItem"; + resources.ApplyResources(this.movingAreaToolStripMenuItem, "movingAreaToolStripMenuItem"); + this.movingAreaToolStripMenuItem.Tag = "Machine area"; + this.movingAreaToolStripMenuItem.Click += new System.EventHandler(this.machineAreaToolStripMenuItem_Click); // // lineSizeToolStripMenuItem // @@ -711,14 +768,6 @@ private void InitializeComponent() this.lineSizeToolStripMenuItem.Name = "lineSizeToolStripMenuItem"; resources.ApplyResources(this.lineSizeToolStripMenuItem, "lineSizeToolStripMenuItem"); // - // autosizeModeToolStripMenuItem - // - this.autosizeModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.drawingAreaToolStripMenuItem, - this.movingAreaToolStripMenuItem}); - this.autosizeModeToolStripMenuItem.Name = "autosizeModeToolStripMenuItem"; - resources.ApplyResources(this.autosizeModeToolStripMenuItem, "autosizeModeToolStripMenuItem"); - // // pxToolStripMenuItem1 // this.pxToolStripMenuItem1.Name = "pxToolStripMenuItem1"; @@ -754,22 +803,6 @@ private void InitializeComponent() this.pxToolStripMenuItem5.Tag = "5"; this.pxToolStripMenuItem5.Click += new System.EventHandler(this.pxToolStripMenuItem_Click); // - // drawingAreaToolStripMenuItem - // - this.drawingAreaToolStripMenuItem.Name = "drawingAreaToolStripMenuItem"; - this.drawingAreaToolStripMenuItem.CheckOnClick = true; - resources.ApplyResources(this.drawingAreaToolStripMenuItem, "drawingAreaToolStripMenuItem"); - this.drawingAreaToolStripMenuItem.Tag = "Drawing area"; - this.drawingAreaToolStripMenuItem.Click += new System.EventHandler(this.drawingAreaToolStripMenuItem_Click); - // - // movingAreaToolStripMenuItem - // - this.movingAreaToolStripMenuItem.Name = "movingAreaToolStripMenuItem"; - this.movingAreaToolStripMenuItem.CheckOnClick = true; - resources.ApplyResources(this.movingAreaToolStripMenuItem, "movingAreaToolStripMenuItem"); - this.movingAreaToolStripMenuItem.Tag = "Machine area"; - this.movingAreaToolStripMenuItem.Click += new System.EventHandler(this.machineAreaToolStripMenuItem_Click); - // // toolStripMenuItem9 // this.toolStripMenuItem9.Name = "toolStripMenuItem9"; @@ -803,7 +836,8 @@ private void InitializeComponent() this.turkishToolStripMenuItem, this.romanianToolStripMenuItem, this.dutchToolStripMenuItem, - this.ukrainianToolStripMenuItem}); + this.ukrainianToolStripMenuItem, + this.japaneseToolStripMenuItem}); this.linguaToolStripMenuItem.Name = "linguaToolStripMenuItem"; resources.ApplyResources(this.linguaToolStripMenuItem, "linguaToolStripMenuItem"); // @@ -1150,37 +1184,11 @@ private void InitializeComponent() this.MultipleInstanceTimer.Interval = 1000; this.MultipleInstanceTimer.Tick += new System.EventHandler(this.MultipleInstanceTimer_Tick); // - // toolStripMenuItem10 - // - this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - resources.ApplyResources(this.toolStripMenuItem10, "toolStripMenuItem10"); - // - // zoomInToolStripMenuItem + // japaneseToolStripMenuItem // - this.zoomInToolStripMenuItem.Name = "zoomInToolStripMenuItem"; - resources.ApplyResources(this.zoomInToolStripMenuItem, "zoomInToolStripMenuItem"); - this.zoomInToolStripMenuItem.Click += new System.EventHandler(this.zoomInToolStripMenuItem_Click); - // - // zoomOutToolStripMenuItem - // - this.zoomOutToolStripMenuItem.Name = "zoomOutToolStripMenuItem"; - resources.ApplyResources(this.zoomOutToolStripMenuItem, "zoomOutToolStripMenuItem"); - this.zoomOutToolStripMenuItem.Click += new System.EventHandler(this.zoomOutToolStripMenuItem_Click); - // - // ConnectionForm - // - resources.ApplyResources(this.ConnectionForm, "ConnectionForm"); - this.ConnectionForm.Name = "ConnectionForm"; - // - // JogForm - // - resources.ApplyResources(this.JogForm, "JogForm"); - this.JogForm.Name = "JogForm"; - // - // PreviewForm - // - resources.ApplyResources(this.PreviewForm, "PreviewForm"); - this.PreviewForm.Name = "PreviewForm"; + this.japaneseToolStripMenuItem.Name = "japaneseToolStripMenuItem"; + resources.ApplyResources(this.japaneseToolStripMenuItem, "japaneseToolStripMenuItem"); + this.japaneseToolStripMenuItem.Click += new System.EventHandler(this.japaneseToolStripMenuItem_Click); // // MainForm // @@ -1354,6 +1362,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem autosizeModeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem drawingAreaToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem movingAreaToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem japaneseToolStripMenuItem; } } diff --git a/LaserGRBL/MainForm.cs b/LaserGRBL/MainForm.cs index d7b086b1a..b32c6a1e1 100644 --- a/LaserGRBL/MainForm.cs +++ b/LaserGRBL/MainForm.cs @@ -219,6 +219,7 @@ private void AssignIcons() IconsMgr.PrepareMenuItem(romanianToolStripMenuItem, "flags-ro", false); IconsMgr.PrepareMenuItem(dutchToolStripMenuItem, "flags-nl", false); IconsMgr.PrepareMenuItem(ukrainianToolStripMenuItem, "flags-ua", false); + IconsMgr.PrepareMenuItem(japaneseToolStripMenuItem, "flags-jp", false); IconsMgr.PrepareMenuItem(installCH340DriverToolStripMenuItem, "mdi-usb"); IconsMgr.PrepareMenuItem(flashGrblFirmwareToolStripMenuItem, "mdi-chip"); IconsMgr.PrepareMenuItem(orturSupportGroupToolStripMenuItem, "mdi-facebook"); @@ -1176,6 +1177,11 @@ private void ukrainianToolStripMenuItem_Click(object sender, EventArgs e) SetLanguage(new System.Globalization.CultureInfo("uk")); } + private void japaneseToolStripMenuItem_Click(object sender, EventArgs e) + { + SetLanguage(new System.Globalization.CultureInfo("ja-JP")); + } + private void TTTStatus_DoubleClick(object sender, EventArgs e) { Tools.Utils.OpenLink(@"https://lasergrbl.com/usage/machine-status/"); @@ -1329,10 +1335,11 @@ private void machineAreaToolStripMenuItem_Click(object sender, EventArgs e) (PreviewForm.GrblPanel as GrblPanel3D).AutoSizeDrawing(); } } - } + + } - public class MMnRenderer : ToolStripProfessionalRenderer + public class MMnRenderer : ToolStripProfessionalRenderer { public MMnRenderer() : base(new CustomMenuColor()) { } diff --git a/LaserGRBL/MainForm.resx b/LaserGRBL/MainForm.resx index e39bf8bd8..092629ce2 100644 --- a/LaserGRBL/MainForm.resx +++ b/LaserGRBL/MainForm.resx @@ -148,7 +148,7 @@ ConnectionForm - LaserGRBL.ConnectLogForm, LaserGRBL, Version=7.7.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.ConnectLogForm, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel1 @@ -175,7 +175,7 @@ JogForm - LaserGRBL.JogForm, LaserGRBL, Version=7.7.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.JogForm, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel1 @@ -217,7 +217,7 @@ PreviewForm - LaserGRBL.PreviewForm, LaserGRBL, Version=7.7.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.PreviewForm, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -261,30 +261,6 @@ 194, 17 - - 0, 915 - - - 1, 0, 19, 0 - - - 1157, 28 - - - 1 - - - StatusBar - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - 37, 23 @@ -407,171 +383,36 @@ Disconnected - - 295, 17 - - - 118, 17 - - - 41, 20 - - - &Grbl - - - 37, 20 - - - &File - - - 66, 20 - - - Generate - - - 62, 20 - - - &ESP8266 - - - 53, 20 - - - &Colors - - - 219, 22 - - - Zoom Auto (100%) - - - 219, 22 - - - Zoom In (+10%) - - - 219, 22 - - - Zoom Out (-10%) - - - 216, 6 - - - 219, 22 - - - Show Laser Off movements - - - 219, 22 - - - Show bounding box - - - 219, 22 - - - Show cross cursor - - - 219, 22 - - - Show executed commands - - - 219, 22 - - - Line size - - - 219, 22 - - - Auto size mode - - - 219, 22 - - - Drawing area - - - 219, 22 - - - Moving area - - - 216, 6 - - - 219, 22 - - - Show diagnostic data - - - 60, 20 - - - Preview - - - 71, 20 - - - &Language - - - 46, 20 - - - &Tools - - - 47, 20 - - - Ortur - - - False - - - 12, 20 + + 0, 915 - - 0, 0 + + 1, 0, 19, 0 - - 1157, 24 + + 1157, 28 - - 2 + + 1 - - MMn + + StatusBar - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 2 + + 1 + + 295, 17 + + + 118, 17 + 173, 22 @@ -659,6 +500,12 @@ &Exit + + 41, 20 + + + &Grbl + 215, 22 @@ -746,6 +593,12 @@ False + + 37, 20 + + + &File + 178, 22 @@ -770,12 +623,24 @@ Shake Test + + 66, 20 + + + Generate + 147, 22 &Grbl Emulator + + 62, 20 + + + &ESP8266 + 127, 22 @@ -818,6 +683,75 @@ Nighty + + 53, 20 + + + &Colors + + + 219, 22 + + + Zoom Auto (100%) + + + 219, 22 + + + Zoom In (+10%) + + + 219, 22 + + + Zoom Out (-10%) + + + 216, 6 + + + 219, 22 + + + Show Laser Off movements + + + 219, 22 + + + Show executed commands + + + 219, 22 + + + Show bounding box + + + 219, 22 + + + Show cross cursor + + + 143, 22 + + + Drawing area + + + 143, 22 + + + Moving area + + + 219, 22 + + + Auto size mode + 93, 22 @@ -848,6 +782,27 @@ 5px + + 219, 22 + + + Line size + + + 216, 6 + + + 219, 22 + + + Show diagnostic data + + + 60, 20 + + + Preview + 181, 22 @@ -962,6 +917,18 @@ Ukrainian + + 181, 22 + + + Japanese + + + 71, 20 + + + &Language + 187, 22 @@ -989,6 +956,12 @@ False + + 46, 20 + + + &Tools + 223, 22 @@ -1043,11 +1016,14 @@ False - - 190, 22 + + 47, 20 - - Auto update + + Ortur + + + False 189, 22 @@ -1076,6 +1052,12 @@ Check Now! + + 190, 22 + + + Auto update + 187, 6 @@ -1127,6 +1109,30 @@ License + + 12, 20 + + + 0, 0 + + + 1157, 24 + + + 2 + + + MMn + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 415, 18 @@ -9575,6 +9581,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + zoomInToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + zoomOutToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripMenuItem10 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + showLaserOffMovementsToolStripMenuItem @@ -9587,6 +9611,36 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + showBoundingBoxToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + crossCursorToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + autosizeModeToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + drawingAreaToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + movingAreaToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + lineSizeToolStripMenuItem @@ -9959,22 +10013,10 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripMenuItem10 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + japaneseToolStripMenuItem - - zoomInToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - zoomOutToolStripMenuItem - - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs index ba3626acb..a8afd3ac1 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs @@ -164,12 +164,14 @@ private void InitializeComponent() // // BtnUnlockProportion // - this.BtnUnlockProportion.AltImage = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.AltImage"))); + this.BtnUnlockProportion.AltImage = null; resources.ApplyResources(this.BtnUnlockProportion, "BtnUnlockProportion"); this.BtnUnlockProportion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnUnlockProportion.Caption = null; - this.BtnUnlockProportion.Image = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.Image"))); + this.BtnUnlockProportion.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnUnlockProportion.Image = null; this.BtnUnlockProportion.Name = "BtnUnlockProportion"; + this.BtnUnlockProportion.RoundedBorders = false; this.BtnUnlockProportion.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnUnlockProportion, resources.GetString("BtnUnlockProportion.ToolTip")); this.BtnUnlockProportion.UseAltImage = false; @@ -290,8 +292,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnDPI, "BtnDPI"); this.BtnDPI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnDPI.Caption = null; - this.BtnDPI.Image = ((System.Drawing.Image)(resources.GetObject("BtnDPI.Image"))); + this.BtnDPI.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnDPI.Image = null; this.BtnDPI.Name = "BtnDPI"; + this.BtnDPI.RoundedBorders = false; this.BtnDPI.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnDPI, resources.GetString("BtnDPI.ToolTip")); this.BtnDPI.UseAltImage = false; @@ -309,9 +313,11 @@ private void InitializeComponent() this.BtnReset.AltImage = null; this.BtnReset.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnReset.Caption = null; - this.BtnReset.Image = ((System.Drawing.Image)(resources.GetObject("BtnReset.Image"))); + this.BtnReset.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnReset.Image = null; resources.ApplyResources(this.BtnReset, "BtnReset"); this.BtnReset.Name = "BtnReset"; + this.BtnReset.RoundedBorders = false; this.BtnReset.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.StretchImage; this.BtnReset.TabStop = false; this.BtnReset.UseAltImage = false; @@ -323,8 +329,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnCenter, "BtnCenter"); this.BtnCenter.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnCenter.Caption = null; - this.BtnCenter.Image = ((System.Drawing.Image)(resources.GetObject("BtnCenter.Image"))); + this.BtnCenter.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnCenter.Image = null; this.BtnCenter.Name = "BtnCenter"; + this.BtnCenter.RoundedBorders = false; this.BtnCenter.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnCenter, resources.GetString("BtnCenter.ToolTip")); this.BtnCenter.UseAltImage = false; @@ -397,8 +405,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnPSHelper.Caption = null; - this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); + this.BtnPSHelper.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnPSHelper.Image = null; this.BtnPSHelper.Name = "BtnPSHelper"; + this.BtnPSHelper.RoundedBorders = false; this.tableLayoutPanel6.SetRowSpan(this.BtnPSHelper, 2); this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); @@ -433,8 +443,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + this.BtnModulationInfo.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnModulationInfo.Image = null; this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.BtnModulationInfo.RoundedBorders = false; this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); @@ -467,8 +479,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnOnOffInfo.Caption = null; - this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); + this.BtnOnOffInfo.Cursor = System.Windows.Forms.Cursors.Hand; + this.BtnOnOffInfo.Image = null; this.BtnOnOffInfo.Name = "BtnOnOffInfo"; + this.BtnOnOffInfo.RoundedBorders = false; this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); this.BtnOnOffInfo.UseAltImage = false; @@ -476,9 +490,11 @@ private void InitializeComponent() // // CBLaserON // + this.CBLaserON.BackColor = System.Drawing.Color.White; this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); resources.ApplyResources(this.CBLaserON, "CBLaserON"); this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.ForeColor = System.Drawing.SystemColors.ControlText; this.CBLaserON.FormattingEnabled = true; this.CBLaserON.Name = "CBLaserON"; this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx index cf26997e3..fe12acab8 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx @@ -143,10 +143,10 @@ 6 - Left + 193, 31 @@ -169,7 +169,7 @@ BtnUnlockProportion - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -259,7 +259,7 @@ IIOffsetX - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -280,7 +280,7 @@ IIOffsetY - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -301,7 +301,7 @@ IISizeH - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -322,7 +322,7 @@ IISizeW - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -586,7 +586,7 @@ IIDpi - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -616,7 +616,7 @@ BtnDPI - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -631,7 +631,7 @@ 1 - 200, 23 + 201, 23 25 @@ -679,7 +679,7 @@ BtnReset - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -709,7 +709,7 @@ BtnCenter - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -796,7 +796,7 @@ GbSize - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 @@ -904,7 +904,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -931,7 +931,7 @@ IILinearFilling - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1024,7 +1024,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1081,7 +1081,7 @@ GbSpeed - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 @@ -1126,7 +1126,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1183,7 +1183,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1247,7 +1247,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1271,7 +1271,7 @@ Click for more information... CBLaserON - LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1328,7 +1328,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1451,7 +1451,7 @@ Click for more information... GbLaser - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 @@ -1487,7 +1487,7 @@ Click for more information... BtnCancel - LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=6.2.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -1514,7 +1514,7 @@ Click for more information... BtnCreate - LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=6.2.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs index 6b1009552..66a255d3f 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs @@ -142,8 +142,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnPSHelper.Caption = null; + this.BtnPSHelper.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); this.BtnPSHelper.Name = "BtnPSHelper"; + this.BtnPSHelper.RoundedBorders = false; this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); this.BtnPSHelper.UseAltImage = false; @@ -177,8 +179,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.BtnModulationInfo.RoundedBorders = false; this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); @@ -211,8 +215,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); this.BtnOnOffInfo.Name = "BtnOnOffInfo"; + this.BtnOnOffInfo.RoundedBorders = false; this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); this.BtnOnOffInfo.UseAltImage = false; @@ -221,8 +227,10 @@ private void InitializeComponent() // CBLaserON // resources.ApplyResources(this.CBLaserON, "CBLaserON"); + this.CBLaserON.BackColor = System.Drawing.Color.White; this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.ForeColor = System.Drawing.SystemColors.ControlText; this.CBLaserON.FormattingEnabled = true; this.CBLaserON.Name = "CBLaserON"; this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); @@ -297,8 +305,10 @@ private void InitializeComponent() // CBFilter // resources.ApplyResources(this.CBFilter, "CBFilter"); + this.CBFilter.BackColor = System.Drawing.Color.White; this.CBFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CBFilter.DropDownWidth = 195; + this.CBFilter.ForeColor = System.Drawing.SystemColors.ControlText; this.CBFilter.FormattingEnabled = true; this.CBFilter.Name = "CBFilter"; // @@ -308,8 +318,10 @@ private void InitializeComponent() resources.ApplyResources(this.BtnColorFilter, "BtnColorFilter"); this.BtnColorFilter.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.BtnColorFilter.Caption = null; + this.BtnColorFilter.Cursor = System.Windows.Forms.Cursors.Hand; this.BtnColorFilter.Image = ((System.Drawing.Image)(resources.GetObject("BtnColorFilter.Image"))); this.BtnColorFilter.Name = "BtnColorFilter"; + this.BtnColorFilter.RoundedBorders = false; this.BtnColorFilter.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; this.TT.SetToolTip(this.BtnColorFilter, resources.GetString("BtnColorFilter.ToolTip")); this.BtnColorFilter.UseAltImage = false; diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx index fc6e8270f..b862d5f1d 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx @@ -229,7 +229,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -277,7 +277,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -334,7 +334,7 @@ GbSpeed - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 @@ -394,7 +394,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -451,7 +451,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -530,7 +530,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -554,7 +554,7 @@ Click for more information... CBLaserON - LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -611,7 +611,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -734,7 +734,7 @@ Click for more information... GbLaser - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 @@ -773,7 +773,7 @@ Click for more information... BtnCancel - LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=6.2.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -803,7 +803,7 @@ Click for more information... BtnCreate - LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=6.2.0.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -908,7 +908,7 @@ Click for more information... CBFilter - LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.FlatComboBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -952,7 +952,7 @@ Click for more information... BtnColorFilter - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=6.1.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1012,7 +1012,7 @@ Click for more information... gbFilter - LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=3.7.3.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.GrblGroupBox, LaserGRBL, Version=7.11.0.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel9 diff --git a/LaserGRBL/Telegram.cs b/LaserGRBL/Telegram.cs index 3cd5d1eb4..43155096b 100644 --- a/LaserGRBL/Telegram.cs +++ b/LaserGRBL/Telegram.cs @@ -13,7 +13,7 @@ public class Telegram public static void NotifyEvent(string message) { if (Settings.GetObject("TelegramNotification.Enabled", false)) - NotifyEvent(Tools.Protector.Decrypt(Settings.GetObject("TelegramNotification.Code", "")), message); + NotifyEvent(Tools.Protector.Decrypt(Settings.GetObject("TelegramNotification.Code", ""), ""), message); } public static void NotifyEvent(string usercode, string message) { diff --git a/setup.iss b/setup.iss index 0d70a1b6e..6ae26cb03 100644 --- a/setup.iss +++ b/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LaserGRBL" -#define MyAppVersion "7.11.0" +#define MyAppVersion "7.11.1" #define MyAppVersionName "Rhydon" #define MyAppPublisher "LaserGRBL" #define MyAppURL "https://lasergrbl.com" @@ -64,6 +64,7 @@ Source: ".\LaserGRBL\bin\Release\tr-TR\LaserGRBL.resources.dll"; DestDir: "{app} Source: ".\LaserGRBL\bin\Release\ro-RO\LaserGRBL.resources.dll"; DestDir: "{app}\ro-RO"; Flags: ignoreversion Source: ".\LaserGRBL\bin\Release\nl-NL\LaserGRBL.resources.dll"; DestDir: "{app}\nl-NL"; Flags: ignoreversion Source: ".\LaserGRBL\bin\Release\uk\LaserGRBL.resources.dll"; DestDir: "{app}\uk"; Flags: ignoreversion +Source: ".\LaserGRBL\bin\Release\ja-JP\LaserGRBL.resources.dll"; DestDir: "{app}\ja-JP"; Flags: ignoreversion Source: ".\LaserGRBL\bin\Release\Driver\*"; DestDir: "{app}\Driver"; Flags: ignoreversion Source: ".\LaserGRBL\bin\Release\Firmware\*"; DestDir: "{app}\Firmware"; Flags: ignoreversion Source: ".\LaserGRBL\bin\Release\LaserGRBL.exe.config"; DestDir: "{app}"; Flags: ignoreversion