--- a/DirectoryTreeBrowser.st	Thu Aug 05 12:12:16 2004 +0200
+++ b/DirectoryTreeBrowser.st	Fri Aug 06 15:08:06 2004 +0200
@@ -273,7 +273,6 @@
            (Menu
               (
                (MenuItem
-                  enabled: sortInTreeVisibilityHolder
                   label: 'Sort'
                   nameKey: Sort
                   translateLabel: true
@@ -343,44 +342,49 @@
     <resource: #menu>
 
     ^ 
-     #(#Menu
-        #(
-         #(#MenuItem
-            #label: 'By Filename'
-            #translateLabel: true
-            #hideMenuOnActivated: false
-            #choice: #sortPropertyInTree
-            #choiceValue: #baseName
+     #(Menu
+        (
+         (MenuItem
+            label: 'By Filename'
+            translateLabel: true
+            isVisible: sortInTreeVisibilityHolder
+            hideMenuOnActivated: false
+            choice: sortPropertyInTree
+            choiceValue: baseName
           )
-         #(#MenuItem
-            #label: 'By Type'
-            #translateLabel: true
-            #hideMenuOnActivated: false
-            #choice: #sortPropertyInTree
-            #choiceValue: #suffix
+         (MenuItem
+            label: 'By Type'
+            translateLabel: true
+            isVisible: sortInTreeVisibilityHolder
+            hideMenuOnActivated: false
+            choice: sortPropertyInTree
+            choiceValue: suffix
           )
-         #(#MenuItem
-            #label: 'By Size'
-            #translateLabel: true
-            #hideMenuOnActivated: false
-            #choice: #sortPropertyInTree
-            #choiceValue: #fileSize
+         (MenuItem
+            label: 'By Size'
+            translateLabel: true
+            isVisible: sortInTreeVisibilityHolder
+            hideMenuOnActivated: false
+            choice: sortPropertyInTree
+            choiceValue: fileSize
           )
-         #(#MenuItem
-            #label: 'By Date && Time'
-            #translateLabel: true
-            #hideMenuOnActivated: false
-            #choice: #sortPropertyInTree
-            #choiceValue: #modificationTime
+         (MenuItem
+            label: 'By Date && Time'
+            translateLabel: true
+            isVisible: sortInTreeVisibilityHolder
+            hideMenuOnActivated: false
+            choice: sortPropertyInTree
+            choiceValue: modificationTime
           )
-         #(#MenuItem
-            #label: '-'
+         (MenuItem
+            label: '-'
+            isVisible: sortInTreeVisibilityHolder
           )
-         #(#MenuItem
-            #label: 'Ignore Case in Sort'
-            #translateLabel: true
-            #hideMenuOnActivated: false
-            #indication: #sortCaselessInTreeBrowser
+         (MenuItem
+            label: 'Ignore Case in Sort'
+            translateLabel: true
+            hideMenuOnActivated: false
+            indication: sortCaselessInTreeBrowser
           )
          )
         nil
@@ -572,8 +576,9 @@
 
 sortFileListsBy:instanceName 
 
-    | aSymbol cmpOp instanceSortBlock treeSortBlock|
+    | aSymbol cmpOp instanceSortBlock treeSortBlock locSortCaselessInTreeBrowser|
 
+    locSortCaselessInTreeBrowser := self sortCaselessInTreeBrowser value.
     aSymbol := instanceName asSymbol.
     cmpOp := #'<'.
     instanceSortBlock := [:a :b | 
@@ -585,7 +590,7 @@
             true
         ] ifFalse:[
             (aSymbol = #baseName) ifTrue:[
-                self sortCaselessInTreeBrowser value ifTrue:[
+                locSortCaselessInTreeBrowser ifTrue:[
                     entry1 := entry1 asString asLowercase.
                     entry2 := entry2 asString asLowercase.
                 ] ifFalse:[
@@ -605,6 +610,13 @@
             | entry1 entry2 |
             entry1 := a baseName.
             entry2 := b baseName.
+            locSortCaselessInTreeBrowser ifTrue:[
+                entry1 := entry1 asString asLowercase.
+                entry2 := entry2 asString asLowercase.
+            ] ifFalse:[
+                entry1 := entry1 asString.
+                entry2 := entry2 asString.
+            ].
             res := entry1 < entry2.
         ] ifFalse:[
             (aIsDir or:[bIsDir]) ifTrue:[
@@ -702,7 +714,7 @@
 sortCaselessInTreeBrowser
 
     sortCaselessInTreeBrowser isNil ifTrue:[
-        sortCaselessInTreeBrowser := (Filename isCaseSensitive not) asValue.
+        sortCaselessInTreeBrowser := self sortCaseless value asValue.
         sortCaselessInTreeBrowser addDependent:self.
     ].
     ^ sortCaselessInTreeBrowser.
@@ -1312,5 +1324,5 @@
 !DirectoryTreeBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.89 2004-08-03 09:30:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.90 2004-08-06 13:08:06 penk Exp $'
 ! !