From 56cf8bd167e4ca656add84763e0062862f03ceb4 Mon Sep 17 00:00:00 2001 From: arkypita Date: Mon, 27 Feb 2017 21:45:16 +0100 Subject: [PATCH] Restore of XP compatibility --- LaserGRBL/ConnectLogForm.resx | 9 +- LaserGRBL/CustomButtonForm.resx | 6 +- LaserGRBL/JogForm.resx | 10 +- LaserGRBL/LaserGRBL.csproj | 36 +- LaserGRBL/MainForm.resx | 4 +- LaserGRBL/PreviewForm.resx | 23 +- LaserGRBL/Properties/Resources.Designer.cs | 110 +- .../ConvertSizeAndOptionForm.resx | 4 +- .../RasterConverter/RasterToLaserForm.resx | 19 +- LaserGRBL/SplashScreenForm.resx | 935 +++-- LaserGRBL/UserControls/CommandLog.resx | 10 +- .../DockingManager/Resources.resx | 3391 ++++++++++++++++- LaserGRBL/app.config | 3 - 13 files changed, 3944 insertions(+), 616 deletions(-) delete mode 100644 LaserGRBL/app.config diff --git a/LaserGRBL/ConnectLogForm.resx b/LaserGRBL/ConnectLogForm.resx index cd1a8f69e..e5eeeca33 100644 --- a/LaserGRBL/ConnectLogForm.resx +++ b/LaserGRBL/ConnectLogForm.resx @@ -278,9 +278,9 @@ QmCC - + 17, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK @@ -297,7 +297,8 @@ TkSuQmCC - + + 39 - + \ No newline at end of file diff --git a/LaserGRBL/CustomButtonForm.resx b/LaserGRBL/CustomButtonForm.resx index 50c378af6..b33e5c1d7 100644 --- a/LaserGRBL/CustomButtonForm.resx +++ b/LaserGRBL/CustomButtonForm.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, 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 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAAJxAIA3kywAAACBjSFJNAABu diff --git a/LaserGRBL/JogForm.resx b/LaserGRBL/JogForm.resx index 96101a364..4c283ccdc 100644 --- a/LaserGRBL/JogForm.resx +++ b/LaserGRBL/JogForm.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, 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 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAK @@ -584,7 +584,7 @@ l+h7WoW8TA8v+We79QKPW/wZHgL4HuX2fppG838x3VpQgUFfhwAAAABJRU5ErkJggg== - + 17, 31 - + \ No newline at end of file diff --git a/LaserGRBL/LaserGRBL.csproj b/LaserGRBL/LaserGRBL.csproj index 89c9ad380..f66c76d4a 100644 --- a/LaserGRBL/LaserGRBL.csproj +++ b/LaserGRBL/LaserGRBL.csproj @@ -11,7 +11,6 @@ LaserGRBL v2.0 512 - False True False False @@ -21,6 +20,21 @@ C:\Users\Diego\AppData\Roaming\ICSharpCode\SharpDevelop5\Settings.SourceAnalysis Grafica\LaserGrbl.ico + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -31,6 +45,10 @@ DEBUG;TRACE prompt 4 + Off + false + C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Static Analysis Tools\Rule Sets\MinimumRecommendedRules.ruleset + true x86 @@ -56,6 +74,9 @@ obj\ Project + + true + @@ -438,7 +459,18 @@ - + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + +