Merge pull request #8 from rashlight/dev

Merge features of 1.0.0.1
rashlight · Nov 14, 2021 · 6bbbe3f · 6bbbe3f
2 parents a9c01b8 + 816cc35
commit 6bbbe3f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/SimpleClicker.sln b/SimpleClicker.sln
@@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4E499CE0-FE3A-407D-833E-4E385499882B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E499CE0-FE3A-407D-833E-4E385499882B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E499CE0-FE3A-407D-833E-4E385499882B}.Debug|x86.ActiveCfg = Debug|x86
+		{4E499CE0-FE3A-407D-833E-4E385499882B}.Debug|x86.Build.0 = Debug|x86
 		{4E499CE0-FE3A-407D-833E-4E385499882B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E499CE0-FE3A-407D-833E-4E385499882B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E499CE0-FE3A-407D-833E-4E385499882B}.Release|x86.ActiveCfg = Release|x86
+		{4E499CE0-FE3A-407D-833E-4E385499882B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SimpleClicker/MoreOptionsForm.cs b/SimpleClicker/MoreOptionsForm.cs
@@ -552,6 +552,8 @@ private void resetTimeButton_Click(object sender, EventArgs e)
         private void resetExtraButton_Click(object sender, EventArgs e)
         {
             if (MessageBox.Show(Properties.Languages.warningResetExtraOptions, Name, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) != DialogResult.Yes) return;
+            // Tab saving
+            Properties.Settings.Default.moreOptionsLastSelTab = 0;
             // Laps tab
             Properties.Settings.Default.lapsAllowancesType = LapAllowances.ALL_DURATIONS;
             Properties.Settings.Default.lapsSortingType = LapSorting.LAST_FOCUSED;
@@ -570,6 +572,8 @@ private void resetExtraButton_Click(object sender, EventArgs e)
             Properties.Settings.Default.sunsetTime = 19;
             // Extra tab
             Properties.Settings.Default.language = "en-US";
+            // Secrets
+            Properties.Settings.Default.isBiosTimeEnabled = false;
             Properties.Settings.Default.Save();
             MessageBox.Show(Properties.Languages.infoResetCompleted, Name, MessageBoxButtons.OK, MessageBoxIcon.Information);
             Application.Restart();
@@ -587,6 +591,8 @@ private void resetAllButton_Click(object sender, EventArgs e)
             Properties.Settings.Default.delayTimeStop = 3;
             Properties.Settings.Default.timePrecision = 4;
             Properties.Settings.Default.updateThreshold = 10;
+            // Tab saving
+            Properties.Settings.Default.moreOptionsLastSelTab = 0;
             // Laps tab
             Properties.Settings.Default.lapsAllowancesType = LapAllowances.ALL_DURATIONS;
             Properties.Settings.Default.lapsSortingType = LapSorting.LAST_FOCUSED;
@@ -605,6 +611,8 @@ private void resetAllButton_Click(object sender, EventArgs e)
             Properties.Settings.Default.sunsetTime = 19;
             // Extra tab
             Properties.Settings.Default.language = "en-US";
+            // Secrets
+            Properties.Settings.Default.isBiosTimeEnabled = false;
             Properties.Settings.Default.Save();
             MessageBox.Show(Properties.Languages.infoResetCompleted, Name, MessageBoxButtons.OK, MessageBoxIcon.Information);
             Application.Restart();
@@ -638,12 +646,12 @@ private void secretButton_Click(object sender, EventArgs e)
 
                     MessageBox.Show(
                         "Is BIOS time enabled: " + dg.ToString() + "\n"
-                            + "Reset to take effects, Enter this secret again to toggle!\n",
+                            + "We will restart now, enter this secret again to toggle!\n",
                         "Secrets!",
                         MessageBoxButtons.OK,
                         MessageBoxIcon.Information
                     );
-
+                    Application.Restart();
                     break;
                 default:
                     break;

diff --git a/SimpleClicker/Properties/AssemblyInfo.cs b/SimpleClicker/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("rashlight")]
 [assembly: AssemblyProduct("SimpleClicker")]
-[assembly: AssemblyCopyright("Copyright © rashlight 2020")]
+[assembly: AssemblyCopyright("Copyright © rashlight 2020-2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
 [assembly: NeutralResourcesLanguage("")]
diff --git a/SimpleClicker/changelog.md b/SimpleClicker/changelog.md
@@ -1,4 +1,9 @@
-## Version 1.0.0.0 (Tweaking Update):
+## Version 1.0.0.1 (Fixes):
+	- Update reset options
+	- Update assembly information
+	- A secret will now restart on execute
+
+## Version 1.0.0.0 (Tweaking Update):
 	- Further changing UI transcriptions.
 	- Change support button to an about form with similar functionality
 	- The setting tabs' position will be saved when opened