Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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.

Sign up for GitHub

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

Add a quit_all key to the default keymap #4921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff0453
Add a quit_all key to the default keymap
Aug 14, 2015
f25ee91
remove 'quit_all' support from toolbar2
Dec 2, 2015
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
Next Next commit
Add a quit_all key to the default keymap
  • Loading branch information
Thomas Hisch committed Nov 27, 2015
commit eff04530de5bde8ecc31bfbf477ce2ed50578af2
3 changes: 2 additions & 1 deletion 3 doc/users/navigation_toolbar.rst
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions 4 lib/matplotlib/backend_bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2484,6 +2484,7 @@ def key_press_handler(event, canvas, toolbar=None):
zoom_keys = rcParams['keymap.zoom']
save_keys = rcParams['keymap.save']
quit_keys = rcParams['keymap.quit']
quit_all_keys = rcParams['keymap.quit_all']
grid_keys = rcParams['keymap.grid']
toggle_yscale_keys = rcParams['keymap.yscale']
toggle_xscale_keys = rcParams['keymap.xscale']
Expand All @@ -2500,6 +2501,9 @@ def key_press_handler(event, canvas, toolbar=None):
if event.key in quit_keys:
Gcf.destroy_fig(canvas.figure)

if event.key in quit_all_keys:
Copy link
Member

Choose a reason for hiding this comment

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

I think we are going to leave it only inside toolmanager, please remove it from backend_bases

Gcf.destroy_all()

if toolbar is not None:
# home or reset mnemonic (default key 'h', 'home' and 'r')
if event.key in home_keys:
Expand Down
11 changes: 11 additions & 0 deletions 11 lib/matplotlib/backend_tools.py
View file
Open in desktop
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 3 lib/matplotlib/rcsetup.py
View file
Open in desktop
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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.