Variable Explorer: Restore missing buttons in its Options menu

This is a regression from PR #2584
spyder-ide · Oct 11, 2015 · d020c1c · d020c1c
1 parent 653b2a3
commit d020c1c
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/spyderlib/widgets/varexp/namespacebrowser.py b/spyderlib/widgets/varexp/namespacebrowser.py
@@ -139,8 +139,17 @@ def setup(self, check_all=None, exclude_private=None,
                             show_image_func=self.show_image)
         self.editor.sig_option_changed.connect(self.sig_option_changed.emit)
         self.editor.sig_files_dropped.connect(self.import_data)
-
-        # Menu
+
+        # Setup layout
+        layout = QVBoxLayout()
+        blayout = QHBoxLayout()
+        toolbar = self.setup_toolbar(exclude_private, exclude_uppercase,
+                                     exclude_capitalized, exclude_unsupported,
+                                     autorefresh)
+        for widget in toolbar:
+            blayout.addWidget(widget)
+
+        # Options menu
         options_button = create_toolbutton(self, text=_('Options'),
                                            icon=ima.icon('tooloptions'))
         options_button.setPopupMode(QToolButton.InstantPopup)
@@ -155,14 +164,6 @@ def setup(self, check_all=None, exclude_private=None,
         add_actions(menu, actions)
         options_button.setMenu(menu)
 
-        # Setup layout
-        layout = QVBoxLayout()
-        blayout = QHBoxLayout()
-        toolbar = self.setup_toolbar(exclude_private, exclude_uppercase,
-                                     exclude_capitalized, exclude_unsupported,
-                                     autorefresh)
-        for widget in toolbar:
-            blayout.addWidget(widget)
         blayout.addStretch()
         blayout.addWidget(options_button)
         layout.addLayout(blayout)