--- a/Tools__CodeView2SettingsAppl.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__CodeView2SettingsAppl.st Fri Feb 08 08:51:42 2013 +0100
@@ -16,7 +16,8 @@
AbstractSettingsApplication subclass:#CodeView2SettingsAppl
instanceVariableNames:'useCodeView2InTools useCodeView2InDebugger useCodeView2InBrowser
useCodeView2InToolEnabled useCodeView2InWorkspace
- codeView2AutoIndent codeView2ShowAcceptCancel'
+ codeView2AutoIndent codeView2ShowAcceptCancel
+ codeView2QuickSendersAndImplementorsOnControl'
classVariableNames:''
poolDictionaries:''
category:'Interface-CodeView'
@@ -57,17 +58,25 @@
^ super flyByHelpSpec addPairsFrom:#(
#showAcceptCancelBarInGutter
-'Show the Gutterview''s own Accept/Cancel Bar (disabled if outer Accept/Cancel Bar is enabled)'
+'Show the Gutterview''s own Accept/Cancel Bar (disabled if outer Accept/Cancel bar is enabled)'
#useCodeView2InBrowser
-'Use the new Editor in SystemBrowsers (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in SystemBrowsers (disabled if the global use of CodeEditor2 is disabled in the tools settings)'
#useCodeView2InWorkspace
-'Use the new Editor in Workspaces (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in Workspaces (disabled if the global use of Code Editor2 is disabled in the tools settings)'
#useCodeView2InDebugger
-'Use the new Editor in the Debugger (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in the Debugger (disabled if the global use of Code Editor2 is disabled in the tools settings)'
+
+#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
+'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),
+and check if it looks good enough to be accepted.'
)
! !
@@ -142,6 +151,7 @@
(FramedBoxSpec
label: 'Individual Tool Support'
name: 'ToolSupport'
+ visibilityChannel: false
labelPosition: topLeft
translateLabel: true
component:
@@ -160,35 +170,35 @@
(CheckBoxSpec
label: 'Use Advanced Code Editor in Class Browser'
name: 'CheckBox2'
+ activeHelpKey: useCodeView2InBrowser
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InBrowser
- activeHelpKey: useCodeView2InBrowser
translateLabel: true
extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Debugger (experimental)'
name: 'CheckBox3'
+ activeHelpKey: useCodeView2InDebugger
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InDebugger
- activeHelpKey: useCodeView2InDebugger
translateLabel: true
extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Workspace'
name: 'CheckBox4'
+ activeHelpKey: useCodeView2InWorkspace
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InWorkspace
- activeHelpKey: useCodeView2InWorkspace
translateLabel: true
extent: (Point 551 25)
)
)
)
+ usePreferredHeight: true
useDynamicPreferredHeight: true
- usePreferredHeight: true
)
)
@@ -236,7 +246,42 @@
)
)
- extent: (Point 585 77)
+ extent: (Point 585 82)
+ )
+ (FramedBoxSpec
+ label: 'Keyboard Shortcuts'
+ name: 'FramedBox1'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel2'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Quick Senders/Implementors Menu with CTRL key (as opposed to ALT key)'
+ name: 'CheckBox7'
+ activeHelpKey: codeView2QuickSendersAndImplementorsOnControl
+ model: codeView2QuickSendersAndImplementorsOnControl
+ translateLabel: true
+ extent: (Point 551 25)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 585 55)
)
)
@@ -261,7 +306,6 @@
codeView2AutoIndent isNil ifTrue:[
codeView2AutoIndent := ValueHolder new.
codeView2AutoIndent onChangeSend:#updateModifiedChannel to:self
-
].
^ codeView2AutoIndent
@@ -269,6 +313,16 @@
"Created: / 07-08-2011 / 12:52:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+codeView2QuickSendersAndImplementorsOnControl
+ codeView2QuickSendersAndImplementorsOnControl isNil ifTrue:[
+ codeView2QuickSendersAndImplementorsOnControl := ValueHolder new.
+ codeView2QuickSendersAndImplementorsOnControl onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ codeView2QuickSendersAndImplementorsOnControl
+
+ "Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
codeView2ShowAcceptCancel
"return/create the 'codeView2ShowAcceptCancel' value holder (automatically generated)"
@@ -287,7 +341,6 @@
useCodeView2InBrowser isNil ifTrue:[
useCodeView2InBrowser := ValueHolder new.
useCodeView2InBrowser onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InBrowser
@@ -301,7 +354,6 @@
useCodeView2InDebugger isNil ifTrue:[
useCodeView2InDebugger := ValueHolder new.
useCodeView2InDebugger onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InDebugger
@@ -315,7 +367,6 @@
useCodeView2InTools isNil ifTrue:[
useCodeView2InTools := ValueHolder new.
useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InTools
@@ -328,7 +379,6 @@
useCodeView2InWorkspace isNil ifTrue:[
useCodeView2InWorkspace := ValueHolder new.
useCodeView2InWorkspace onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InWorkspace
@@ -366,6 +416,7 @@
"/Editing support
#codeView2AutoIndent
"/ #codeView2ShowAcceptCancel
+ #codeView2QuickSendersAndImplementorsOnControl
)
"Modified: / 10-10-2011 / 16:43:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -410,11 +461,11 @@
!CodeView2SettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.7 2013-02-01 14:49:02 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.7 2013-02-01 14:49:02 cg Exp $'
!
version_SVN