Merge branch 'ChrisBeaumont-deprecations'

Author: efiring

lib/matplotlib/backends/backend_gtk.py

@@ -622,9 +622,7 @@ def full_screen_toggle(self):
     def _get_toolbar(self, canvas):
         # must be inited after the window, drawingArea and figure
         # attrs are set
-        if rcParams['toolbar'] == 'classic':
-            toolbar = NavigationToolbar (canvas, self.window)
-        elif rcParams['toolbar'] == 'toolbar2':
+        if rcParams['toolbar'] == 'toolbar2':
             toolbar = NavigationToolbar2GTK (canvas, self.window)
         else:
             toolbar = None
@@ -795,239 +793,6 @@ def _get_canvas(self, fig):
         return FigureCanvasGTK(fig)
 
 
-class NavigationToolbar(gtk.Toolbar):
-    """
-    Public attributes
-
-      canvas - the FigureCanvas  (gtk.DrawingArea)
-      win    - the gtk.Window
-
-    """
-    # list of toolitems to add to the toolbar, format is:
-    # text, tooltip_text, image, callback(str), callback_arg, scroll(bool)
-    toolitems = (
-        ('Left', 'Pan left with click or wheel mouse (bidirectional)',
-         gtk.STOCK_GO_BACK, 'panx', -1, True),
-        ('Right', 'Pan right with click or wheel mouse (bidirectional)',
-         gtk.STOCK_GO_FORWARD, 'panx', 1, True),
-        ('Zoom In X',
-         'Zoom In X (shrink the x axis limits) with click or wheel'
-         ' mouse (bidirectional)',
-         gtk.STOCK_ZOOM_IN, 'zoomx', 1, True),
-        ('Zoom Out X',
-         'Zoom Out X (expand the x axis limits) with click or wheel'
-         ' mouse (bidirectional)',
-         gtk.STOCK_ZOOM_OUT, 'zoomx', -1, True),
-        (None, None, None, None, None, None,),
-        ('Up', 'Pan up with click or wheel mouse (bidirectional)',
-         gtk.STOCK_GO_UP, 'pany', 1, True),
-        ('Down', 'Pan down with click or wheel mouse (bidirectional)',
-         gtk.STOCK_GO_DOWN, 'pany', -1, True),
-        ('Zoom In Y',
-         'Zoom in Y (shrink the y axis limits) with click or wheel'
-         ' mouse (bidirectional)',
-         gtk.STOCK_ZOOM_IN, 'zoomy', 1, True),
-        ('Zoom Out Y',
-         'Zoom Out Y (expand the y axis limits) with click or wheel'
-         ' mouse (bidirectional)',
-         gtk.STOCK_ZOOM_OUT, 'zoomy', -1, True),
-        (None, None, None, None, None, None,),
-        ('Save', 'Save the figure',
-         gtk.STOCK_SAVE, 'save_figure', None, False),
-        )
-
-    def __init__(self, canvas, window):
-        """
-        figManager is the FigureManagerGTK instance that contains the
-        toolbar, with attributes figure, window and drawingArea
-
-        """
-        gtk.Toolbar.__init__(self)
-
-        self.canvas = canvas
-        # Note: gtk.Toolbar already has a 'window' attribute
-        self.win    = window
-
-        self.set_style(gtk.TOOLBAR_ICONS)
-
-        self._create_toolitems_2_4()
-        self.update = self._update_2_4
-        self.fileselect = FileChooserDialog(
-            title='Save the figure',
-            parent=self.win,
-            filetypes=self.canvas.get_supported_filetypes(),
-            default_filetype=self.canvas.get_default_filetype())
-        self.show_all()
-        self.update()
-
-    def _create_toolitems_2_4(self):
-        # use the GTK+ 2.4 GtkToolbar API
-        iconSize = gtk.ICON_SIZE_SMALL_TOOLBAR
-        if not _new_tooltip_api:
-            self.tooltips = gtk.Tooltips()
-
-        for text, tooltip_text, image_num, callback, callback_arg, scroll \
-                in self.toolitems:
-            if text is None:
-                self.insert( gtk.SeparatorToolItem(), -1 )
-                continue
-            image = gtk.Image()
-            image.set_from_stock(image_num, iconSize)
-            tbutton = gtk.ToolButton(image, text)
-            self.insert(tbutton, -1)
-            if callback_arg:
-                tbutton.connect('clicked', getattr(self, callback),
-                                callback_arg)
-            else:
-                tbutton.connect('clicked', getattr(self, callback))
-            if scroll:
-                tbutton.connect('scroll_event', getattr(self, callback))
-            if _new_tooltip_api:
-                tbutton.set_tooltip_text(tooltip_text)
-            else:
-                tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
-
-        # Axes toolitem, is empty at start, update() adds a menu if >=2 axes
-        self.axes_toolitem = gtk.ToolItem()
-        self.insert(self.axes_toolitem, 0)
-        if _new_tooltip_api:
-            self.axes_toolitem.set_tooltip_text(
-                                'Select axes that controls affect')
-        else:
-            self.axes_toolitem.set_tooltip (
-                self.tooltips,
-                tip_text='Select axes that controls affect',
-                tip_private = 'Private')
-
-        align = gtk.Alignment (xalign=0.5, yalign=0.5, xscale=0.0, yscale=0.0)
-        self.axes_toolitem.add(align)
-
-        self.menubutton = gtk.Button ("Axes")
-        align.add (self.menubutton)
-
-        def position_menu (menu):
-            """Function for positioning a popup menu.
-            Place menu below the menu button, but ensure it does not go off
-            the bottom of the screen.
-            The default is to popup menu at current mouse position
-            """
-            x0, y0    = self.window.get_origin()
-            x1, y1, m = self.window.get_pointer()
-            x2, y2    = self.menubutton.get_pointer()
-            sc_h      = self.get_screen().get_height()  # requires GTK+ 2.2 +
-            w, h      = menu.size_request()
-
-            x = x0 + x1 - x2
-            y = y0 + y1 - y2 + self.menubutton.allocation.height
-            y = min(y, sc_h - h)
-            return x, y, True
-
-        def button_clicked (button, data=None):
-            self.axismenu.popup (None, None, position_menu, 0,
-                                 gtk.get_current_event_time())
-
-        self.menubutton.connect ("clicked", button_clicked)
-
-
-    def _update_2_4(self):
-        # for GTK+ 2.4+
-        # called by __init__() and FigureManagerGTK
-
-        self._axes = self.canvas.figure.axes
-
-        if len(self._axes) >= 2:
-            self.axismenu = self._make_axis_menu()
-            self.menubutton.show_all()
-        else:
-            self.menubutton.hide()
-
-        self.set_active(range(len(self._axes)))
-
-
-    def _make_axis_menu(self):
-        # called by self._update*()
-
-        def toggled(item, data=None):
-            if item == self.itemAll:
-                for item in items: item.set_active(True)
-            elif item == self.itemInvert:
-                for item in items:
-                    item.set_active(not item.get_active())
-
-            ind = [i for i,item in enumerate(items) if item.get_active()]
-            self.set_active(ind)
-
-        menu = gtk.Menu()
-
-        self.itemAll = gtk.MenuItem("All")
-        menu.append(self.itemAll)
-        self.itemAll.connect("activate", toggled)
-
-        self.itemInvert = gtk.MenuItem("Invert")
-        menu.append(self.itemInvert)
-        self.itemInvert.connect("activate", toggled)
-
-        items = []
-        for i in range(len(self._axes)):
-            item = gtk.CheckMenuItem("Axis %d" % (i+1))
-            menu.append(item)
-            item.connect("toggled", toggled)
-            item.set_active(True)
-            items.append(item)
-
-        menu.show_all()
-        return menu
-
-
-    def set_active(self, ind):
-        self._ind = ind
-        self._active = [ self._axes[i] for i in self._ind ]
-
-    def panx(self, button, direction):
-        'panx in direction'
-
-        for a in self._active:
-            a.xaxis.pan(direction)
-        self.canvas.draw()
-        return True
-
-    def pany(self, button, direction):
-        'pany in direction'
-        for a in self._active:
-            a.yaxis.pan(direction)
-        self.canvas.draw()
-        return True
-
-    def zoomx(self, button, direction):
-        'zoomx in direction'
-        for a in self._active:
-            a.xaxis.zoom(direction)
-        self.canvas.draw()
-        return True
-
-    def zoomy(self, button, direction):
-        'zoomy in direction'
-        for a in self._active:
-            a.yaxis.zoom(direction)
-        self.canvas.draw()
-        return True
-
-    def get_filechooser(self):
-        return FileChooserDialog(
-            title='Save the figure',
-            parent=self.win,
-            filetypes=self.canvas.get_supported_filetypes(),
-            default_filetype=self.canvas.get_default_filetype())
-
-    def save_figure(self, *args):
-        fname, format = self.get_filechooser().get_filename_from_user()
-        if fname:
-            try:
-                self.canvas.print_figure(fname, format=format)
-            except Exception as e:
-                error_msg_gtk(str(e), parent=self)
-
-
 class FileChooserDialog(gtk.FileChooserDialog):
     """GTK+ 2.4 file selector which presents the user with a menu
     of supported image formats