From 637dc6f2d78587bd662e5297dc5396de2533d295 Mon Sep 17 00:00:00 2001
From: Sven <svenhb@gmx.de>
Date: Mon, 20 May 2024 10:57:47 +0200
Subject: [PATCH] Version 1.7.3.2

---
 GRBL-Plotter/App.config          | 40 +++++++++++++++++++++-----------
 GRBL-Plotter/GRBL-Plotter.csproj | 40 +++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/GRBL-Plotter/App.config b/GRBL-Plotter/App.config
index f650773e..f7357d6b 100644
--- a/GRBL-Plotter/App.config
+++ b/GRBL-Plotter/App.config
@@ -6,6 +6,9 @@
       <section name="GRBL_Plotter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
   </configSections>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib"/>
@@ -782,16 +785,16 @@
         <value>https://GRBL-Plotter.de</value>
       </setting>
       <setting name="guiCustomBtn1" serializeAs="String">
-        <value>🡴 Graphic Upper-Left|(Move to upper left corner - fast);G90 G0 X#GMIX Y#GMAY|#80FFFF</value>
+        <value>🡴 Graphic Top-Left|(Move to upper left corner - jog fast);$J=G90 F5000 X#GMIX Y#GMAY|#80FFFF</value>
       </setting>
       <setting name="guiCustomBtn10" serializeAs="String">
-        <value>⇩ Pen down Zmin|(Move Pen to lower position);G90 G0 Z#GMIZ|#FF8080</value>
+        <value>▼  Pen down Zmin|(Move Pen to lower position);G90 G0 Z#GMIZ|#FF8080</value>
       </setting>
       <setting name="guiCustomBtn11" serializeAs="String">
-        <value>🡶 Graphic Bottom-Right|(Move to bottom right corner - fast);G90 G0 X#GMAX Y#GMIY|#80FFFF</value>
+        <value>🡶 Graphic Bottom-Right|(Move to lower right corner - jog fast);$J=G90 F5000 X#GMAX Y#GMIY|#80FFFF</value>
       </setting>
       <setting name="guiCustomBtn12" serializeAs="String">
-        <value>⚠ Hard RESET|#HRST|fuchsia</value>
+        <value>▼ Pen down Servo|(Move Pen to lower position);M3 S#GMIS|#FF8080</value>
       </setting>
       <setting name="guiCustomBtn13" serializeAs="String">
         <value> |</value>
@@ -815,7 +818,7 @@
         <value> | </value>
       </setting>
       <setting name="guiCustomBtn2" serializeAs="String">
-        <value>⇧ Pen up Zmax|(Move Pen to upper position);G90 G0 Z#GMAZ|#80FF80</value>
+        <value>▲ Pen up Zmax|(Move Pen to upper position);$J=G90 F5000 Z#GMAZ|#80FF80</value>
       </setting>
       <setting name="guiCustomBtn20" serializeAs="String">
         <value> | </value>
@@ -848,7 +851,7 @@
         <value> | </value>
       </setting>
       <setting name="guiCustomBtn3" serializeAs="String">
-        <value>🡷 Graphic Bottom-Left|(Move to bottom left corner - fast);G90 G0 X#GMIX Y#GMIY|#80FFFF</value>
+        <value>🡷 Graphic Bottom-Left|(Move to lower left corner - jog fast);$J=G90 F5000 X#GMIX Y#GMIY|#80FFFF</value>
       </setting>
       <setting name="guiCustomBtn30" serializeAs="String">
         <value> | </value>
@@ -860,22 +863,22 @@
         <value> | </value>
       </setting>
       <setting name="guiCustomBtn4" serializeAs="String">
-        <value>🡷 Homing 0;0;35|(Move to hard stops);$J= G91 F5000 X-40 Y-40 Z40|#FFAAAA</value>
+        <value>▲ Pen up Servo|(Move Pen to upper position);M3 S#GMAS|#80FF80</value>
       </setting>
       <setting name="guiCustomBtn5" serializeAs="String">
-        <value>↻ Move around graphic|(Move around graphic dimension - fast);G90G0X#GMIXY#GMIY;Y#GMAY;X#GMAX;Y#GMIY;X#GMIX|#FFFF80</value>
+        <value>↻ Move around graphic|(Move around graphic dimension - jog fast);G90G1F5000X#GMIXY#GMIY;Y#GMAY;X#GMAX;Y#GMIY;X#GMIX|#FFFF80</value>
       </setting>
       <setting name="guiCustomBtn6" serializeAs="String">
