Issue #20577: move configuration of FormatParagraph extension to new extension

configuration dialog.  Patch by Tal Einat.
This commit is contained in:
Terry Jan Reedy 2014-12-16 03:21:26 -05:00
parent 4d5115c7b5
commit df9386940a
5 changed files with 10 additions and 24 deletions

View file

@ -44,9 +44,11 @@ def format_paragraph_event(self, event, limit=None):
The length limit parameter is for testing with a known value.
"""
if limit == None:
if limit is None:
# The default length limit is that defined by pep8
limit = idleConf.GetOption(
'main', 'FormatParagraph', 'paragraph', type='int')
'extensions', 'FormatParagraph', 'max-width',
type='int', default=72)
text = self.editwin.text
first, last = self.editwin.get_selection_indices()
if first and last:

View file

@ -66,6 +66,7 @@ toggle-code-context=
[FormatParagraph]
enable=True
max-width=72
[FormatParagraph_cfgBindings]
format-paragraph=<Alt-Key-q>

View file

@ -58,9 +58,6 @@ font-size= 10
font-bold= 0
encoding= none
[FormatParagraph]
paragraph=72
[Indent]
use-spaces= 1
num-spaces= 4

View file

@ -373,7 +373,6 @@ def CreatePageGeneral(self):
parent = self.parent
self.winWidth = StringVar(parent)
self.winHeight = StringVar(parent)
self.paraWidth = StringVar(parent)
self.startupEdit = IntVar(parent)
self.autoSave = IntVar(parent)
self.encoding = StringVar(parent)
@ -389,7 +388,6 @@ def CreatePageGeneral(self):
frameSave = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Autosave Preferences ')
frameWinSize = Frame(frame, borderwidth=2, relief=GROOVE)
frameParaSize = Frame(frame, borderwidth=2, relief=GROOVE)
frameHelp = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Additional Help Sources ')
#frameRun
@ -417,11 +415,6 @@ def CreatePageGeneral(self):
labelWinHeightTitle = Label(frameWinSize, text='Height')
entryWinHeight = Entry(
frameWinSize, textvariable=self.winHeight, width=3)
#paragraphFormatWidth
labelParaWidthTitle = Label(
frameParaSize, text='Paragraph reformat width (in characters)')
entryParaWidth = Entry(
frameParaSize, textvariable=self.paraWidth, width=3)
#frameHelp
frameHelpList = Frame(frameHelp)
frameHelpListButtons = Frame(frameHelpList)
@ -447,7 +440,6 @@ def CreatePageGeneral(self):
frameRun.pack(side=TOP, padx=5, pady=5, fill=X)
frameSave.pack(side=TOP, padx=5, pady=5, fill=X)
frameWinSize.pack(side=TOP, padx=5, pady=5, fill=X)
frameParaSize.pack(side=TOP, padx=5, pady=5, fill=X)
frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
#frameRun
labelRunChoiceTitle.pack(side=LEFT, anchor=W, padx=5, pady=5)
@ -463,9 +455,6 @@ def CreatePageGeneral(self):
labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5)
entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5)
labelWinWidthTitle.pack(side=RIGHT, anchor=E, pady=5)
#paragraphFormatWidth
labelParaWidthTitle.pack(side=LEFT, anchor=W, padx=5, pady=5)
entryParaWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5)
#frameHelp
frameHelpListButtons.pack(side=RIGHT, padx=5, pady=5, fill=Y)
frameHelpList.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
@ -492,7 +481,6 @@ def AttachVarCallbacks(self):
self.keysAreBuiltin.trace_variable('w', self.VarChanged_keysAreBuiltin)
self.winWidth.trace_variable('w', self.VarChanged_winWidth)
self.winHeight.trace_variable('w', self.VarChanged_winHeight)
self.paraWidth.trace_variable('w', self.VarChanged_paraWidth)
self.startupEdit.trace_variable('w', self.VarChanged_startupEdit)
self.autoSave.trace_variable('w', self.VarChanged_autoSave)
self.encoding.trace_variable('w', self.VarChanged_encoding)
@ -577,10 +565,6 @@ def VarChanged_winHeight(self, *params):
value = self.winHeight.get()
self.AddChangedItem('main', 'EditorWindow', 'height', value)
def VarChanged_paraWidth(self, *params):
value = self.paraWidth.get()
self.AddChangedItem('main', 'FormatParagraph', 'paragraph', value)
def VarChanged_startupEdit(self, *params):
value = self.startupEdit.get()
self.AddChangedItem('main', 'General', 'editor-on-startup', value)
@ -1077,9 +1061,6 @@ def LoadGeneralCfg(self):
'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', type='int'))
# default source encoding
self.encoding.set(idleConf.GetOption(
'main', 'EditorWindow', 'encoding', default='none'))

View file

@ -201,6 +201,11 @@ Library
IDLE
----
- Issue #20577: Configuration of the max line length for the FormatParagraph
extension has been moved from the General tab of the Idle preferences dialog
to the FormatParagraph tab of the Config Extensions dialog.
Patch by Tal Einat.
- Issue #16893: Update Idle doc chapter to match current Idle and add new
information.