Commit 16e093db authored by Terry Jan Reedy's avatar Terry Jan Reedy

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

configuration dialog.  Patch by Tal Einat.
parent 3004b409
...@@ -44,9 +44,11 @@ class FormatParagraph: ...@@ -44,9 +44,11 @@ class FormatParagraph:
The length limit parameter is for testing with a known value. 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( limit = idleConf.GetOption(
'main', 'FormatParagraph', 'paragraph', type='int') 'extensions', 'FormatParagraph', 'max-width',
type='int', default=72)
text = self.editwin.text text = self.editwin.text
first, last = self.editwin.get_selection_indices() first, last = self.editwin.get_selection_indices()
if first and last: if first and last:
......
...@@ -66,6 +66,7 @@ toggle-code-context= ...@@ -66,6 +66,7 @@ toggle-code-context=
[FormatParagraph] [FormatParagraph]
enable=True enable=True
max-width=72
[FormatParagraph_cfgBindings] [FormatParagraph_cfgBindings]
format-paragraph=<Alt-Key-q> format-paragraph=<Alt-Key-q>
......
...@@ -58,9 +58,6 @@ font-size= 10 ...@@ -58,9 +58,6 @@ font-size= 10
font-bold= 0 font-bold= 0
encoding= none encoding= none
[FormatParagraph]
paragraph=72
[Indent] [Indent]
use-spaces= 1 use-spaces= 1
num-spaces= 4 num-spaces= 4
......
...@@ -371,7 +371,6 @@ class ConfigDialog(Toplevel): ...@@ -371,7 +371,6 @@ class ConfigDialog(Toplevel):
parent = self.parent parent = self.parent
self.winWidth = StringVar(parent) self.winWidth = StringVar(parent)
self.winHeight = StringVar(parent) self.winHeight = StringVar(parent)
self.paraWidth = StringVar(parent)
self.startupEdit = IntVar(parent) self.startupEdit = IntVar(parent)
self.autoSave = IntVar(parent) self.autoSave = IntVar(parent)
self.encoding = StringVar(parent) self.encoding = StringVar(parent)
...@@ -387,7 +386,6 @@ class ConfigDialog(Toplevel): ...@@ -387,7 +386,6 @@ class ConfigDialog(Toplevel):
frameSave = LabelFrame(frame, borderwidth=2, relief=GROOVE, frameSave = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Autosave Preferences ') text=' Autosave Preferences ')
frameWinSize = Frame(frame, borderwidth=2, relief=GROOVE) frameWinSize = Frame(frame, borderwidth=2, relief=GROOVE)
frameParaSize = Frame(frame, borderwidth=2, relief=GROOVE)
frameEncoding = Frame(frame, borderwidth=2, relief=GROOVE) frameEncoding = Frame(frame, borderwidth=2, relief=GROOVE)
frameHelp = LabelFrame(frame, borderwidth=2, relief=GROOVE, frameHelp = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Additional Help Sources ') text=' Additional Help Sources ')
...@@ -416,11 +414,6 @@ class ConfigDialog(Toplevel): ...@@ -416,11 +414,6 @@ class ConfigDialog(Toplevel):
labelWinHeightTitle = Label(frameWinSize, text='Height') labelWinHeightTitle = Label(frameWinSize, text='Height')
entryWinHeight = Entry( entryWinHeight = Entry(
frameWinSize, textvariable=self.winHeight, width=3) frameWinSize, textvariable=self.winHeight, width=3)
#paragraphFormatWidth
labelParaWidthTitle = Label(
frameParaSize, text='Paragraph reformat width (in characters)')
entryParaWidth = Entry(
frameParaSize, textvariable=self.paraWidth, width=3)
#frameEncoding #frameEncoding
labelEncodingTitle = Label( labelEncodingTitle = Label(
frameEncoding, text="Default Source Encoding") frameEncoding, text="Default Source Encoding")
...@@ -458,7 +451,6 @@ class ConfigDialog(Toplevel): ...@@ -458,7 +451,6 @@ class ConfigDialog(Toplevel):
frameRun.pack(side=TOP, padx=5, pady=5, fill=X) frameRun.pack(side=TOP, padx=5, pady=5, fill=X)
frameSave.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) frameWinSize.pack(side=TOP, padx=5, pady=5, fill=X)
frameParaSize.pack(side=TOP, padx=5, pady=5, fill=X)
frameEncoding.pack(side=TOP, padx=5, pady=5, fill=X) frameEncoding.pack(side=TOP, padx=5, pady=5, fill=X)
frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
#frameRun #frameRun
...@@ -475,9 +467,6 @@ class ConfigDialog(Toplevel): ...@@ -475,9 +467,6 @@ class ConfigDialog(Toplevel):
labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5) labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5)
entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5)
labelWinWidthTitle.pack(side=RIGHT, anchor=E, 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)
#frameEncoding #frameEncoding
labelEncodingTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) labelEncodingTitle.pack(side=LEFT, anchor=W, padx=5, pady=5)
radioEncNone.pack(side=RIGHT, anchor=E, pady=5) radioEncNone.pack(side=RIGHT, anchor=E, pady=5)
...@@ -509,7 +498,6 @@ class ConfigDialog(Toplevel): ...@@ -509,7 +498,6 @@ class ConfigDialog(Toplevel):
self.keysAreBuiltin.trace_variable('w', self.VarChanged_keysAreBuiltin) self.keysAreBuiltin.trace_variable('w', self.VarChanged_keysAreBuiltin)
self.winWidth.trace_variable('w', self.VarChanged_winWidth) self.winWidth.trace_variable('w', self.VarChanged_winWidth)
self.winHeight.trace_variable('w', self.VarChanged_winHeight) 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.startupEdit.trace_variable('w', self.VarChanged_startupEdit)
self.autoSave.trace_variable('w', self.VarChanged_autoSave) self.autoSave.trace_variable('w', self.VarChanged_autoSave)
self.encoding.trace_variable('w', self.VarChanged_encoding) self.encoding.trace_variable('w', self.VarChanged_encoding)
...@@ -594,10 +582,6 @@ class ConfigDialog(Toplevel): ...@@ -594,10 +582,6 @@ class ConfigDialog(Toplevel):
value = self.winHeight.get() value = self.winHeight.get()
self.AddChangedItem('main', 'EditorWindow', 'height', value) 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): def VarChanged_startupEdit(self, *params):
value = self.startupEdit.get() value = self.startupEdit.get()
self.AddChangedItem('main', 'General', 'editor-on-startup', value) self.AddChangedItem('main', 'General', 'editor-on-startup', value)
...@@ -1094,9 +1078,6 @@ class ConfigDialog(Toplevel): ...@@ -1094,9 +1078,6 @@ class ConfigDialog(Toplevel):
'main', 'EditorWindow', 'width', type='int')) 'main', 'EditorWindow', 'width', type='int'))
self.winHeight.set(idleConf.GetOption( self.winHeight.set(idleConf.GetOption(
'main', 'EditorWindow', 'height', type='int')) 'main', 'EditorWindow', 'height', type='int'))
#initial paragraph reformat size
self.paraWidth.set(idleConf.GetOption(
'main', 'FormatParagraph', 'paragraph', type='int'))
# default source encoding # default source encoding
self.encoding.set(idleConf.GetOption( self.encoding.set(idleConf.GetOption(
'main', 'EditorWindow', 'encoding', default='none')) 'main', 'EditorWindow', 'encoding', default='none'))
......
...@@ -56,6 +56,11 @@ Tests ...@@ -56,6 +56,11 @@ Tests
IDLE 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 - Issue #16893: Update Idle doc chapter to match current Idle and add new
information. information.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment