summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-10-03 02:12:39 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-10-03 02:12:39 (GMT)
commit4401760a6cf1963d5315fcd578fd6637970d32a2 (patch)
tree2407630bcef8fe6abbafcaf606d074d67b0472ec /Lib/idlelib
parentbe7c1638e2bc837125efc18b7e9853caa7dc95bf (diff)
parenta8aa4d5fb789cbc8ed7c1121701b19709968ccdb (diff)
downloadcpython-4401760a6cf1963d5315fcd578fd6637970d32a2.zip
cpython-4401760a6cf1963d5315fcd578fd6637970d32a2.tar.gz
cpython-4401760a6cf1963d5315fcd578fd6637970d32a2.tar.bz2
Merge with 3.4
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/configDialog.py30
1 files changed, 16 insertions, 14 deletions
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index b70cb60..b987293 100644
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -43,19 +43,20 @@ class ConfigDialog(Toplevel):
#The first value of the tuple is the sample area tag name.
#The second value is the display name list sort index.
self.themeElements={
- 'Normal Text':('normal', '00'),
- 'Python Keywords':('keyword', '01'),
- 'Python Definitions':('definition', '02'),
- 'Python Builtins':('builtin', '03'),
- 'Python Comments':('comment', '04'),
- 'Python Strings':('string', '05'),
- 'Selected Text':('hilite', '06'),
- 'Found Text':('hit', '07'),
- 'Cursor':('cursor', '08'),
- 'Error Text':('error', '09'),
- 'Shell Normal Text':('console', '10'),
- 'Shell Stdout Text':('stdout', '11'),
- 'Shell Stderr Text':('stderr', '12'),
+ 'Normal Text': ('normal', '00'),
+ 'Python Keywords': ('keyword', '01'),
+ 'Python Definitions': ('definition', '02'),
+ 'Python Builtins': ('builtin', '03'),
+ 'Python Comments': ('comment', '04'),
+ 'Python Strings': ('string', '05'),
+ 'Selected Text': ('hilite', '06'),
+ 'Found Text': ('hit', '07'),
+ 'Cursor': ('cursor', '08'),
+ 'Editor Breakpoint': ('break', '09'),
+ 'Shell Normal Text': ('console', '10'),
+ 'Shell Error Text': ('error', '11'),
+ 'Shell Stdout Text': ('stdout', '12'),
+ 'Shell Stderr Text': ('stderr', '13'),
}
self.ResetChangedItems() #load initial values in changed items dict
self.CreateWidgets()
@@ -219,7 +220,8 @@ class ConfigDialog(Toplevel):
("'selected'", 'hilite'), ('\n var2 = ', 'normal'),
("'found'", 'hit'), ('\n var3 = ', 'normal'),
('list', 'builtin'), ('(', 'normal'),
- ('None', 'keyword'), (')\n\n', 'normal'),
+ ('None', 'keyword'), (')\n', 'normal'),
+ (' breakpoint("line")', 'break'), ('\n\n', 'normal'),
(' error ', 'error'), (' ', 'normal'),
('cursor |', 'cursor'), ('\n ', 'normal'),
('shell', 'console'), (' ', 'normal'),