--- a/AbstractSettingsApplication.st	Thu Jul 07 01:16:03 2011 +0200
+++ b/AbstractSettingsApplication.st	Thu Jul 07 01:18:17 2011 +0200
@@ -318,7 +318,8 @@
 	instanceVariableNames:'showAcceptCancelBarInBrowser useSearchBarInBrowser
 		showMethodTemplate useCodeView2InTools
 		showEmbeddedTestRunnerInBrowser showBookmarkBar
-		webBrowserLikeLayout'
+		webBrowserLikeLayout sortAndIndentClassesByInheritance
+		showLocalHistory showGlobalHistory'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:AbstractSettingsApplication
@@ -14749,12 +14750,34 @@
                     extent: (Point 607 25)
                   )
                  (CheckBoxSpec
+                    label: 'Sort and Indent Classes by Inheritance'
+                    name: 'SortAndIndentClassesByInheritance'
+                    model: sortAndIndentClassesByInheritance
+                    translateLabel: true
+                    extent: (Point 607 25)
+                  )
+                 (CheckBoxSpec
                     label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)'
-                    name: 'WebBrowserLikeLayout'
+                    name: 'CheckBox1'
+                    initiallyInvisible: true
                     model: webBrowserLikeLayout
                     translateLabel: true
                     extent: (Point 607 25)
                   )
+                 (CheckBoxSpec
+                    label: 'Show Local Navigation History (Separate History per Browser Tab)'
+                    name: 'CheckBox2'
+                    model: showLocalHistory
+                    translateLabel: true
+                    extent: (Point 607 25)
+                  )
+                 (CheckBoxSpec
+                    label: 'Show Global Navigation History (One Global History Among All Browser Windows)'
+                    name: 'CheckBox3'
+                    model: showGlobalHistory
+                    translateLabel: true
+                    extent: (Point 607 25)
+                  )
                  )
                
               )
@@ -14763,8 +14786,6 @@
          
         )
       )
-
-    "Modified: / 04-07-2011 / 17:03:57 / cg"
 ! !
 
 !AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'actions'!
@@ -14780,10 +14801,14 @@
                 showEmbeddedTestRunnerInBrowser
                 showBookmarkBar
                 webBrowserLikeLayout
+                sortAndIndentClassesByInheritance
+                showGlobalHistory
+                showLocalHistory
+
             )
         from:currentUserPrefs.
 
-    "Modified: / 07-06-2011 / 14:34:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-07-2011 / 00:03:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 basicSaveSettings
@@ -14797,10 +14822,13 @@
                 showEmbeddedTestRunnerInBrowser
                 showBookmarkBar
                 webBrowserLikeLayout
+                sortAndIndentClassesByInheritance
+                showGlobalHistory
+                showLocalHistory
             )
         to:currentUserPrefs.
 
-    "Modified: / 07-06-2011 / 14:34:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-07-2011 / 00:03:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'aspects'!
@@ -14838,6 +14866,28 @@
     "Modified: / 11-03-2010 / 10:12:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+showGlobalHistory
+
+    showGlobalHistory isNil ifTrue:[
+        showGlobalHistory := false asValue.
+        showGlobalHistory onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ showGlobalHistory.
+
+    "Created: / 07-07-2011 / 00:05:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+showLocalHistory
+
+    showLocalHistory isNil ifTrue:[
+        showLocalHistory := false asValue.
+        showLocalHistory onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ showLocalHistory.
+
+    "Created: / 07-07-2011 / 00:05:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 showMethodTemplate
     "return/create the 'showMethodTemplate' value holder (automatically generated)"
 
@@ -14851,6 +14901,17 @@
     "Modified: / 11-03-2010 / 10:08:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+sortAndIndentClassesByInheritance
+
+    sortAndIndentClassesByInheritance isNil ifTrue:[
+        sortAndIndentClassesByInheritance := false asValue.
+        sortAndIndentClassesByInheritance onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ sortAndIndentClassesByInheritance.
+
+    "Created: / 06-07-2011 / 23:50:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 useCodeView2InTools
     "return/create the 'useCodeView2InTools' value holder (automatically generated)"
 
@@ -14907,11 +14968,14 @@
                 showEmbeddedTestRunnerInBrowser
                 showBookmarkBar
                 webBrowserLikeLayout
+                sortAndIndentClassesByInheritance
+                showGlobalHistory
+                showLocalHistory
             )
         asComparedTo:currentUserPrefs) ifTrue:[^ true].
     ^ false.
 
-    "Modified: / 07-06-2011 / 14:34:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-07-2011 / 00:04:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !AbstractSettingsApplication::SystemMessageSettingsAppl class methodsFor:'help specs'!
@@ -15885,5 +15949,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.393 2011-07-06 11:53:50 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.394 2011-07-06 23:18:17 vrany Exp $'
+! !