Merge pull request #5626 from mdboom/new-icons

ENH: New toolbar icons Conflicts: doc/users/navigation_toolbar.rst - kept new wording lib/matplotlib/backends/backend_qt5.py - wording + indentation change which is now correct
matplotlib · jenshnielsen · Jun 8, 2016 · May 29, 2016 · May 29, 2016 · May 30, 2016
commit 8356fc216712496d85fe7fa5782aed87d0b049d5
diff --git a/doc/_static/toolbar.png b/doc/_static/toolbar.png
diff --git a/doc/users/navigation_toolbar.rst b/doc/users/navigation_toolbar.rst
@@ -9,11 +9,11 @@ All figure windows come with a navigation toolbar, which can be used
 to navigate through the data set.  Here is a description of each of
 the buttons at the bottom of the toolbar
 
-.. image:: ../../lib/matplotlib/mpl-data/images/home.png
+.. image:: ../../lib/matplotlib/mpl-data/images/home_large.png
 
-.. image:: ../../lib/matplotlib/mpl-data/images/back.png
+.. image:: ../../lib/matplotlib/mpl-data/images/back_large.png
 
-.. image:: ../../lib/matplotlib/mpl-data/images/forward.png
+.. image:: ../../lib/matplotlib/mpl-data/images/forward_large.png
 
 The ``Forward`` and ``Back`` buttons
     These are akin to the web browser forward and back buttons.  They
@@ -26,7 +26,7 @@ The ``Forward`` and ``Back`` buttons
     ``Back``, think web browser where data views are web pages.  Use
     the pan and zoom to rectangle to define new views.
 
-.. image:: ../../lib/matplotlib/mpl-data/images/move.png
+.. image:: ../../lib/matplotlib/mpl-data/images/move_large.png
 
 The ``Pan/Zoom`` button
     This button has two modes: pan and zoom.  Click the toolbar button
@@ -50,7 +50,7 @@ The ``Pan/Zoom`` button
     mouse button.  The radius scale can be zoomed in and out using the
     right mouse button.
 
-.. image:: ../../lib/matplotlib/mpl-data/images/zoom_to_rect.png
+.. image:: ../../lib/matplotlib/mpl-data/images/zoom_to_rect_large.png
 
 The ``Zoom-to-rectangle`` button
     Click this toolbar button to activate this mode.  Put your mouse
@@ -61,14 +61,15 @@ The ``Zoom-to-rectangle`` button
     with the right button, which will place your entire axes in the
     region defined by the zoom out rectangle.
 
-.. image:: ../../lib/matplotlib/mpl-data/images/subplots.png
+.. image:: ../../lib/matplotlib/mpl-data/images/subplots_large.png
 
 The ``Subplot-configuration`` button
-    Use this tool to configure the parameters of the subplot: the
-    left, right, top, bottom, space between the rows and space between
-    the columns.
+    Use this tool to configure the appearance of the subplot:
+    you can stretch or compress the left, right, top, or bottom
+    side of the subplot, or the space between the rows or
+    space between the columns.
 
-.. image:: ../../lib/matplotlib/mpl-data/images/filesave.png
+.. image:: ../../lib/matplotlib/mpl-data/images/filesave_large.png
 
 The ``Save`` button
     Click this button to launch a file save dialog.  You can save
@@ -94,7 +95,7 @@ Zoom-to-rect                       **o**
 Save                               **ctrl** + **s**
 Toggle fullscreen                  **ctrl** + **f**
 Close plot                         **ctrl** + **w**
-Constrain pan/zoom to x axis       hold **x** when panning/zooming with mouse 
+Constrain pan/zoom to x axis       hold **x** when panning/zooming with mouse
 Constrain pan/zoom to y axis       hold **y** when panning/zooming with mouse
 Preserve aspect ratio              hold **CONTROL** when panning/zooming with mouse
 Toggle grid                        **g** when mouse is over an axes
@@ -135,8 +136,3 @@ example code for GTK::
 
     win.show_all()
     gtk.main()
-
-
-
-
-
diff --git a/examples/pylab_examples/matplotlib_icon.py b/examples/pylab_examples/matplotlib_icon.py
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2732,8 +2732,8 @@ class NavigationToolbar2(object):
         (None, None, None, None),
         ('Pan', 'Pan axes with left mouse, zoom with right', 'move', 'pan'),
         ('Zoom', 'Zoom to rectangle', 'zoom_to_rect', 'zoom'),
-        (None, None, None, None),
         ('Subplots', 'Configure subplots', 'subplots', 'configure_subplots'),
+        (None, None, None, None),
         ('Save', 'Save the figure', 'filesave', 'save_figure'),
       )
 

diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -870,8 +870,7 @@ def _mouse_move(self, event):
 """Default tools"""
 
 default_toolbar_tools = [['navigation', ['home', 'back', 'forward']],
-                         ['zoompan', ['pan', 'zoom']],
-                         ['layout', ['subplots']],
+                         ['zoompan', ['pan', 'zoom', 'subplots']],
                          ['io', ['save']]]
 """Default tools in the toolbar"""
 

diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -28,7 +28,8 @@
 except ImportError:
     figureoptions = None
 
-from .qt_compat import QtCore, QtGui, QtWidgets, _getSaveFileName, __version__
+from .qt_compat import (QtCore, QtGui, QtWidgets, _getSaveFileName,
+                        __version__, is_pyqt5)
 from matplotlib.backends.qt_editor.formsubplottool import UiSubplotTool
 
 backend_version = __version__
@@ -142,6 +143,9 @@ def _create_qApp():
         else:
             qApp = app
 
+    if is_pyqt5():
+        qApp.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
+
 
 class Show(ShowBase):
     def mainloop(self):
@@ -567,6 +571,8 @@ def __init__(self, canvas, parent, coordinates=True):
         NavigationToolbar2.__init__(self, canvas)
 
     def _icon(self, name):
+        if is_pyqt5():
+            name = name.replace('.png', '_large.png')
         return QtGui.QIcon(os.path.join(self.basedir, name))
 
     def _init_toolbar(self):
@@ -583,11 +589,10 @@ def _init_toolbar(self):
                     a.setCheckable(True)
                 if tooltip_text is not None:
                     a.setToolTip(tooltip_text)
-
-        if figureoptions is not None:
-            a = self.addAction(self._icon("qt4_editor_options.png"),
-                               'Customize', self.edit_parameters)
-            a.setToolTip('Edit curves line and axes parameters')
+                if figureoptions is not None and text == 'Subplots':
+                    a = self.addAction(self._icon("qt4_editor_options.png"),
+                                       'Customize', self.edit_parameters)
+                    a.setToolTip('Edit axis, curve and image parameters')
 
         self.buttons = {}
 
@@ -607,6 +612,14 @@ def _init_toolbar(self):
         # reference holder for subplots_adjust window
         self.adj_window = None
 
+        # Esthetic adjustments - we need to set these explicitly in PyQt5
+        # otherwise the layout looks different - but we don't want to set it if
+        # not using HiDPI icons otherwise they look worse than before.
+        if is_pyqt5():
+            self.setIconSize(QtCore.QSize(24, 24))
+            self.layout().setSpacing(12)
+            self.setMinimumHeight(48)
+
     if figureoptions is not None:
         def edit_parameters(self):
             allaxes = self.canvas.figure.get_axes()

diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -97,7 +97,7 @@ def new_figure_manager_given_figure(num, figure):
         # doesn't allow colour icons on linux systems, but tk >=8.5 has a iconphoto
         # command which we call directly. Source:
         # http://mail.python.org/pipermail/tkinter-discuss/2006-November/000954.html
-        icon_fname = os.path.join(rcParams['datapath'], 'images', 'matplotlib.gif')
+        icon_fname = os.path.join(rcParams['datapath'], 'images', 'matplotlib.ppm')
         icon_img = Tk.PhotoImage(file=icon_fname)
         try:
             window.tk.call('wm', 'iconphoto', window._w, icon_img)

diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -192,3 +192,7 @@ def _getSaveFileName(*args, **kwargs):
 
     '''
     QtWidgets = QtGui
+
+
+def is_pyqt5():
+    return QT_API == QT_API_PYQT5
diff --git a/lib/matplotlib/mpl-data/images/back.pdf b/lib/matplotlib/mpl-data/images/back.pdf
diff --git a/lib/matplotlib/mpl-data/images/back.png b/lib/matplotlib/mpl-data/images/back.png
diff --git a/lib/matplotlib/mpl-data/images/back.ppm b/lib/matplotlib/mpl-data/images/back.ppm
diff --git a/lib/matplotlib/mpl-data/images/back.svg b/lib/matplotlib/mpl-data/images/back.svg
diff --git a/lib/matplotlib/mpl-data/images/back_large.png b/lib/matplotlib/mpl-data/images/back_large.png
diff --git a/lib/matplotlib/mpl-data/images/back_large.ppm b/lib/matplotlib/mpl-data/images/back_large.ppm
diff --git a/lib/matplotlib/mpl-data/images/filesave.pdf b/lib/matplotlib/mpl-data/images/filesave.pdf
diff --git a/lib/matplotlib/mpl-data/images/filesave.png b/lib/matplotlib/mpl-data/images/filesave.png
diff --git a/lib/matplotlib/mpl-data/images/filesave.ppm b/lib/matplotlib/mpl-data/images/filesave.ppm