-        <value>◎ Graphic Center|(Move to graphic center - fast);G90 G0 X#GCTX Y#GCTY|#00FFFF</value>
+        <value>◎ Graphic Center|(Move to graphic center - fast);$J=G90 F5000 X#GCTX Y#GCTY|#00FFFF</value>
       </setting>
       <setting name="guiCustomBtn7" serializeAs="String">
         <value>Add Logo|data\scripts\script_my_logo.nc|#FFFFC0</value>
       </setting>
       <setting name="guiCustomBtn8" serializeAs="String">
-        <value>Set Coordinate System| G10 L20 P0 X-1 Y-1 Z23;|#FFAAAA</value>
+        <value>► Pen zero Servo|(Move Pen to zero position);M3 S#GZES|#e6f7ff</value>
       </setting>
       <setting name="guiCustomBtn9" serializeAs="String">
-        <value>🡵 Graphic Upper-Right|(Move to upper right corner - fast);G90 G0 X#GMAX Y#GMAY|#80FFFF</value>
+        <value>🡵 Graphic Top-Right|(Move to upper right corner - jog fast);$J=G90 F5000 X#GMAX Y#GMAY|#80FFFF</value>
       </setting>
       <setting name="guiDimensionShow" serializeAs="String">
         <value>True</value>
@@ -1252,6 +1255,12 @@
       <setting name="importGCCompress" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importGCConvertToPolar" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="importGCConvertToPolarAccuracy" serializeAs="String">
+        <value>0.1</value>
+      </setting>
       <setting name="importGCDecPlaces" serializeAs="String">
         <value>3</value>
       </setting>
@@ -2396,11 +2405,14 @@
       <setting name="useCaseLastLoaded" serializeAs="String">
         <value>?</value>
       </setting>
-      <setting name="importGCConvertToPolar" serializeAs="String">
+      <setting name="importGCTangentialShorteningEnable" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="importGCConvertToPolarAccuracy" serializeAs="String">
-        <value>0.1</value>
+      <setting name="importGCTangentialShortening" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="guiToolSelection" serializeAs="String">
+        <value>0</value>
       </setting>
     </GrblPlotter.Properties.Settings>
     <GRBL_Plotter.Properties.Settings>
diff --git a/GRBL-Plotter/GRBL-Plotter.csproj b/GRBL-Plotter/GRBL-Plotter.csproj
index 2e1b3199..16f36d2a 100644
--- a/GRBL-Plotter/GRBL-Plotter.csproj
+++ b/GRBL-Plotter/GRBL-Plotter.csproj
@@ -739,40 +739,40 @@
     <Content Include="data\buttons\Find_Z_set_zero.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_around_fast.ini">
+    <Content Include="data\buttons\Graphic_move_around_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\buttons\Graphic_move_around_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_bottom_left_fast.ini">
+    <Content Include="data\buttons\Graphic_move_to_bottom_left_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\buttons\Graphic_move_to_bottom_left_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_bottom_right_fast.ini">
+    <Content Include="data\buttons\Graphic_move_to_bottom_right_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\buttons\Graphic_move_to_bottom_right_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_center_fast.ini">
+    <Content Include="data\buttons\Graphic_move_to_center_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\buttons\Graphic_move_to_center_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_upper_left_fast.ini">
+    <Content Include="data\buttons\Graphic_move_to_top_left_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_upper_left_slow.ini">
+    <Content Include="data\buttons\Graphic_move_to_top_left_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_upper_right_fast.ini">
+    <Content Include="data\buttons\Graphic_move_to_top_right_rapid.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\buttons\Graphic_move_to_upper_right_slow.ini">
+    <Content Include="data\buttons\Graphic_move_to_top_right_slow.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\buttons\Laser_off.ini">
@@ -869,6 +869,30 @@
     <None Include="data\automations\File_load\file_load_setup_use_z.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="data\buttons\Graphic_move_around_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Graphic_move_to_bottom_left_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Graphic_move_to_bottom_right_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Graphic_move_to_center_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Graphic_move_to_top_left_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Graphic_move_to_top_right_fast.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Pen_center_Servo.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Pen_zero_Servo.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\app.manifest" />
     <None Include="Resources\LeadInOut.png" />
     <None Include="Resources\rndOff.png" />