Merge branch 'AgOpenGPS-Official:develop' into my_dev_branch_V6

AgOpenGPS-Official · Jan 7, 2025 · 06baae7 · 06baae7
2 parents 111b183 + 368faad
commit 06baae7
Show file tree

Hide file tree

Showing 18 changed files with 449 additions and 304 deletions.
diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj
@@ -952,6 +952,8 @@
     <None Include="btnImages\BoundaryRecordTool.png" />
     <None Include="btnImages\Config\ConD_SectionHighlights.png" />
     <None Include="btnImages\Config\ConD_LineSmooth.png" />
+    <None Include="btnImages\QR\QRAOG.png" />
+    <None Include="btnImages\QR\QRYouTube.png" />
     <Content Include="License.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/SourceCode/GPS/Classes/CSettings.cs b/SourceCode/GPS/Classes/CSettings.cs
@@ -6,6 +6,7 @@
 using System.Configuration;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Windows.Forms;
 using System.Xml.Linq;
 using System.Xml.XPath;
@@ -407,12 +408,13 @@ public static void Save()
             {
                 if (vehicleFileName != "Default Vehicle")
                 {
+                    //let settings finish writing to user.config
+                    Thread.Sleep(500) ;
                     SettingsIO.ExportAll(Path.Combine(vehiclesDirectory, vehicleFileName + ".xml"));
-                    //Log.EventWriter(vehicleFileName + ".XML Saved to Vehicles");
                 }
                 else
                 {
-                    //Log.EventWriter("Default Vehicle Not saved to Vehicles");
+                    Log.EventWriter("Default Vehicle Not saved to Vehicles");
                 }
             }
             catch (Exception ex)
@@ -446,9 +448,7 @@ public static void Reset()
                 baseDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AgOpenGPS");
                 fieldsDirectory = Path.Combine(baseDirectory, "Fields");
 
-                CreateDirectories();
-
-
+                CreateDirectories();             
 
             }
             catch (Exception ex)

diff --git a/SourceCode/GPS/Forms/Controls.Designer.cs b/SourceCode/GPS/Forms/Controls.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormGPS.Designer.cs b/SourceCode/GPS/Forms/FormGPS.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs
@@ -405,7 +405,7 @@ private void FormGPS_Load(object sender, EventArgs e)
             panelSim.Top = Height - 60;
 
             //set the language to last used
-            SetLanguage(RegistrySettings.culture, false);
+            SetLanguage(RegistrySettings.culture);
 
             //make sure current field directory exists, null if not
             currentFieldDirectory = Settings.Default.setF_CurrentDir;
@@ -496,45 +496,6 @@ private void FormGPS_Load(object sender, EventArgs e)
 
             ControlExtension.Draggable(panelDrag, true);
 
-            enterSimCoordsToolStripMenuItem.Text = gStr.gsEnterSimCoords;
-            aboutToolStripMenuItem.Text = gStr.gsAbout;
-            menustripLanguage.Text = gStr.gsLanguage;
-
-            simulatorOnToolStripMenuItem.Text = gStr.gsSimulatorOn;
-            resetALLToolStripMenuItem.Text = gStr.gsResetAll;
-
-            toolStripColors.Text = gStr.gsColors;
-            toolStripSectionColors.Text = "Section " + gStr.gsColors;
-            toolStripConfig.Text = gStr.gsConfiguration;
-            toolStripSteerSettings.Text = gStr.gsAutoSteer;
-            toolStripWorkingDirectories.Text = gStr.gsDirectories;
-
-            resetEverythingToolStripMenuItem.Text = gStr.gsResetAllForSure;
-            steerChartStripMenu.Text = gStr.gsCharts;
-
-            //Tools Menu
-            SmoothABtoolStripMenu.Text = gStr.gsSmoothABCurve;
-            boundariesToolStripMenuItem.Text = gStr.gsBoundary;
-            headlandToolStripMenuItem.Text = gStr.gsHeadland;
-            headlandBuildToolStripMenuItem.Text = gStr.gsHeadland + " Builder";
-            deleteContourPathsToolStripMenuItem.Text = gStr.gsDeleteContourPaths;
-            deleteAppliedToolStripMenuItem.Text = gStr.gsDeleteAppliedArea;
-            tramLinesMenuField.Text = gStr.gsTramLines;
-            recordedPathStripMenu.Text = gStr.gsRecordedPathMenu;
-            flagByLatLonToolStripMenuItem.Text = gStr.gsFlagByLatLon;
-            boundaryToolToolStripMenu.Text = gStr.gsBoundary + " Tool";
-
-            webcamToolStrip.Text = gStr.gsWebCam;
-            offsetFixToolStrip.Text = gStr.gsOffsetFix;
-            wizardsMenu.Text = gStr.gsWizards;
-            steerWizardMenuItem.Text = gStr.gsSteerWizard;
-            steerChartToolStripMenuItem.Text = gStr.gsSteerChart;
-            headingChartToolStripMenuItem.Text = gStr.gsHeadingChart;
-            xTEChartToolStripMenuItem.Text = gStr.gsXTEChart;
-
-            btnChangeMappingColor.Text = GitVersionInformation.MajorMinorPatch;
-            //btnChangeMappingColor.Text = btnChangeMappingColor.Text.Substring(2);
-
             hotkeys = new char[19];
 
             hotkeys = Properties.Settings.Default.setKey_hotkeys.ToCharArray();