--- a/AbstractSettingsApplication.st	Sat Nov 03 12:44:49 2012 +0100
+++ b/AbstractSettingsApplication.st	Sat Nov 03 15:20:21 2012 +0100
@@ -99,7 +99,7 @@
 		searchDialogIsModal startTextDragWithControl
 		extendedWordSelectMode whitespaceWordSelectMode
 		enforceContentsDropForFiles selectAllWhenClickingBeyondEnd
-		showAcceptCancelBarInBrowser'
+		showAcceptCancelBarInBrowser useCodeView2InTools'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:AbstractSettingsApplication
@@ -3456,75 +3456,82 @@
               component: 
              (SpecCollection
                 collection: (
+                             (CheckBoxSpec
+                                label: 'Use the new Code Editor 2 (experimental)'
+                                name: 'UserCodeView2'
+                                model: useCodeView2InTools
+                                translateLabel: true
+                                extent: (Point 607 25)
+                              )
                  (CheckBoxSpec
                     label: 'Show Accept/Cancel Bar in Editor'
                     name: 'ShowAcceptCancelBarInBrowser'
                     model: showAcceptCancelBarInBrowser
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'CTRL-Key to Start TextDrag'
                     name: 'CTRLKeyStTextDragCheckBox'
                     model: startTextDragWithControl
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Always Paste the Contents when Dropping a File (Do not Ask) '
                     name: 'EnforceContentsDropForFiles'
                     model: enforceContentsDropForFiles
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'SearchBox is Modal'
                     name: 'SearchBoxModalCheckBox'
                     model: searchDialogIsModal
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Tab Stops in Multiples of 4'
                     name: 'TabStopsMultiples4CheckBox'
                     model: tabsIs4
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Double Click Select Behavior as in ST80'
                     name: 'DoubleClickSelectBehaviorST80CheckBox'
                     model: st80DoubleClickSelectMode
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Cursor has ST80 Line-end Behavior'
                     name: 'CursorST80LineEndBehaviorCheckBox'
                     model: st80EditMode
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Select all when Clicking beyond the Text''s End'
                     name: 'CheckBox2'
                     model: selectAllWhenClickingBeyondEnd
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Treat Underscore as Letter in Word-Select'
                     name: 'UnderscoreIsLetterCheckBox'
                     model: extendedWordSelectMode
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  (CheckBoxSpec
                     label: 'Any non-Whitespace in Word-Select'
                     name: 'CheckBox1'
                     model: whitespaceWordSelectMode
                     translateLabel: true
-                    extent: (Point 600 23)
+                    extent: (Point 600 25)
                   )
                  )
                
@@ -3574,6 +3581,7 @@
 
 commonAspects
     ^ #( 
+        #useCodeView2InTools
          #showAcceptCancelBarInBrowser
          #searchDialogIsModal
          #startTextDragWithControl
@@ -3662,6 +3670,17 @@
     ^ tabsIs4.
 !
 
+useCodeView2InTools
+    useCodeView2InTools isNil ifTrue:[
+        useCodeView2InTools := ValueHolder new.
+        useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
+
+    ].
+    ^ useCodeView2InTools
+
+    "Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 whitespaceWordSelectMode
     whitespaceWordSelectMode isNil ifTrue:[
         whitespaceWordSelectMode := true asValue.
@@ -16631,13 +16650,13 @@
               component: 
              (SpecCollection
                 collection: (
-                             (CheckBoxSpec
-                                label: 'Use the new Code Editor 2 (experimental)'
-                                name: 'UserCodeView2'
-                                model: useCodeView2InTools
-                                translateLabel: true
-                                extent: (Point 607 25)
-                              )
+"/                             (CheckBoxSpec
+"/                                label: 'Use the new Code Editor 2 (experimental)'
+"/                                name: 'UserCodeView2'
+"/                                model: useCodeView2InTools
+"/                                translateLabel: true
+"/                                extent: (Point 607 25)
+"/                              )
                  (CheckBoxSpec
                     label: 'Use the New System Browser'
                     name: 'NewSystemBrowser'
@@ -16827,7 +16846,7 @@
     ^ #( 
         #eclipseStyleMenus
         #useTestRunner2
-        #useCodeView2InTools
+        "/ #useCodeView2InTools
         #useNewInspector
         #useNewChangesBrowser
         #useNewChangeSetBrowser
@@ -17119,9 +17138,9 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.447 2012-11-01 14:10:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.448 2012-11-03 14:20:21 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.447 2012-11-01 14:10:38 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.448 2012-11-03 14:20:21 cg Exp $'
+! !