Done 3.0.3

R2NorthstarTools · Jan 23, 2024 · 1278db1 · 1278db1
1 parent 24905fa
commit 1278db1
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 597 deletions.
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04f5124b-0229-496f-8bcb-9d8880905602.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04f5124b-0229-496f-8bcb-9d8880905602.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/068892f9-e7ce-4566-ae8a-94f6553c1e82.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/068892f9-e7ce-4566-ae8a-94f6553c1e82.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0b02963d-23c0-49b7-a9f8-bbb5d1649240.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0b02963d-23c0-49b7-a9f8-bbb5d1649240.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2ab6882b-e530-47f8-a0ed-7e5666790802.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2ab6882b-e530-47f8-a0ed-7e5666790802.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3ba74aa4-1f34-4681-ae6b-205ea625f65b.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3ba74aa4-1f34-4681-ae6b-205ea625f65b.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/400702b1-6508-451e-88e5-a4517a94e8f3.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/400702b1-6508-451e-88e5-a4517a94e8f3.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/48796b58-52b0-49d1-a1b9-2798dd24949c.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/48796b58-52b0-49d1-a1b9-2798dd24949c.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/8cffd8c5-fe0e-4674-bfaf-a8c798a25900.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/8cffd8c5-fe0e-4674-bfaf-a8c798a25900.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cd6ef953-912d-4fa5-a529-0a8dd1c0e81f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cd6ef953-912d-4fa5-a529-0a8dd1c0e81f.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/eb8b4d71-ad0b-4e46-8daf-fb55431af441.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/eb8b4d71-ad0b-4e46-8daf-fb55431af441.vsidx
diff --git a/VTOL_2.0.0/MainWindow.xaml.cs b/VTOL_2.0.0/MainWindow.xaml.cs
@@ -382,7 +382,7 @@ public void SwitchCursor(string cur)
             }
             switch (cur)
             {
-                case "Defualt":
+                case "Default":
                     this.Cursor = null;
 
                     break;

diff --git a/VTOL_2.0.0/Pages/Page_Settings.xaml.cs b/VTOL_2.0.0/Pages/Page_Settings.xaml.cs
@@ -75,8 +75,8 @@ public class PropertyGridDemoModel
             [Category("Github")]
 
             public string Master_Server_Url { get; set; }
-            [Category("Cursor")]
-            public cur Cursor { get; set; }
+            //[Category("Cursor")]
+            //public cur Cursor { get; set; }
 
             //public Theme Theme { get; set; }
             //[Category("Themes")]
@@ -92,7 +92,7 @@ public enum Theme
         }
         public enum cur
         {
-            Defualt,
+            Default,
             LeadWall,
             Ronin
         }
@@ -268,12 +268,10 @@ private void Settings_LostFocus(object sender, RoutedEventArgs e)
                 }
                 DispatchIfNecessary(async () =>
                 {
-                    if(Settings_.Cursor != cur.Defualt)
-                    {
+                  
                         Main.SwitchCursor(Settings_.Cursor.ToString());
 
-                    }
-
+                    
                     if (curr_lang.ToString() != Settings_.Language.ToString())
                     {
                         Dialog_.ButtonLeftName = VTOL.Resources.Languages.Language.Page_Settings_Settings_LostFocus_Restart;

diff --git a/VTOL_2.0.0/Pages/Page_Tools.xaml.cs b/VTOL_2.0.0/Pages/Page_Tools.xaml.cs
diff --git a/VTOL_2.0.0/Resources/Cursors/Leadwallcur.cur b/VTOL_2.0.0/Resources/Cursors/Leadwallcur.cur
diff --git a/VTOL_2.0.0/Resources/Cursors/NormalCurTf2.cur b/VTOL_2.0.0/Resources/Cursors/NormalCurTf2.cur
diff --git a/VTOL_2.0.0/VTOL.csproj b/VTOL_2.0.0/VTOL.csproj
@@ -782,12 +782,12 @@
     <Resource Include="Resources\Backgrounds\profiles_bg.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Resources\Cursors\Leadwallcur.cur">
+    <Content Include="Resources\Cursors\Leadwallcur.cur">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Resources\Cursors\NormalCurTf2.cur">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
+    </Content>
+    <Content Include="Resources\Cursors\NormalCurTf2.cur">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Resource Include="Resources\Icons\EA.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>