Merge branch 'dev'

Hary309 · Dec 8, 2018 · d385485 · d385485
2 parents c273337 + 909b3a0
commit d385485
Show file tree

Hide file tree

Showing 33 changed files with 940 additions and 511 deletions.
diff --git a/src/Settings/Main.Designer.cs b/src/Settings/Main.Designer.cs
diff --git a/src/Settings/Main.cs b/src/Settings/Main.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -8,9 +8,9 @@
 using System.Threading.Tasks;
 using System.IO;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 using Newtonsoft.Json;
-using System.Diagnostics;
 
 namespace Settings
 {
@@ -85,17 +85,14 @@ bool LoadSettings()
 				activeCheckBox.Checked = settings.active;
 				disableScCheckBox.Checked = settings.disable_shortcuts;
 
-				switch (settings.rotation_style)
-				{
-					case 0:
-						rotStyleBox.Text = "Linear";
-						break;
-					case 1:
-						rotStyleBox.Text = "Smooth";
-						break;
-				}
+                if (settings.rotation_style < 0 || settings.rotation_style > 2)
+                {
+                    settings.rotation_style = 1;
+                }
+
+                rotStyleBox.SelectedIndex = settings.rotation_style;
 
-				if (settings.speed > speedTrackBar.Maximum)
+                if (settings.speed > speedTrackBar.Maximum)
 				{
 					MessageBox.Show("Speed value is too high!", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					this.Close();

diff --git a/src/Settings/Main.resx b/src/Settings/Main.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,4 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>