fixed NRE in settings dialog when a parent node is selected; removed …

…redundant label in "general settings" tab
retailcoder · Jun 2, 2015 · 237b9df · 237b9df
1 parent 11f168d
commit 237b9df
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.fr.resx b/RetailCoder.VBE/UI/RubberduckUI.fr.resx
@@ -200,7 +200,7 @@
     <value>Configuration des niveaux de sévérité des inspections. Utiliser "DoNotShow" pour désactiver une inspection.</value>
   </data>
   <data name="SettingsInstructions_GeneralSettings" xml:space="preserve">
-    <value>Les modifications prendront effet après que Rubberduck ait été rechargé.</value>
+    <value>Cliquez [Ok] pour appliquer les modifications, ou [Annuler] pour conserver la configuration actuelle.</value>
   </data>
   <data name="SettingsInstructions_ToDoSettings" xml:space="preserve">
     <value>Configurer les marqueurs à reconnaître dans les commentaires.</value>

diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -200,7 +200,7 @@
     <value>Configure inspection severity. Use "DoNotShow" to disable an inspection.</value>
   </data>
   <data name="SettingsInstructions_GeneralSettings" xml:space="preserve">
-    <value>Changes will be applied after Rubberduck is reloaded.</value>
+    <value>Click [Ok] to close the window and apply changes, or [Cancel] to discard them.</value>
   </data>
   <data name="SettingsInstructions_ToDoSettings" xml:space="preserve">
     <value>Configure markers to be recognized in comments.</value>

diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.Designer.cs b/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.Designer.cs
diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs b/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs
@@ -13,7 +13,7 @@ public GeneralSettingsControl()
         {
             InitializeComponent();
             TitleLabel.Text = RubberduckUI.SettingsCaption_GeneralSettings;
-            InstructionsLabel.Text = RubberduckUI.SettingsInstructions_GeneralSettings;
+            //InstructionsLabel.Text = RubberduckUI.SettingsInstructions_GeneralSettings;
             LanguageLabel.Text = RubberduckUI.Settings_LanguageLabel;
             resetSettings.Text = RubberduckUI.Settings_ResetSettings;
 

diff --git a/RetailCoder.VBE/UI/Settings/SettingsDialog.cs b/RetailCoder.VBE/UI/Settings/SettingsDialog.cs
@@ -110,6 +110,11 @@ private IEnumerable<CodeInspectionSetting> GetInspectionSettings(CodeInspectionT
         private void _treeview_NodeSelected(object sender, TreeViewEventArgs e)
         {
             Control controlToActivate = null;
+            if (e.Node == null)
+            {
+                // a "parent" node is selected. todo: create a page for "parent" nodes.
+                return;
+            }
 
             if (e.Node.Text == "Rubberduck")
             {