Version 1.7.3.2

svenhb · May 20, 2024 · 3ed42e3 · 3ed42e3
1 parent 9bc6a51
commit 3ed42e3
Show file tree

Hide file tree

Showing 19 changed files with 545 additions and 295 deletions.
diff --git a/GRBL-Plotter/GUI/AboutForm.cs b/GRBL-Plotter/GUI/AboutForm.cs
@@ -56,6 +56,7 @@ private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         /* show actual verison */
         private void AboutForm_Load(object sender, EventArgs e)
         {
+            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             lblVersion.Text = string.Format("{0}    {1}", MyApplication.GetVersion(), MyApplication.GetCompilationDate());   //File.GetCreationTime(System.Reflection.Assembly.GetExecutingAssembly().Location)
         }
 

diff --git a/GRBL-Plotter/GUI/AboutForm.resx b/GRBL-Plotter/GUI/AboutForm.resx
@@ -168,14 +168,14 @@
   <data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
-  <data name="label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top</value>
-  </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt</value>
+  </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 237</value>
+    <value>6, 237</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>154, 13</value>
@@ -186,9 +186,6 @@
   <data name="label1.Text" xml:space="preserve">
     <value>© 2015-2024 svenhb@web.de</value>
   </data>
-  <data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>TopCenter</value>
-  </data>
   <data name="&gt;&gt;label1.Name" xml:space="preserve">
     <value>label1</value>
   </data>
@@ -201,11 +198,14 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="linkLabel1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 254</value>
+    <value>6, 254</value>
   </data>
   <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>142, 13</value>
@@ -216,9 +216,6 @@
   <data name="linkLabel1.Text" xml:space="preserve">
     <value>Visit GRBL-Plotter on GitHub</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="linkLabel1.ToolTip" xml:space="preserve">
     <value>Open brower and visit 'https://github.com/svenhb/GRBL-Plotter'</value>
   </data>
@@ -237,8 +234,11 @@
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt</value>
+  </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 220</value>
+    <value>81, 220</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>42, 13</value>
@@ -264,6 +264,9 @@
   <data name="lblVersion.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="lblVersion.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt</value>
+  </data>
   <data name="lblVersion.Location" type="System.Drawing.Point, System.Drawing">
     <value>135, 220</value>
   </data>
@@ -313,7 +316,7 @@
     <value>3</value>
   </data>
   <data name="linkLabel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 289</value>
+    <value>6, 289</value>
   </data>
   <data name="linkLabel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>249, 33</value>
@@ -343,7 +346,7 @@
     <value>True</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 273</value>
+    <value>6, 273</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 13</value>
@@ -366,11 +369,17 @@
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="linkLabel3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="linkLabel3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt</value>
+  </data>
   <data name="linkLabel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 220</value>
+    <value>6, 220</value>
   </data>
   <data name="linkLabel3.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 13</value>
@@ -3408,9 +3417,6 @@
         //8=
 </value>
   </data>
-  <data name="$this.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>280, 420</value>
-  </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
     <value>280, 420</value>
   </data>

diff --git a/GRBL-Plotter/GUI/AboutForm.zh-CN.resx b/GRBL-Plotter/GUI/AboutForm.zh-CN.resx
@@ -118,13 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="label3.Text" xml:space="preserve">
-    <value>版</value>
+    <value>版本:</value>
   </data>
   <data name="button2.Text" xml:space="preserve">
     <value>检查更新</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
-    <value>程序路径：</value>
+    <value>程序路径:</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>关于</value>

diff --git a/GRBL-Plotter/GUI/ButtonEdit.resx b/GRBL-Plotter/GUI/ButtonEdit.resx
@@ -368,6 +368,9 @@ Check GamePad setup for further varaibles.
   <data name="&gt;&gt;btnDelete.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="lblColor.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -443,12 +446,18 @@ Check GamePad setup for further varaibles.
   <data name="&gt;&gt;cBPresets.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>424, 321</value>
   </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>440, 360</value>
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>
@@ -468,10 +477,4 @@ Check GamePad setup for further varaibles.
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/GRBL-Plotter/GUI/ButtonEdit.zh-CN.resx b/GRBL-Plotter/GUI/ButtonEdit.zh-CN.resx
@@ -130,7 +130,7 @@
     <value>按钮颜色</value>
   </data>
   <data name="label3.Text" xml:space="preserve">
-    <value>可能的变量是图形位置MIn。，MAx。 和X，Y和Z的中心值：
+    <value>可供使用的变量有图像位置最大值、最小值和X，Y和Z的中心值：
 ＃GMIX，＃GMAX，＃GCTX; ＃GMIY，＃GMAY，＃GCTY; ＃GMIZ，＃GMAZ，＃GCTZ
 检查GamePad设置是否有其他变量。</value>
   </data>
@@ -141,7 +141,7 @@
     <value>点击更改</value>
   </data>
   <data name="label2.Text" xml:space="preserve">
-    <value>GCode或文件名</value>
+    <value>在此输入Gcode或在下方选项卡中加载文件</value>
   </data>
   <data name="btnCancel.Text" xml:space="preserve">
     <value>取消</value>

diff --git a/GRBL-Plotter/GUI/MainForm.Designer.cs b/GRBL-Plotter/GUI/MainForm.Designer.cs