rename mpl_connect

fariza · fariza · commit dd66b576fd95 · 2015-04-07T15:12:23.000-04:00
diff --git a/examples/user_interfaces/navigation.py b/examples/user_interfaces/navigation.py
@@ -39,8 +39,6 @@ def trigger(self, *args, **kwargs):
 class CopyToolGTK3(ToolBase):
     keymap = 'ctrl+c'
     description = 'Copy canvas'
-    # It is not added to the toolbar as a button
-    intoolbar = False
 
     def trigger(self, *args, **kwargs):
         from gi.repository import Gtk, Gdk
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -3279,7 +3279,7 @@ def __init__(self, manager):
         self.keypresslock = widgets.LockDraw()
         self.messagelock = widgets.LockDraw()
 
-    def mpl_connect(self, s, func):
+    def nav_connect(self, s, func):
         """Connect event with string *s* to *func*.
 
         Parameters
@@ -3304,14 +3304,14 @@ def func(event)
         """
         return self._callbacks.connect(s, func)
 
-    def mpl_disconnect(self, cid):
+    def nav_disconnect(self, cid):
         """Disconnect callback id cid
 
         Example usage::
 
-            cid = navigation.mpl_connect('tool_trigger_zoom', on_press)
+            cid = navigation.nav_connect('tool_trigger_zoom', on_press)
             #...later
-            navigation.mpl_disconnect(cid)
+            navigation.nav_disconnect(cid)
         """
         return self._callbacks.disconnect(cid)
 
@@ -3603,9 +3603,9 @@ def __init__(self, manager):
         self.manager = manager
         self.navigation = manager.navigation
 
-        self.navigation.mpl_connect('tool_message_event', self._message_cbk)
-        self.navigation.mpl_connect('tool_added_event', self._add_tool_cbk)
-        self.navigation.mpl_connect('tool_removed_event',
+        self.navigation.nav_connect('tool_message_event', self._message_cbk)
+        self.navigation.nav_connect('tool_added_event', self._add_tool_cbk)
+        self.navigation.nav_connect('tool_removed_event',
                                     self._remove_tool_cbk)
 
     def _message_cbk(self, event):
@@ -3633,7 +3633,7 @@ def _add_tool_cbk(self, event):
                           event.tool.description,
                           toggle)
         if toggle:
-            self.navigation.mpl_connect('tool_trigger_%s' % event.tool.name,
+            self.navigation.nav_connect('tool_trigger_%s' % event.tool.name,
                                         self._tool_triggered_cbk)
 
     def _remove_tool_cbk(self, event):
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -183,7 +183,7 @@ def __init__(self, *args, **kwargs):
         self._cursor = None
         self._default_cursor = cursors.POINTER
         self._last_cursor = self._default_cursor
-        self.navigation.mpl_connect('tool_added_event', self._add_tool_cbk)
+        self.navigation.nav_connect('tool_added_event', self._add_tool_cbk)
 
         # process current tools
         for tool in self.navigation.tools.values():
@@ -200,7 +200,7 @@ def _tool_trigger_cbk(self, event):
     # If the tool is toggleable, set the cursor when the tool is triggered
     def _add_tool(self, tool):
         if getattr(tool, 'cursor', None) is not None:
-            self.navigation.mpl_connect('tool_trigger_%s' % tool.name,
+            self.navigation.nav_connect('tool_trigger_%s' % tool.name,
                                         self._tool_trigger_cbk)
 
     # If tool is added, process it
