Apply suggestions

spyder/config/main.py

@@ -172,11 +172,6 @@
               'dataframe_format': '.6g',  # No percent sign to avoid problems
                                           # with ConfigParser's interpolation
               'excluded_names': EXCLUDED_NAMES,
-              'exclude_private_preferences': True,
-              'exclude_uppercase_preferences': False,
-              'exclude_capitalized_preferences': False,
-              'exclude_unsupported_preferences': False,
-              'exclude_callables_and_modules_preferences': True,
               'exclude_private': True,
               'exclude_uppercase': False,
               'exclude_capitalized': False,
@@ -186,7 +181,7 @@
               'minmax': False,
               'show_callable_attributes': True,
               'show_special_attributes': False,
-              'filter_on': False
+              'filter_on': True
              }),
             ('debugger',
              {

spyder/plugins/variableexplorer/confpage.py

@@ -19,15 +19,15 @@ class VariableExplorerConfigPage(PluginConfigPage):
     def setup_page(self):
         filter_group = QGroupBox(_("Filter"))
         filter_data = [
-            ('exclude_private_preferences',
+            ('exclude_private',
              _("Exclude private references")),
-            ('exclude_capitalized_preferences',
+            ('exclude_capitalized',
              _("Exclude capitalized references")),
-            ('exclude_uppercase_preferences',
+            ('exclude_uppercase',
              _("Exclude all-uppercase references")),
-            ('exclude_unsupported_preferences',
+            ('exclude_unsupported',
              _("Exclude unsupported data types")),
-            ('exclude_callables_and_modules_preferences',
+            ('exclude_callables_and_modules',
              _("Exclude callables and modules"))
         ]
         filter_boxes = [self.create_checkbox(text, option)

spyder/plugins/variableexplorer/widgets/main_widget.py

@@ -126,17 +126,15 @@ def setup(self):
             text=_("Exclude private variables"),
             tip=_("Exclude variables that start with an underscore"),
             toggled=True,
-            option='exclude_private',
-            initial=self.get_conf('exclude_private_preferences'),
+            option=self.get_conf('exclude_private'),
         )
 
         self.exclude_uppercase_action = self.create_action(
             VariableExplorerWidgetActions.ToggleExcludeUpperCase,
             text=_("Exclude all-uppercase variables"),
             tip=_("Exclude variables whose name is uppercase"),
             toggled=True,
-            option='exclude_uppercase',
-            initial=self.get_conf('exclude_uppercase_preferences'),
+            option=self.get_conf('exclude_uppercase'),
         )
 
         self.exclude_capitalized_action = self.create_action(
@@ -145,8 +143,7 @@ def setup(self):
             tip=_("Exclude variables whose name starts with a capital "
                   "letter"),
             toggled=True,
-            option='exclude_capitalized',
-            initial=self.get_conf('exclude_capitalized_preferences'),
+            option=self.get_conf('exclude_capitalized'),
         )
 
         self.exclude_unsupported_action = self.create_action(
@@ -155,8 +152,7 @@ def setup(self):
             tip=_("Exclude references to data types that don't have "
                   "an specialized viewer or can't be edited."),
             toggled=True,
-            option='exclude_unsupported',
-            initial=self.get_conf('exclude_unsupported_preferences'),
+            option=self.get_conf('exclude_unsupported'),
         )
 
         self.exclude_callables_and_modules_action = self.create_action(
@@ -165,8 +161,7 @@ def setup(self):
             tip=_("Exclude references to functions, modules and "
                   "any other callable."),
             toggled=True,
-            option='exclude_callables_and_modules',
-            initial=self.get_conf('exclude_callables_and_modules_preferences')
+            option=self.get_conf('exclude_callables_and_modules')
         )
 
         self.show_minmax_action = self.create_action(
@@ -453,20 +448,6 @@ def switch_widget(self, nsb, old_nsb):
     # ---- Public API
     # ------------------------------------------------------------------------
 
-    def change_filter_state(self, value):
-        """Handle the change of the filter state."""
-        self.filter_on = not self.filter_on
-        self.filter_button.setChecked(self.filter_on)
-        self.filter_button.setToolTip(_("Filter variables"))
-        self.filter_variables()
-
-    def filter_variables(self):
-        self.exclude_private_action.setEnabled(self.filter_on)
-        self.exclude_uppercase_action.setEnabled(self.filter_on)
-        self.exclude_capitalized_action.setEnabled(self.filter_on)
-        self.exclude_unsupported_action.setEnabled(self.filter_on)
-        self.exclude_callables_and_modules_action.setEnabled(self.filter_on)
-
     def create_new_widget(self, shellwidget):
         """Create new NamespaceBrowser."""
         nsb = NamespaceBrowser(self)
@@ -631,3 +612,17 @@ def _set_actions_and_menus(self, nsb):
         # several places in CollectionsEditor.
         editor.insert_action_above = QAction()
         editor.insert_action_below = QAction()
+
+    def _change_filter_state(self, value):
+        """Handle the change of the filter state."""
+        self.filter_on = not self.filter_on
+        self.filter_button.setChecked(self.filter_on)
+        self.filter_button.setToolTip(_("Filter variables"))
+        self.filter_variables()
+
+    def _enable_filter_actions(self):
+        self.exclude_private_action.setEnabled(self.filter_on)
+        self.exclude_uppercase_action.setEnabled(self.filter_on)
+        self.exclude_capitalized_action.setEnabled(self.filter_on)
+        self.exclude_unsupported_action.setEnabled(self.filter_on)
+        self.exclude_callables_and_modules_action.setEnabled(self.filter_on)