2.0 Release

TuTAH1 · Jan 21, 2023 · fa8ba66 · fa8ba66
1 parent 425bcd1
commit fa8ba66
Show file tree

Hide file tree

Showing 30 changed files with 1,910 additions and 1,780 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -362,6 +362,5 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
-# Test files
-Test/
-Readme images/
+# secret files
+secret/
diff --git a/Forms/AskPathForm.Designer.cs b/Forms/AskPathForm.Designer.cs
diff --git a/Forms/AskPathForm.cs b/Forms/AskPathForm.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Forms;
+
+namespace SteamVR_OculusDash_Switcher.Forms
+{
+	public partial class AskPathForm : Form
+	{
+		/// <summary>
+		/// Not ready. Not used
+		/// </summary>
+		public AskPathForm() 
+		{
+			InitializeComponent();
+		}
+
+		public DialogResult ShowDialog(string text)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/Forms/AskPathForm.resx b/Forms/AskPathForm.resx
@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
diff --git a/Forms/ControlsTipsForm.cs b/Forms/ControlsTipsForm.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Drawing;
 using System.Windows.Forms;
-using SteamVR_OculusDash_Switcher.Properties;
 using SteamVR_OculusDash_Switcher.Properties.Localization;
 using Titanium;
 using static Titanium.Forms;

diff --git a/Forms/SettingsForm.Designer.cs b/Forms/SettingsForm.Designer.cs
diff --git a/Forms/SettingsForm.cs b/Forms/SettingsForm.cs
@@ -1,19 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
-using System.Linq;
 using System.Media;
-using System.Resources;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using SteamVR_OculusDash_Switcher.Logic;
 using SteamVR_OculusDash_Switcher.Properties;
 using SteamVR_OculusDash_Switcher.Properties.Localization;
 using Titanium;
-using TitaniumComparator.LogicClasses;
 using static SteamVR_OculusDash_Switcher.Program;
 using static Titanium.Forms;
 
@@ -101,6 +97,8 @@ public void InitializeControls()
 			lbSaved.Text = LocalizationStrings.SettingsForm_btnApply_label__Saved;
 			lbSaved.Left = btnApply.Left - MeasureText(lbSaved).Width; //- lbSaved.Margin.Right;
 			lbSaved.ForeColor = this.BackColor;
+			gbFunctions.Text = LocalizationStrings.SettingsForm__Main_functions;
+			gbInterface.Text = LocalizationStrings.SettingsForm__Interface;
 
 			//btnApply.Enabled = false;
 
@@ -128,17 +126,25 @@ public void InitializeControls()
 		#region Обработчики событий
 
 			//\---------------
-			//% SETTINGS APPLY
+			//! SETTINGS APPLY
 			//\---------------
 			private void btnApply_Click(object sender, EventArgs e)
 			{
 				try
 				{
-					bool restartControlBecouseStupidWinformsCantDoSuchBasicThingAsClearCombobox = false; //TODO: Someone plaese say me how to clear combobox and it's work without -1 index exception that if it's possible
+					bool restartControlBecouseStupidWinformsCantDoSuchBasicThingAsClearCombobox = false; //TODO: Someone plaese say me how to clear combobox and it's work without -1 index exception if it's possible
+
+					//! LANGUAGE CHANGE
 					if (!Equals(Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName, ((Language)comboLanguage.SelectedItem).Culture.TwoLetterISOLanguageName))
 					{
 						Thread.CurrentThread.CurrentUICulture = ((Language)comboLanguage.SelectedItem).Culture;
 						restartControlBecouseStupidWinformsCantDoSuchBasicThingAsClearCombobox = true;
+
+						ErrorTaskDialog.InitializeDictionary(
+							LocalizationStrings.ErrorTaskDialog__OpenMicrosoftDocs,
+							LocalizationStrings.ErrorTaskDialog__Copy_to_Clipboard,
+							LocalizationStrings.ErrorTaskDialog__Open_Inner_Exception, 
+							LocalizationStrings.Button__Close);
 					}
 
 					if (comboSteamVRDisableMethod.SelectedItem!= null && Settings.Default.SteamVRDisablingMethod != (SteamVRMethod)comboSteamVRDisableMethod.SelectedItem)
@@ -209,9 +215,9 @@ private async void btnCheckOculusKillerUpdates_Click(object sender, EventArgs e)
 					var status = await OculusDash.CheckKiller(true);
 					MessageBox.Show(status switch
 					{
-						OculusDash.Status.Downloaded => LocalizationStrings.OculusKiller_StatusDiscription_Downloaded,
-						OculusDash.Status.Updated => LocalizationStrings.OculusKiller_StatusDiscription_Updated,
-						OculusDash.Status.NoAction => LocalizationStrings.OculusKiller_StatusDiscription_NoAction
+						GitHub.Status.Downloaded => LocalizationStrings.OculusKiller_StatusDiscription_Downloaded,
+						GitHub.Status.Updated => LocalizationStrings.OculusKiller_StatusDiscription_Updated,
+						GitHub.Status.NoAction => LocalizationStrings.OculusKiller_StatusDiscription_NoAction
 					}, "Updated", MessageBoxButtons.OK, MessageBoxIcon.Information);
 					btnCheckOculusKillerUpdates.Text = LocalizationStrings.SettingsForm_btnCheckOculusKillerUpdates;
 					btnCheckOculusKillerUpdates.Enabled = true;
@@ -278,7 +284,7 @@ private void lbIconsRealism_Resize(object sender, EventArgs e)
 
 		private void SetTrayColorValue()
 		{
-			lbTrayIconColorValue.Text = Settings.Default.BlackMode ? LocalizationStrings.SettingsForm_lbTrayIconColorValue_Black + "►" : "◄" + LocalizationStrings.SettingsForm_lbTrayIconColorValue_White;
+			lbTrayIconColorValue.Text = Settings.Default.BlackMode ? LocalizationStrings.SettingsForm_lbTrayIconColorValue_Black + " ►" : "◄ " + LocalizationStrings.SettingsForm_lbTrayIconColorValue_White;
 		}
 
 		private void Change_IconRealism_DiscriptionAndImage()

diff --git a/LICENSE b/LICENSE
@@ -2,10 +2,6 @@ Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public L
 
 CC BY-NC-SA
 
-Please, note that this licence is not applying to all files under `Titanium` namespace. They may use other licence specified in file (if other licence is not specified, they inherit project's licence (this)). In this project these files are:
-Logic/Titanium.cs
-Logic/TitaniumForms.cs
-
 Short:
 You are free to:
 Share — copy and redistribute the material in any medium or format