Skip to content

Commit

Permalink
Added context menu option to reset IPython namespace. #2986
Browse files Browse the repository at this point in the history
  • Loading branch information
rosife committed Feb 19, 2016
1 parent abaf8a0 commit 5f49755
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 80 deletions.
11 changes: 6 additions & 5 deletions spyderlib/defaults/defaults-2.4.0.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ vertical_tabs = False
use_custom_margin = True

[quick_layouts]
place_holder =
place_holder =

[editor_appearance]
completion/font/family = ['Monospace', 'DejaVu Sans Mono', 'Consolas', 'Monaco', 'Bitstream Vera Sans Mono', 'Andale Mono', 'Liberation Mono', 'Courier New', 'Courier', 'monospace', 'Fixed', 'Terminal']
Expand Down Expand Up @@ -115,13 +115,13 @@ pylab = True
symbolic_math = False
pylab/inline/height = 4
open_ipython_at_startup = False
out_prompt =
out_prompt =
autocall = 0
in_prompt =
in_prompt =
shortcut = None
font/bold = False
startup/run_lines =
startup/run_file =
startup/run_lines =
startup/run_file =
pylab/inline/figure_format = 0
greedy_completer = False
pylab/inline/resolution = 72
Expand Down Expand Up @@ -312,6 +312,7 @@ editor/save/auto_set_to_basedir = False
editor/duplicate line = Shift+Alt+Up
editor/go to next file = Ctrl+Shift+Tab
console/clear line = Shift+Escape
console/reset namespace = Ctrl+R
_/switch to outline_explorer = Ctrl+Shift+O
editor/show/hide outline = Ctrl+Alt+O
_/fullscreen mode = F11
Expand Down
11 changes: 6 additions & 5 deletions spyderlib/defaults/defaults-3.0.0.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ vertical_tabs = False
use_custom_margin = True

[quick_layouts]
place_holder =
place_holder =

[editor_appearance]
completion/size = (300, 180)
Expand Down Expand Up @@ -97,13 +97,13 @@ pylab = True
symbolic_math = False
pylab/inline/height = 4
open_ipython_at_startup = True
out_prompt =
out_prompt =
autocall = 0
in_prompt =
in_prompt =
shortcut = None
font/bold = False
startup/run_lines =
startup/run_file =
startup/run_lines =
startup/run_file =
pylab/inline/figure_format = 0
greedy_completer = False
pylab/inline/resolution = 72
Expand Down Expand Up @@ -294,6 +294,7 @@ editor/save/auto_set_to_basedir = False
editor/duplicate line = Shift+Alt+Up
editor/go to next file = Ctrl+Shift+Tab
console/clear line = Shift+Escape
console/reset namespace = Ctrl+R
_/switch to outline_explorer = Ctrl+Shift+O
editor/show/hide outline = Ctrl+Alt+O
editor/blockcomment = Ctrl+4
Expand Down
Binary file added spyderlib/images/console/reset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5f49755

Please sign in to comment.