Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d8590ff2
Commit
d8590ff2
authored
Dec 24, 2012
by
Andrew Svetlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
parent
1c6c90fc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
27 deletions
+48
-27
Lib/idlelib/EditorWindow.py
Lib/idlelib/EditorWindow.py
+6
-4
Lib/idlelib/FormatParagraph.py
Lib/idlelib/FormatParagraph.py
+2
-1
Lib/idlelib/configDialog.py
Lib/idlelib/configDialog.py
+7
-4
Lib/idlelib/configHandler.py
Lib/idlelib/configHandler.py
+33
-18
No files found.
Lib/idlelib/EditorWindow.py
View file @
d8590ff2
...
...
@@ -172,13 +172,13 @@ class EditorWindow(object):
'recent-files.lst'
)
self
.
text_frame
=
text_frame
=
Frame
(
top
)
self
.
vbar
=
vbar
=
Scrollbar
(
text_frame
,
name
=
'vbar'
)
self
.
width
=
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'width'
)
self
.
width
=
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'width'
,
type
=
'int'
)
text_options
=
{
'name'
:
'text'
,
'padx'
:
5
,
'wrap'
:
'none'
,
'width'
:
self
.
width
,
'height'
:
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'height'
)}
'height'
:
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'height'
,
type
=
'int'
)}
if
TkVersion
>=
8.5
:
# Starting with tk 8.5 we have to set the new tabstyle option
# to 'wordprocessor' to achieve the same display of tabs as in
...
...
@@ -255,7 +255,8 @@ class EditorWindow(object):
if
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-bold'
,
type
=
'bool'
):
fontWeight
=
'bold'
text
.
config
(
font
=
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font'
),
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-size'
),
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-size'
,
type
=
'int'
),
fontWeight
))
text_frame
.
pack
(
side
=
LEFT
,
fill
=
BOTH
,
expand
=
1
)
text
.
pack
(
side
=
TOP
,
fill
=
BOTH
,
expand
=
1
)
...
...
@@ -763,7 +764,8 @@ class EditorWindow(object):
if
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-bold'
,
type
=
'bool'
):
fontWeight
=
'bold'
self
.
text
.
config
(
font
=
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font'
),
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-size'
),
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-size'
,
type
=
'int'
),
fontWeight
))
def
RemoveKeybindings
(
self
):
...
...
Lib/idlelib/FormatParagraph.py
View file @
d8590ff2
...
...
@@ -32,7 +32,8 @@ class FormatParagraph:
self
.
editwin
=
None
def
format_paragraph_event
(
self
,
event
):
maxformatwidth
=
int
(
idleConf
.
GetOption
(
'main'
,
'FormatParagraph'
,
'paragraph'
))
maxformatwidth
=
int
(
idleConf
.
GetOption
(
'main'
,
'FormatParagraph'
,
'paragraph'
,
type
=
'int'
))
text
=
self
.
editwin
.
text
first
,
last
=
self
.
editwin
.
get_selection_indices
()
if
first
and
last
:
...
...
Lib/idlelib/configDialog.py
View file @
d8590ff2
...
...
@@ -947,7 +947,7 @@ class ConfigDialog(Toplevel):
self
.
listFontName
.
select_anchor
(
currentFontIndex
)
##font size dropdown
fontSize
=
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'font-size'
,
default
=
'10'
)
type
=
'int'
,
default
=
'10'
)
self
.
optMenuFontSize
.
SetMenu
((
'7'
,
'8'
,
'9'
,
'10'
,
'11'
,
'12'
,
'13'
,
'14'
,
'16'
,
'18'
,
'20'
,
'22'
),
fontSize
)
##fontWeight
...
...
@@ -1033,10 +1033,13 @@ class ConfigDialog(Toplevel):
self
.
autoSave
.
set
(
idleConf
.
GetOption
(
'main'
,
'General'
,
'autosave'
,
default
=
0
,
type
=
'bool'
))
#initial window size
self
.
winWidth
.
set
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'width'
))
self
.
winHeight
.
set
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'height'
))
self
.
winWidth
.
set
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'width'
,
type
=
'int'
))
self
.
winHeight
.
set
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'height'
,
type
=
'int'
))
#initial paragraph reformat size
self
.
paraWidth
.
set
(
idleConf
.
GetOption
(
'main'
,
'FormatParagraph'
,
'paragraph'
))
self
.
paraWidth
.
set
(
idleConf
.
GetOption
(
'main'
,
'FormatParagraph'
,
'paragraph'
,
type
=
'int'
))
# default source encoding
self
.
encoding
.
set
(
idleConf
.
GetOption
(
'main'
,
'EditorWindow'
,
'encoding'
,
default
=
'none'
))
...
...
Lib/idlelib/configHandler.py
View file @
d8590ff2
...
...
@@ -237,24 +237,39 @@ class IdleConf:
printed to stderr.
"""
if
self
.
userCfg
[
configType
].
has_option
(
section
,
option
):
return
self
.
userCfg
[
configType
].
Get
(
section
,
option
,
type
=
type
,
raw
=
raw
)
elif
self
.
defaultCfg
[
configType
].
has_option
(
section
,
option
):
return
self
.
defaultCfg
[
configType
].
Get
(
section
,
option
,
type
=
type
,
raw
=
raw
)
else
:
#returning default, print warning
if
warn_on_default
:
warning
=
(
'
\
n
Warning: configHandler.py - IdleConf.GetOption -
\
n
'
' problem retrieving configuration option %r
\
n
'
' from section %r.
\
n
'
' returning default value: %r
\
n
'
%
(
option
,
section
,
default
))
try
:
sys
.
stderr
.
write
(
warning
)
except
IOError
:
pass
return
default
try
:
if
self
.
userCfg
[
configType
].
has_option
(
section
,
option
):
return
self
.
userCfg
[
configType
].
Get
(
section
,
option
,
type
=
type
,
raw
=
raw
)
except
ValueError
:
warning
=
(
'
\
n
Warning: configHandler.py - IdleConf.GetOption -
\
n
'
' invalid %r value for configuration option %r
\
n
'
' from section %r: %r
\
n
'
%
(
type
,
option
,
section
,
self
.
userCfg
[
configType
].
Get
(
section
,
option
,
raw
=
raw
)))
try
:
sys
.
stderr
.
write
(
warning
)
except
IOError
:
pass
try
:
if
self
.
defaultCfg
[
configType
].
has_option
(
section
,
option
):
return
self
.
defaultCfg
[
configType
].
Get
(
section
,
option
,
type
=
type
,
raw
=
raw
)
except
ValueError
:
pass
#returning default, print warning
if
warn_on_default
:
warning
=
(
'
\
n
Warning: configHandler.py - IdleConf.GetOption -
\
n
'
' problem retrieving configuration option %r
\
n
'
' from section %r.
\
n
'
' returning default value: %r
\
n
'
%
(
option
,
section
,
default
))
try
:
sys
.
stderr
.
write
(
warning
)
except
IOError
:
pass
return
default
def
SetOption
(
self
,
configType
,
section
,
option
,
value
):
"""In user's config file, set section's option to value.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment