matplotlib · Stefan-Mitic · Mar 25, 2020 · Mar 26, 2020 · Mar 26, 2020 · Mar 27, 2020
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2670,7 +2670,8 @@ class NavigationToolbar2:
         ('Pan', 'Pan axes with left mouse, zoom with right', 'move', 'pan'),
         ('Zoom', 'Zoom to rectangle', 'zoom_to_rect', 'zoom'),
         ('Subplots', 'Configure subplots', 'subplots', 'configure_subplots'),
-        (None, None, None, None),
+        ("Customize", "Edit axis, curve and image parameters",
+            "editor_options", "edit_parameters"),
         ('Save', 'Save the figure', 'filesave', 'save_figure'),
       )
 

diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -18,7 +18,7 @@
 from matplotlib.backend_managers import ToolManager
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
-from matplotlib.widgets import SubplotTool
+from matplotlib.widgets import SubplotTool, AxesTool
 from . import _tkagg
 
 try:
@@ -585,6 +585,16 @@ def configure_subplots(self):
         canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
         window.grab_set()
 
+    def edit_parameters(self):
+        toolfig = Figure(figsize=(4, 5))
+        window = tk.Toplevel()
+        canvas = type(self.canvas)(toolfig, master=window)
+        toolfig.subplots_adjust(top=0.9)
+        canvas.tool = AxesTool(self.canvas.figure, toolfig)
+        canvas.draw()
+        canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
+        window.grab_set()
+
     def save_figure(self, *args):
         filetypes = self.canvas.get_supported_filetypes().copy()
         default_filetype = self.canvas.get_default_filetype()

diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -12,7 +12,7 @@
     StatusbarBase, TimerBase, ToolContainerBase, cursors)
 from matplotlib.backend_managers import ToolManager
 from matplotlib.figure import Figure
-from matplotlib.widgets import SubplotTool
+from matplotlib.widgets import SubplotTool, AxesTool
 
 try:
     import gi
@@ -565,12 +565,10 @@ def on_notify_filter(*args):
         except Exception as e:
             error_msg_gtk(str(e), parent=self)
 
-    def configure_subplots(self, button):
-        toolfig = Figure(figsize=(6, 3))
+    def _init_toolfig(self, title, size):
+        toolfig = Figure(figsize=size)
         canvas = type(self.canvas)(toolfig)
-        toolfig.subplots_adjust(top=0.9)
-        # Need to keep a reference to the tool.
-        _tool = SubplotTool(self.canvas.figure, toolfig)
+        # toolfig.subplots_adjust(top=0.9)
 
         w = int(toolfig.bbox.width)
         h = int(toolfig.bbox.height)
@@ -582,7 +580,7 @@ def configure_subplots(self, button):
             # we presumably already logged a message on the
             # failure of the main plot, don't keep reporting
             pass
-        window.set_title("Subplot Configuration Tool")
+        window.set_title(title)
         window.set_default_size(w, h)
         vbox = Gtk.Box()
         vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
@@ -592,6 +590,18 @@ def configure_subplots(self, button):
         canvas.show()
         vbox.pack_start(canvas, True, True, 0)
         window.show()
+        return toolfig
+
+    def configure_subplots(self, button):
+        toolfig = self._init_toolfig("Subplot Configuration Tool", (6, 3))
+        toolfig.subplots_adjust(top=0.9)
+        # Need to keep a reference to the tool.
+        _tool = SubplotTool(self.canvas.figure, toolfig)
+
+    def edit_parameters(self, button):
+        toolfig = self._init_toolfig("Figure options", (4, 5))
+        # Need to keep a reference to the tool.
+        _tool = AxesTool(self.canvas.figure, toolfig)
 
     def set_history_buttons(self):
         can_backward = self._nav_stack._pos > 0

diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -644,12 +644,12 @@ def set_window_title(self, title):
 class NavigationToolbar2QT(NavigationToolbar2, QtWidgets.QToolBar):
     message = QtCore.Signal(str)
 
-    toolitems = [*NavigationToolbar2.toolitems]
-    toolitems.insert(
-        # Add 'customize' action after 'subplots'
-        [name for name, *_ in toolitems].index("Subplots") + 1,
-        ("Customize", "Edit axis, curve and image parameters",
-         "qt4_editor_options", "edit_parameters"))
+    # toolitems = [*NavigationToolbar2.toolitems]
+    # toolitems.insert(
+    #     # Add 'customize' action after 'subplots'
+    #     [name for name, *_ in toolitems].index("Subplots") + 1,
+    #     ("Customize", "Edit axis, curve and image parameters",
+    #      "qt4_editor_options", "edit_parameters"))
 
     def __init__(self, canvas, parent, coordinates=True):
         """coordinates: should we show the coordinates on the right?"""

diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -25,7 +25,7 @@
 from matplotlib.figure import Figure
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
-from matplotlib.widgets import SubplotTool
+from matplotlib.widgets import SubplotTool, AxesTool
 
 import wx
 
@@ -1167,12 +1167,12 @@ def pan(self, *args):
         self.ToggleTool(self.wx_ids['Zoom'], False)
         NavigationToolbar2.pan(self, *args)
 
-    def configure_subplots(self, *args):
+    def _init_toolfig(self, title, size):
         global FigureManager  # placates pyflakes: created by @_Backend.export
-        frame = wx.Frame(None, -1, "Configure subplots")
+        frame = wx.Frame(None, -1, title)
         _set_frame_icon(frame)
 
-        toolfig = Figure((6, 3))
+        toolfig = Figure(size)
         canvas = type(self.canvas)(frame, -1, toolfig)
 
         # Create a figure manager to manage things
@@ -1184,8 +1184,18 @@ def configure_subplots(self, *args):
         sizer.Add(canvas, 1, wx.LEFT | wx.TOP | wx.GROW)
         frame.SetSizer(sizer)
         frame.Fit()
-        SubplotTool(self.canvas.figure, toolfig)
         frame.Show()
+        return toolfig
+
+    def configure_subplots(self, *args):
+        # Creates and shows toolfig using helper function
+        toolfig = self._init_toolfig("Configure subplots", (6, 3))
+        SubplotTool(self.canvas.figure, toolfig)
+
+    def edit_parameters(self, *args):
+        # Creates and shows toolfig using helper function
+        toolfig = self._init_toolfig("Figure options", (4, 5))
+        AxesTool(self.canvas.figure, toolfig)
 
     def save_figure(self, *args):
         # Fetch the required filename and file type.

diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -253,7 +253,7 @@ def apply_callback(data):
     data = _formlayout.fedit(
         datalist, title="Figure options", parent=parent,
         icon=QtGui.QIcon(
-            str(cbook._get_data_path('images', 'qt4_editor_options.svg'))),
+            str(cbook._get_data_path('images', 'editor_options.svg'))),
         apply=apply_callback)
     if data is not None:
         apply_callback(data)
diff --git a/lib/matplotlib/mpl-data/images/editor_options.gif b/lib/matplotlib/mpl-data/images/editor_options.gif
diff --git a/...ib/mpl-data/images/qt4_editor_options.pdf → ...lotlib/mpl-data/images/editor_options.pdf b/...ib/mpl-data/images/qt4_editor_options.pdf → ...lotlib/mpl-data/images/editor_options.pdf
diff --git a/...ib/mpl-data/images/qt4_editor_options.png → ...lotlib/mpl-data/images/editor_options.png b/...ib/mpl-data/images/qt4_editor_options.png → ...lotlib/mpl-data/images/editor_options.png
diff --git a/...ib/mpl-data/images/qt4_editor_options.svg → ...lotlib/mpl-data/images/editor_options.svg b/...ib/mpl-data/images/qt4_editor_options.svg → ...lotlib/mpl-data/images/editor_options.svg
diff --git a/...-data/images/qt4_editor_options_large.png → .../mpl-data/images/editor_options_large.png b/...-data/images/qt4_editor_options_large.png → .../mpl-data/images/editor_options_large.png
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -341,6 +341,32 @@ def test_slider_horizontal_vertical():
     assert_allclose(box.bounds, [0, 0, 1, 10/24])
 
 
+def test_dropdown_select():
+    ax = get_ax()
+    options = ['opt', 'opt', 'opt', 'opt', 'opt']
+    dropdown = widgets.Dropdown(ax, options, '')
+    def onselect(val):
+        ax._select_val = val
+    dropdown.on_select(onselect)
+    do_event(dropdown, '_click', xdata=0.1, ydata=0.01, button=1)
+    do_event(dropdown, '_click', xdata=0.1, ydata=0.01, button=1)
+    assert ax._select_val == 4
+
+
+def test_dropdown_init_index_invalid():
+    ax = get_ax()
+    options = ['opt', 'opt', 'opt', 'opt', 'opt']
+    with pytest.raises(ValueError):
+        widgets.Dropdown(ax, options, '', init_index=5)
+
+
+def test_dropdown_max_height_invalid():
+    ax = get_ax()
+    options = ['opt', 'opt', 'opt', 'opt', 'opt']
+    with pytest.raises(ValueError):
+        widgets.Dropdown(ax, options, '', max_height=-1)
+
+
 def check_polygon_selector(event_sequence, expected_result, selections_count):
     """Helper function to test Polygon Selector