#184

Author: retailcoder

RetailCoder.VBE/Rubberduck.csproj

@@ -286,7 +286,7 @@
       <DependentUpon>ExtractMethodDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Refactorings\ExtractMethod\IExtractMethodDialog.cs" />
-    <Compile Include="UI\Refactorings\IDialogView.cs" />
+    <Compile Include="UI\IDialogView.cs" />
     <Compile Include="UI\Refactorings\ExtractMethod\ValueChangedEventArgs.cs" />
     <Compile Include="UI\Refactorings\Rename\IRenameView.cs" />
     <Compile Include="UI\Refactorings\Rename\RenameDialog.cs">

RetailCoder.VBE/UI/Refactorings/IDialogView.cs renamed to RetailCoder.VBE/UI/IDialogView.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Rubberduck.UI.Refactorings
+namespace Rubberduck.UI
 {
     public interface IDialogView
     {

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -195,4 +195,22 @@
     <value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
     <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
   </data>
+  <data name="SettingsCaption_GeneralSettings" xml:space="preserve">
+    <value>General Settings</value>
+  </data>
+  <data name="SettingsCaption_CodeInspections" xml:space="preserve">
+    <value>Code Inspection Settings</value>
+  </data>
+  <data name="SettingsCaption_ToDoSettings" xml:space="preserve">
+    <value>ToDo Settings</value>
+  </data>
+  <data name="SettingsInstructions_CodeInspections" xml:space="preserve">
+    <value>Configure inspection severity. Use "do no show" to disable an inspection.</value>
+  </data>
+  <data name="SettingsInstructions_GeneralSettings" xml:space="preserve">
+    <value>Changes will be applied after Rubberduck is reloaded.</value>
+  </data>
+  <data name="SettingsInstructions_ToDoSettings" xml:space="preserve">
+    <value>Configure markers to be recognized in comments.</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -22,6 +22,20 @@ public partial class _SettingsDialog : Form
         public _SettingsDialog()
         {
             InitializeComponent();
+
+            OkButton.Click += OkButton_Click;
+            CancelButton.Click += CancelButton_Click;
+        }
+
+        private void CancelButton_Click(object sender, System.EventArgs e)
+        {
+            Close();
+        }
+
+        private void OkButton_Click(object sender, System.EventArgs e)
+        {
+            SaveConfig();
+            Close();
         }
 
         public _SettingsDialog(IConfigurationService configService)
@@ -31,7 +45,7 @@ public _SettingsDialog(IConfigurationService configService)
             _config = _configService.LoadConfiguration();
             _treeview = new ConfigurationTreeViewControl(_config);
 
-            this.splitContainer1.Panel1.Controls.Add(_treeview);
+            splitContainer1.Panel1.Controls.Add(_treeview);
             _treeview.Dock = DockStyle.Fill;
 
             var markers = _config.UserSettings.ToDoListSettings.ToDoMarkers.ToList();
@@ -54,16 +68,22 @@ private void _treeview_NodeSelected(object sender, TreeViewEventArgs e)
 
             if (e.Node.Text == "Rubberduck")
             {
+                TitleLabel.Text = RubberduckUI.SettingsCaption_GeneralSettings;
+                InstructionsLabel.Text = RubberduckUI.SettingsInstructions_GeneralSettings;
                 return; //do nothing
             }
 
             if (e.Node.Text == "Todo List")
             {
+                TitleLabel.Text = RubberduckUI.SettingsCaption_ToDoSettings;
+                InstructionsLabel.Text = RubberduckUI.SettingsInstructions_ToDoSettings;
                 controlToActivate = _todoView;
             }
 
             if (e.Node.Text == "Code Inpsections")
             {
+                TitleLabel.Text = RubberduckUI.SettingsCaption_CodeInspections;
+                InstructionsLabel.Text = RubberduckUI.SettingsInstructions_CodeInspections;
                 controlToActivate = new CodeInspectionControl(_config.UserSettings.CodeInspectionSettings.CodeInspections.ToList());
             }
 
@@ -73,22 +93,16 @@ private void _treeview_NodeSelected(object sender, TreeViewEventArgs e)
         private void ActivateControl(Control control)
         {
             control.Dock = DockStyle.Fill;
-            this.splitContainer1.Panel2.Controls.Clear();
-            this.splitContainer1.Panel2.Controls.Add(control);
+            splitContainer1.Panel2.Controls.Clear();
+            splitContainer1.Panel2.Controls.Add(control);
             _activeControl = control;
         }
 
-        private void SettingsDialog_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            SaveConfig();
-            MessageBox.Show("Changes to settings will take affect next time the application is started.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-
         private void SaveConfig()
         {
             _config.UserSettings.ToDoListSettings.ToDoMarkers = _todoView.TodoMarkers.ToArray();
             // The datagrid view of the CodeInspectionControl seems to keep the config magically in sync, so I don't manually do it here.
-            _configService.SaveConfiguration<Configuration>(_config);
+            _configService.SaveConfiguration(_config);
         }
     }
 }