--- a/Tools__CodeView2SettingsAppl.st Tue May 28 23:58:09 2013 +0200
+++ b/Tools__CodeView2SettingsAppl.st Wed May 29 13:11:05 2013 +0200
@@ -16,7 +16,7 @@
AbstractSettingsApplication subclass:#CodeView2SettingsAppl
instanceVariableNames:'useCodeView2InTools useCodeView2InDebugger useCodeView2InBrowser
useCodeView2InToolEnabled useCodeView2InWorkspace
- codeView2AutoIndent codeView2ShowAcceptCancel
+ codeView2AutoPrettyPrint codeView2ShowAcceptCancel
codeView2QuickSendersAndImplementorsOnControl'
classVariableNames:''
poolDictionaries:''
@@ -71,7 +71,7 @@
#codeView2QuickSendersAndImplementorsOnControl
'If on, the CTRL (Control) key is used to get the quick implementors/senders menus via left/right mouse click. If off, the ALT key is used.'
-#codeView2AutoIndent
+#codeView2AutoPrettyPrint
'Automatically indent (prettyprint) code. This is experimental and not yet enabled by default,
as it uses the refactory browser''s prettyprint function, which is known to loose comments and generate
ugly layout occasionally. For now, it is recommended to manually prettyprint code (using the format button),
@@ -171,7 +171,7 @@
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InBrowser
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Debugger (experimental)'
@@ -180,7 +180,7 @@
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InDebugger
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Workspace'
@@ -189,7 +189,7 @@
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InWorkspace
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
)
@@ -227,14 +227,16 @@
enableChannel: acceptCancelInGutterEnabledHolder
model: codeView2ShowAcceptCancel
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
(CheckBoxSpec
- label: 'Auto Indent (experimental, not yet recommended)'
+ label: 'Auto Pretty Print (experimental, not yet recommended)'
name: 'CheckBox5'
- model: codeView2AutoIndent
+ activeHelpKey: codeView2AutoPrettyPrint
+ enableChannel: false
+ model: codeView2AutoPrettyPrint
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
)
@@ -269,7 +271,7 @@
activeHelpKey: codeView2QuickSendersAndImplementorsOnControl
model: codeView2QuickSendersAndImplementorsOnControl
translateLabel: true
- extent: (Point 543 25)
+ extent: (Point 551 25)
)
)
@@ -296,14 +298,13 @@
^ [UserPreferences current showAcceptCancelBar not]
!
-codeView2AutoIndent
- "return/create the 'useCodeView2InTools' value holder (automatically generated)"
+codeView2AutoPrettyPrint
- codeView2AutoIndent isNil ifTrue:[
- codeView2AutoIndent := ValueHolder new.
- codeView2AutoIndent onChangeSend:#updateModifiedChannel to:self
+ codeView2AutoPrettyPrint isNil ifTrue:[
+ codeView2AutoPrettyPrint := ValueHolder new.
+ codeView2AutoPrettyPrint onChangeSend:#updateModifiedChannel to:self
].
- ^ codeView2AutoIndent
+ ^ codeView2AutoPrettyPrint
"Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 07-08-2011 / 12:52:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -320,7 +321,6 @@
!
codeView2ShowAcceptCancel
- "return/create the 'codeView2ShowAcceptCancel' value holder (automatically generated)"
codeView2ShowAcceptCancel isNil ifTrue:[
codeView2ShowAcceptCancel := ValueHolder new.
@@ -332,7 +332,6 @@
!
useCodeView2InBrowser
- "return/create the 'useCodeView2InTools' value holder (automatically generated)"
useCodeView2InBrowser isNil ifTrue:[
useCodeView2InBrowser := ValueHolder new.
@@ -345,7 +344,6 @@
!
useCodeView2InDebugger
- "return/create the 'useCodeView2InTools' value holder (automatically generated)"
useCodeView2InDebugger isNil ifTrue:[
useCodeView2InDebugger := ValueHolder new.
@@ -358,7 +356,6 @@
!
useCodeView2InTools
- "return/create the 'useCodeView2InTools' value holder (automatically generated)"
useCodeView2InTools isNil ifTrue:[
useCodeView2InTools := ValueHolder new.
@@ -370,7 +367,6 @@
!
useCodeView2InWorkspace
- "return/create the 'useCodeView2InTools' value holder (automatically generated)"
useCodeView2InWorkspace isNil ifTrue:[
useCodeView2InWorkspace := ValueHolder new.
@@ -408,7 +404,7 @@
#useCodeView2InDebugger
#useCodeView2InWorkspace
"/Editing support
- #codeView2AutoIndent
+ #codeView2AutoPrettyPrint
"/ #codeView2ShowAcceptCancel
#codeView2QuickSendersAndImplementorsOnControl
)
@@ -453,14 +449,14 @@
!CodeView2SettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.8 2013-02-22 09:13:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.9 2013-05-29 11:11:05 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.8 2013-02-22 09:13:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.9 2013-05-29 11:11:05 cg Exp $'
!
version_SVN
- ^ '§Id§'
+ ^ '$Id: Tools__CodeView2SettingsAppl.st,v 1.9 2013-05-29 11:11:05 cg Exp $'
! !