From b8762c80509edd5209f88b92603d3baa971aece0 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 10 Dec 2019 15:59:33 +0100
Subject: [PATCH] Fix #1653: Add "reset to defaults" in options dialog

---
 ILSpy/Options/DecompilerSettingsPanel.xaml.cs |  6 ++++++
 ILSpy/Options/DisplaySettings.cs              |  7 +++++++
 ILSpy/Options/DisplaySettingsPanel.xaml.cs    |  6 ++++++
 ILSpy/Options/MiscSettings.cs                 |  5 +++++
 ILSpy/Options/MiscSettingsPanel.xaml.cs       |  6 ++++++
 ILSpy/Options/OptionsDialog.xaml              |  5 +++--
 ILSpy/Options/OptionsDialog.xaml.cs           | 12 +++++++++++-
 ILSpy/Properties/Resources.Designer.cs        | 18 ++++++++++++++++++
 ILSpy/Properties/Resources.resx               |  6 ++++++
 9 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/ILSpy/Options/DecompilerSettingsPanel.xaml.cs b/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
index 134f9faf0..1b1daa917 100644
--- a/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
+++ b/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
@@ -128,6 +128,12 @@ namespace ICSharpCode.ILSpy.Options
 			CheckBox checkBox = (CheckBox)sender;
 			checkBox.IsChecked = IsGroupChecked((CollectionViewGroup)checkBox.DataContext);
 		}
+
+		public void LoadDefaults()
+		{
+			currentDecompilerSettings = new Decompiler.DecompilerSettings();
+			this.DataContext = new DecompilerSettings(currentDecompilerSettings);
+		}
 	}
 
 	public class DecompilerSettings : INotifyPropertyChanged
diff --git a/ILSpy/Options/DisplaySettings.cs b/ILSpy/Options/DisplaySettings.cs
index a887e2913..950a9b6c4 100644
--- a/ILSpy/Options/DisplaySettings.cs
+++ b/ILSpy/Options/DisplaySettings.cs
@@ -29,6 +29,13 @@ namespace ICSharpCode.ILSpy.Options
 	{
 		public DisplaySettings()
 		{
+			this.selectedFont = new FontFamily("Consolas");
+			this.selectedFontSize = 10.0 * 4 / 3;
+			this.sortResults = true;
+			this.indentationUseTabs = true;
+			this.indentationSize = 4;
+			this.indentationTabSize = 4;
+			this.highlightMatchingBraces = true;
 		}
 		
 		#region INotifyPropertyChanged implementation
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml.cs b/ILSpy/Options/DisplaySettingsPanel.xaml.cs
index ef13c55d9..a8196a560 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml.cs
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml.cs
@@ -164,6 +164,12 @@ namespace ICSharpCode.ILSpy.Options
 			if (!text.All(char.IsDigit))
 				e.CancelCommand();
 		}
+
+		public void LoadDefaults()
+		{
+			currentDisplaySettings = new DisplaySettings();
+			this.DataContext = currentDisplaySettings;
+		}
 	}
 
 	public class FontSizeConverter : IValueConverter
diff --git a/ILSpy/Options/MiscSettings.cs b/ILSpy/Options/MiscSettings.cs
index a78cc8609..d5c7659a5 100644
--- a/ILSpy/Options/MiscSettings.cs
+++ b/ILSpy/Options/MiscSettings.cs
@@ -26,6 +26,11 @@ namespace ICSharpCode.ILSpy.Options
 		bool allowMultipleInstances;
 		bool loadPreviousAssemblies;
 
+		public MiscSettings()
+		{
+			this.loadPreviousAssemblies = true;
+		}
+
 		/// <summary>
 		/// Allow multiple instances.
 		/// </summary>
diff --git a/ILSpy/Options/MiscSettingsPanel.xaml.cs b/ILSpy/Options/MiscSettingsPanel.xaml.cs
index 75f0dd151..866efcf0a 100644
--- a/ILSpy/Options/MiscSettingsPanel.xaml.cs
+++ b/ILSpy/Options/MiscSettingsPanel.xaml.cs
@@ -71,5 +71,11 @@ namespace ICSharpCode.ILSpy.Options
 
 			currentMiscSettings = null; // invalidate cached settings
 		}
