[Idle-dev] CVS: idle Bindings.py,1.15,1.16 PyShell.py,1.52,1.53 config-keys.def,1.17,1.18 configHandler.py,1.29,1.30
Kurt B. Kaiser
kbk@users.sourceforge.net
Tue, 21 Jan 2003 16:23:26 -0800
Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv3459
Modified Files:
Bindings.py PyShell.py config-keys.def configHandler.py
Log Message:
M Bindings.py
M PyShell.py
M config-keys.def
M configHandler.py
1. Clear any un-entered characters from input line before printing the
restart boundary.
2. Restore the Debug menu: There are now both Shell and Debug menus.
3. Add Control-F6 keybinding to Restart Shell.
4. Clarify PyShell.cancel_check() comment.
5. Update doc string for Bindings.py and re-format the file slightly.
Index: Bindings.py
===================================================================
RCS file: /cvsroot/idlefork/idle/Bindings.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Bindings.py 14 Jan 2003 22:03:31 -0000 1.15
--- Bindings.py 22 Jan 2003 00:23:22 -0000 1.16
***************
*** 1,9 ****
! # This file defines the menu contents and key bindings. Note that
! # there is additional configuration information in the EditorWindow
! # class (and subclasses): the menus are created there based on the
! # menu_specs (class) variable, and menus not created are silently
! # skipped by the code here. This makes it possible to define the
! # Debug menu here, which is only present in the PythonShell window.
import sys
from configHandler import idleConf
--- 1,12 ----
! """Define the menu contents, hotkeys, and event bindings.
+ There is additional configuration information in the EditorWindow class (and
+ subclasses): the menus are created there based on the menu_specs (class)
+ variable, and menus not created are silently skipped in the code here. This
+ makes it possible, for example, to define a Debug menu which is only present in
+ the PythonShell window, and a Format menu which is only present in the Editor
+ windows.
+
+ """
import sys
from configHandler import idleConf
***************
*** 44,73 ****
]),
('format', [
! ('_Indent Region', '<<indent-region>>'),
! ('_Dedent Region', '<<dedent-region>>'),
! ('Comment _Out Region', '<<comment-region>>'),
! ('U_ncomment Region', '<<uncomment-region>>'),
! ('Tabify Region', '<<tabify-region>>'),
! ('Untabify Region', '<<untabify-region>>'),
! ('Toggle Tabs', '<<toggle-tabs>>'),
! ('New Indent Width', '<<change-indentwidth>>'),
! ]),
! ('run',[
('Python Shell', '<<open-python-shell>>'),
! ]),
('shell', [
('_View Last Restart', '<<view-restart>>'),
('_Restart Shell', '<<restart-shell>>'),
! None,
('_Go to File/Line', '<<goto-file-line>>'),
('!_Debugger', '<<toggle-debugger>>'),
('_Stack Viewer', '<<open-stack-viewer>>'),
! ('!_Auto-open Stack Viewer', '<<toggle-jit-stack-viewer>>' ),
! ]),
('options', [
('_Configure IDLE...', '<<open-config-dialog>>'),
None,
('Revert to _Default Settings', '<<revert-all-settings>>'),
! ]),
('help', [
('_About IDLE', '<<about-idle>>'),
--- 47,77 ----
]),
('format', [
! ('_Indent Region', '<<indent-region>>'),
! ('_Dedent Region', '<<dedent-region>>'),
! ('Comment _Out Region', '<<comment-region>>'),
! ('U_ncomment Region', '<<uncomment-region>>'),
! ('Tabify Region', '<<tabify-region>>'),
! ('Untabify Region', '<<untabify-region>>'),
! ('Toggle Tabs', '<<toggle-tabs>>'),
! ('New Indent Width', '<<change-indentwidth>>'),
! ]),
! ('run', [
('Python Shell', '<<open-python-shell>>'),
! ]),
('shell', [
('_View Last Restart', '<<view-restart>>'),
('_Restart Shell', '<<restart-shell>>'),
! ]),
! ('debug', [
('_Go to File/Line', '<<goto-file-line>>'),
('!_Debugger', '<<toggle-debugger>>'),
('_Stack Viewer', '<<open-stack-viewer>>'),
! ('!_Auto-open Stack Viewer', '<<toggle-jit-stack-viewer>>'),
! ]),
('options', [
('_Configure IDLE...', '<<open-config-dialog>>'),
None,
('Revert to _Default Settings', '<<revert-all-settings>>'),
! ]),
('help', [
('_About IDLE', '<<about-idle>>'),
***************
*** 76,80 ****
('_IDLE Help', '<<help>>'),
('Python _Docs', '<<python-docs>>'),
! ]),
]
--- 80,84 ----
('_IDLE Help', '<<help>>'),
('Python _Docs', '<<python-docs>>'),
! ]),
]
Index: PyShell.py
===================================================================
RCS file: /cvsroot/idlefork/idle/PyShell.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** PyShell.py 4 Jan 2003 01:43:53 -0000 1.52
--- PyShell.py 22 Jan 2003 00:23:23 -0000 1.53
***************
*** 369,372 ****
--- 369,373 ----
# annotate restart in shell window and mark it
console = self.tkconsole
+ console.text.delete("iomark", "end-1c")
halfbar = ((int(console.width) - 16) // 2) * '='
console.write(halfbar + ' RESTART ' + halfbar)
***************
*** 660,663 ****
--- 661,665 ----
("edit", "_Edit"),
("shell", "_Shell"),
+ ("debug", "_Debug"),
("options", "_Options"),
("windows", "_Windows"),
***************
*** 1008,1013 ****
# and interrupt execution at any time.
# This slows execution down quite a bit, so you may want to
! # disable this (by not calling settrace() in runcode() above)
! # for full-bore (uninterruptable) speed.
# XXX This should become a user option.
if self.canceled:
--- 1010,1015 ----
# and interrupt execution at any time.
# This slows execution down quite a bit, so you may want to
! # disable this (by not calling settrace() in beginexecuting() and
! # endexecuting() for full-bore (uninterruptable) speed.)
# XXX This should become a user option.
if self.canceled:
Index: config-keys.def
===================================================================
RCS file: /cvsroot/idlefork/idle/config-keys.def,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** config-keys.def 16 Jan 2003 21:40:21 -0000 1.17
--- config-keys.def 22 Jan 2003 00:23:23 -0000 1.18
***************
*** 24,27 ****
--- 24,28 ----
interrupt-execution=<Control-Key-c>
view-restart=<Key-F6>
+ restart-shell=<Control-Key-F6>
open-class-browser=<Alt-Key-c> <Meta-Key-c>
open-module=<Alt-Key-m> <Meta-Key-m>
***************
*** 70,73 ****
--- 71,75 ----
interrupt-execution=<Control-Key-c>
view-restart=<Key-F6>
+ restart-shell=<Control-Key-F6>
open-class-browser=<Control-Key-x><Control-Key-b>
open-module=<Control-Key-x><Control-Key-m>
***************
*** 120,123 ****
--- 122,126 ----
interrupt-execution=<Control-Key-c>
view-restart=<Key-F6>
+ restart-shell=<Control-Key-F6>
open-class-browser=<Command-Key-b>
open-module=<Command-Key-m>
Index: configHandler.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configHandler.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** configHandler.py 14 Jan 2003 22:03:31 -0000 1.29
--- configHandler.py 22 Jan 2003 00:23:23 -0000 1.30
***************
*** 523,526 ****
--- 523,527 ----
'<<interrupt-execution>>': ['<Control-c>'],
'<<view-restart>>': ['<F6>'],
+ '<<restart-shell>>': ['<Control-F6>'],
'<<open-class-browser>>': ['<Alt-c>'],
'<<open-module>>': ['<Alt-m>'],