v2.0.2

TuTAH1 · Apr 21, 2023 · 4814a3b · 4814a3b
1 parent 6209231
commit 4814a3b
Show file tree

Hide file tree

Showing 7 changed files with 407 additions and 244 deletions.
diff --git a/Forms/SettingsForm.Designer.cs b/Forms/SettingsForm.Designer.cs
diff --git a/Forms/SettingsForm.cs b/Forms/SettingsForm.cs
@@ -30,6 +30,8 @@ public void InitializeControls()
 			Text = LocalizationStrings.SettingsForm_Title;
 			SetStyle(ControlStyles.SupportsTransparentBackColor, true);
 
+			gbUpdate.Visible = false; //: Autoupdate not ready yet
+
 			#region Functions group
 
 			lbSteamVRDisableMethod.Text = LocalizationStrings.SettingsForm_lbSteamVRDisableMethod;
@@ -58,7 +60,8 @@ public void InitializeControls()
 
 			#region Interface group
 
-			gbInterface.Left = gbFunctions.Right + gbFunctions.Margin.Right + gbInterface.Margin.Left;
+
+			gbInterface.Left = Math.Max(gbFunctions.Right + gbFunctions.Margin.Right, gbUpdate.Right + gbUpdate.Margin.Right) + gbInterface.Margin.Left; //: gbInterface Left position
 
 			picLanguage.Image = GetImage("Settings", "language");
 			lbLanguage.Text = LocalizationStrings.SettingsForm_lbLanguage;

diff --git a/Logic/Langauge.cs b/Logic/Langauge.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamVR_OculusDash_Switcher.Logic
+{
+	public class Language
+	{
+		public CultureInfo Culture;
+
+		public override string ToString()
+		{
+			return Culture.NativeName;
+		}
+
+		public Language(CultureInfo Culture)
+		{
+			this.Culture = Culture;
+		}
+	}
+
+	public static class LanguageFunctions
+	{
+		public static Language GetCurrentLanguage(this Language[] Languages)
+		{
+			foreach (var lang in Languages)
+			{
+				if (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == lang.Culture.TwoLetterISOLanguageName) return lang;
+			}
+
+			return null;
+		}
+
+		public static int? GetCurrentLanguageIndex(this Language[] Languages)
+		{
+			for (int i = 0; i < Languages.Length; i++)
+			{
+				if (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == Languages[i].Culture.TwoLetterISOLanguageName) return i;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/Logic/SteamVR.cs b/Logic/SteamVR.cs
@@ -61,18 +61,23 @@ public bool LocateSteamVR()
 					if (json.ContainsKey("runtime"))
 					{
 						var item = (JArray)json["runtime"];
-						if (item != null && item.Contains("SteamVR"))
+						if (item != null && item.First.ToString().Contains("SteamVR"))
 						{
 							_steamVrFolderPath = item.First.ToString();
 						}
 					}
 				}
 
-				if (!Directory.Exists(_steamVrFolderPath) && Directory.Exists(_steamVrFolderPath.ReplaceFromLast("SteamVR", "SteamVR_")))
+				if (!Directory.Exists(_steamVrFolderPath))
 				{
-					Method = BreakMethod.RenameFolder;
-					methodFound = true;
-				} else throw new DirectoryNotFoundException("SteamVR Folder not found");
+					if (Directory.Exists(_steamVrFolderPath.ReplaceFromLast("SteamVR", "SteamVR_", false)))
+					{
+						Method = BreakMethod.RenameFolder;
+						methodFound = true;
+					} 
+					else throw new DirectoryNotFoundException("SteamVR Folder not found");
+				}
+
 			}
 			return !methodFound;
 		}

diff --git a/Properties/Localization/LocalizationStrings.Designer.cs b/Properties/Localization/LocalizationStrings.Designer.cs
diff --git a/Properties/Localization/LocalizationStrings.resx b/Properties/Localization/LocalizationStrings.resx
@@ -247,8 +247,8 @@
     <value>Realistic icons</value>
   </data>
   <data name="IconRealismLevel_3_Discription" xml:space="preserve">
-    <value>Yes, I know what "icon" means. 
- It'o photo, but transparent</value>
+	  <value>Yes, I know what "icon" means. 
+ It's a photo, but transparent</value>
   </data>
   <data name="IconRealismLevel_Unknown_Discription" xml:space="preserve">
     <value>I don't know how did you set the impossible value</value>
@@ -292,4 +292,10 @@
   <data name="SettingsForm_RealismLevel_Max_Error" xml:space="preserve">
 	  <value>Can't play amazing song</value>
   </data>
+  <data name="ErrorTaskDialog__Title" xml:space="preserve">
+	  <value>Error</value>
+  </data>
+  <data name="ErrorTaskDialog__Open_Callstack" xml:space="preserve">
+	  <value>Open call stack</value>
+  </data>
 </root>
diff --git a/Properties/Localization/LocalizationStrings.ru.resx b/Properties/Localization/LocalizationStrings.ru.resx
@@ -286,4 +286,10 @@
   <data name="SettingsForm_RealismLevel_Max_Error" xml:space="preserve">
 	  <value>Не получается воспроизвести замечательную песню</value>
   </data>
+  <data name="ErrorTaskDialog__Title" xml:space="preserve">
+	  <value>Ошибка</value>
+  </data>
+  <data name="ErrorTaskDialog__Open_Callstack" xml:space="preserve">
+	  <value>Открыть стек вызовов</value>
+  </data>
 </root>