Skip to content

Add a quit_all key to the default keymap #4921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/users/navigation_toolbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ 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
Close all plots **shift** + **w**
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
Expand Down
11 changes: 11 additions & 0 deletions lib/matplotlib/backend_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,16 @@ def trigger(self, sender, event, data=None):
Gcf.destroy_fig(self.figure)


class ToolQuitAll(ToolBase):
"""Tool to call the figure manager destroy method"""

description = 'Quit all figures'
default_keymap = rcParams['keymap.quit_all']

def trigger(self, sender, event, data=None):
Gcf.destroy_all()


class ToolEnableAllNavigation(ToolBase):
"""Tool to enable all axes for toolmanager interaction"""

Expand Down Expand Up @@ -860,6 +870,7 @@ def _mouse_move(self, event):
'grid': ToolGrid,
'fullscreen': ToolFullScreen,
'quit': ToolQuit,
'quit_all': ToolQuitAll,
'allnav': ToolEnableAllNavigation,
'nav': ToolEnableNavigation,
'xscale': ToolXScale,
Expand Down
3 changes: 2 additions & 1 deletion lib/matplotlib/rcsetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,8 @@ def validate_cycler(s):
'keymap.pan': [['p'], validate_stringlist],
'keymap.zoom': [['o'], validate_stringlist],
'keymap.save': [['s', 'ctrl+s'], validate_stringlist],
'keymap.quit': [['ctrl+w', 'cmd+w'], validate_stringlist],
'keymap.quit': [['ctrl+w', 'cmd+w', 'q'], validate_stringlist],
'keymap.quit_all': [['W', 'cmd+W', 'Q'], validate_stringlist],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok to leave this change as it is?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see mayor problem with that @tacaswell what do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need 3 keys for the same command. How about removing the "W" and "Q" and just having cmd+W?

'keymap.grid': [['g'], validate_stringlist],
'keymap.yscale': [['l'], validate_stringlist],
'keymap.xscale': [['k', 'L'], validate_stringlist],
Expand Down