--- a/Tools__CodeView2SettingsAppl.st	Thu Nov 01 14:54:35 2012 +0100
+++ b/Tools__CodeView2SettingsAppl.st	Thu Nov 01 14:55:42 2012 +0100
@@ -38,6 +38,39 @@
 "
 ! !
 
+!CodeView2SettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:Tools::CodeView2SettingsAppl    
+    "
+
+    <resource: #help>
+
+    ^ super flyByHelpSpec addPairsFrom:#(
+
+#showAcceptCancelBarInGutter
+'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)'
+
+#useCodeView2InWorkspace
+'Use the new Editor in Workspaces (disabled if the global use of Code Editor 2 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)'
+
+
+)
+! !
+
 !CodeView2SettingsAppl class methodsFor:'image specs'!
 
 defaultIcon
@@ -88,7 +121,7 @@
           label: 'Code Editor Settings'
           name: 'Code Editor Settings'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 585 273)
+          bounds: (Rectangle 0 0 585 289)
         )
         component: 
        (SpecCollection
@@ -104,7 +137,7 @@
              (SpecCollection
                 collection: (
                  (FramedBoxSpec
-                    label: 'Tool Support'
+                    label: 'Individual Tool Support'
                     name: 'ToolSupport'
                     labelPosition: topLeft
                     translateLabel: true
@@ -113,7 +146,7 @@
                       collection: (
                        (VerticalPanelViewSpec
                           name: 'ToolSupportCheckBox'
-                          layout: (LayoutFrame 0 0 0 0 0 1 116 0)
+                          layout: (LayoutFrame 0 0 0 0 0 1 81 0)
                           horizontalLayout: fit
                           verticalLayout: top
                           horizontalSpace: 3
@@ -122,21 +155,11 @@
                          (SpecCollection
                             collection: (
                              (CheckBoxSpec
-                                label: 'Use Advanced Code Editor in All Tools (where supported)'
-                                name: 'CheckBox1'
-                                model: useCodeView2InTools
-                                translateLabel: true
-                                extent: (Point 551 25)
-                              )
-                             (DividerSpec
-                                name: 'Separator1'
-                                extent: (Point 551 4)
-                              )
-                             (CheckBoxSpec
                                 label: 'Use Advanced Code Editor in Class Browser'
                                 name: 'CheckBox2'
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InBrowser
+                                activeHelpKey: useCodeView2InBrowser
                                 translateLabel: true
                                 extent: (Point 551 25)
                               )
@@ -145,6 +168,7 @@
                                 name: 'CheckBox3'
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InDebugger
+                                activeHelpKey: useCodeView2InDebugger
                                 translateLabel: true
                                 extent: (Point 551 25)
                               )
@@ -153,6 +177,7 @@
                                 name: 'CheckBox4'
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InWorkspace
+                                activeHelpKey: useCodeView2InWorkspace
                                 translateLabel: true
                                 extent: (Point 551 25)
                               )
@@ -165,7 +190,7 @@
                        )
                      
                     )
-                    extent: (Point 585 143)
+                    extent: (Point 585 109)
                   )
                  (FramedBoxSpec
                     label: 'Edit Support'
@@ -188,6 +213,8 @@
                              (CheckBoxSpec
                                 label: 'Show Accept/Cancel Buttons in Gutter'
                                 name: 'CheckBox6'
+                                activeHelpKey: showAcceptCancelBarInGutter
+                                enableChannel: acceptCancelInGutterEnabledHolder
                                 model: codeView2ShowAcceptCancel
                                 translateLabel: true
                                 extent: (Point 551 25)
@@ -220,6 +247,10 @@
 
 !CodeView2SettingsAppl methodsFor:'aspects'!
 
+acceptCancelInGutterEnabledHolder
+    ^ [UserPreferences current showAcceptCancelBar not] 
+!
+
 codeView2AutoIndent
     "return/create the 'useCodeView2InTools' value holder (automatically generated)"
 
@@ -307,9 +338,9 @@
     "return/create the 'useCodeView2InTools' value holder (automatically generated)"
 
     useCodeView2InToolEnabled isNil ifTrue:[
-        useCodeView2InToolEnabled := 
-            (AspectAdaptor forAspect: #not) 
-                subjectChannel: self useCodeView2InTools
+        useCodeView2InToolEnabled := UserPreferences current useCodeView2InTools asValue.
+"/            (AspectAdaptor forAspect: #not) 
+"/                subjectChannel: self useCodeView2InTools
     ].
     ^ useCodeView2InToolEnabled
 
@@ -322,13 +353,13 @@
 
 basicAspects
     ^#( 
-        #useCodeView2InTools 
+        "/#useCodeView2InTools 
         #useCodeView2InBrowser
         #useCodeView2InDebugger
         #useCodeView2InWorkspace
         "/Editing support
         #codeView2AutoIndent
-        #codeView2ShowAcceptCancel
+        "/ #codeView2ShowAcceptCancel
     )
 
     "Modified: / 10-10-2011 / 16:43:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -371,11 +402,11 @@
 !CodeView2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011-11-25 14:38:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011-11-25 14:38:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
 !
 
 version_SVN