+
+		public void LoadDefaults()
+		{
+			currentMiscSettings = new MiscSettings();
+			this.DataContext = currentMiscSettings;
+		}
 	}
 }
diff --git a/ILSpy/Options/OptionsDialog.xaml b/ILSpy/Options/OptionsDialog.xaml
index 5eb0389ee..f8b9232fb 100644
--- a/ILSpy/Options/OptionsDialog.xaml
+++ b/ILSpy/Options/OptionsDialog.xaml
@@ -15,8 +15,9 @@
 		</Grid.RowDefinitions>
 		<TabControl Name="tabControl" />
 		<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="12,8">
-			<Button IsDefault="True" Margin="2,0" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.OK}"></Button>
-			<Button IsCancel="True" Margin="2,0" Content="{x:Static properties:Resources.Cancel}"></Button>
+			<Button Margin="2,0" Name="defaultsButton" Click="DefaultsButton_Click" Content="{x:Static properties:Resources.ResetToDefaults}" />
+			<Button IsDefault="True" Margin="2,0" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.OK}" />
+			<Button IsCancel="True" Margin="2,0" Content="{x:Static properties:Resources.Cancel}" />
 		</StackPanel>
 	</Grid>
 </Window>
\ No newline at end of file
diff --git a/ILSpy/Options/OptionsDialog.xaml.cs b/ILSpy/Options/OptionsDialog.xaml.cs
index d4f5a6191..b6f2161da 100644
--- a/ILSpy/Options/OptionsDialog.xaml.cs
+++ b/ILSpy/Options/OptionsDialog.xaml.cs
@@ -68,8 +68,17 @@ namespace ICSharpCode.ILSpy.Options
 			this.DialogResult = true;
 			Close();
 		}
+
+		private void DefaultsButton_Click(object sender, RoutedEventArgs e)
+		{
+			if (MessageBox.Show(Properties.Resources.ResetToDefaultsConfirmationMessage, "ILSpy", MessageBoxButton.YesNo) == MessageBoxResult.Yes) {
+				var page = ((TabItem)tabControl.SelectedItem).Content as IOptionPage;
+				if (page != null)
+					page.LoadDefaults();
+			}
+		}
 	}
-	
+
 	public interface IOptionsMetadata
 	{
 		string Title { get; }
@@ -80,6 +89,7 @@ namespace ICSharpCode.ILSpy.Options
 	{
 		void Load(ILSpySettings settings);
 		void Save(XElement root);
+		void LoadDefaults();
 	}
 	
 	[MetadataAttribute]
diff --git a/ILSpy/Properties/Resources.Designer.cs b/ILSpy/Properties/Resources.Designer.cs
index 3f78089b5..bfa98006d 100644
--- a/ILSpy/Properties/Resources.Designer.cs
+++ b/ILSpy/Properties/Resources.Designer.cs
@@ -1593,6 +1593,24 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Reset to defaults.
+        /// </summary>
+        public static string ResetToDefaults {
+            get {
+                return ResourceManager.GetString("ResetToDefaults", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Do you really want to load the default settings for the active page?.
+        /// </summary>
+        public static string ResetToDefaultsConfirmationMessage {
+            get {
+                return ResourceManager.GetString("ResetToDefaultsConfirmationMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Resources file (*.resources)|*.resources|Resource XML file|*.resx.
         /// </summary>
diff --git a/ILSpy/Properties/Resources.resx b/ILSpy/Properties/Resources.resx
index 1daed2f7a..c7e3398ea 100644
--- a/ILSpy/Properties/Resources.resx
+++ b/ILSpy/Properties/Resources.resx
@@ -802,4 +802,10 @@ Are you sure you want to continue?</value>
   <data name="DecompilerSettings.SeparateLocalVariableDeclarations" xml:space="preserve">
     <value>Separate local variable declarations and initializers (int x = 5; -&gt; int x; x = 5;), if possible.</value>
   </data>
+  <data name="ResetToDefaults" xml:space="preserve">
+    <value>Reset to defaults</value>
+  </data>
+  <data name="ResetToDefaultsConfirmationMessage" xml:space="preserve">
+    <value>Do you really want to load the default settings for the active page?</value>
+  </data>
 </root>
\ No newline at end of file