--- a/FileBrowserV2.st	Thu Feb 06 13:09:22 2014 +0100
+++ b/FileBrowserV2.st	Thu Feb 06 13:51:30 2014 +0100
@@ -461,7 +461,6 @@
                  (MenuPanelSpec
                     name: 'ToolBar'
                     layout: (LayoutFrame 13 0 0 0 0 1 40 0)
-                    level: 1
                     menu: toolBarMainMenu
                     textDefault: true
                   )
@@ -484,6 +483,7 @@
                     hasCharacterOrientedLabel: false
                     translateLabel: true
                     model: hideBookmarkBar
+                    postBuildCallback: hideToolBarButtonCreated:
                   )
                  (SubCanvasSpec
                     name: 'Bookmarks'
@@ -515,7 +515,7 @@
            (ViewSpec
               name: 'FilenameEntryFieldBox'
               layout: (LayoutFrame 0 0 67 0 0 1 92 0)
-              level: 0
+              "/ level: 0
               visibilityChannel: filenameEntryFieldVisibleHolder
               component: 
              (SpecCollection
@@ -901,43 +901,35 @@
         (
          (MenuItem
             label: 'Browser'
-            translateLabel: true
             submenuChannel: browserMenu
           )
          (MenuItem
             label: 'Directory'
-            translateLabel: true
             submenuChannel: directoryMenu
           )
          (MenuItem
             label: 'File'
-            translateLabel: true
             submenuChannel: fileMenu
           )
          (MenuItem
             label: 'Edit'
-            translateLabel: true
             submenuChannel: editMenu
           )
          (MenuItem
             label: 'View'
-            translateLabel: true
             submenu: 
            (Menu
               (
                (MenuItem
                   label: 'Details'
-                  translateLabel: true
                   submenuChannel: viewInContentsBrowserMenu
                 )
                (MenuItem
                   label: 'Sort'
-                  translateLabel: true
                   submenuChannel: sortMenu
                 )
                (MenuItem
                   label: 'Show'
-                  translateLabel: true
                   submenuChannel: showMenuSpec
                 )
                (MenuItem
@@ -945,30 +937,31 @@
                 )
                (MenuItem
                   label: 'Toolbar'
-                  translateLabel: true
                   hideMenuOnActivated: false
                   indication: toolBarVisibleHolder
                 )
                (MenuItem
+                  label: 'Bookmarks'
+                  hideMenuOnActivated: false
+                  indication: bookmarkBarVisibleHolder
+                )
+               (MenuItem
                   label: 'Path Entry && Filter'
-                  translateLabel: true
                   hideMenuOnActivated: false
                   indication: filenameEntryFieldVisibleHolder
                 )
                (MenuItem
                   label: 'Info'
-                  translateLabel: true
                   hideMenuOnActivated: false
                   indication: infoBarVisibleHolder
                 )
                (MenuItem
                   label: 'Tags'
-                  translateLabel: true
+                  hideMenuOnActivated: false
                   indication: tagsBrowserVisibleHolder
                 )
                (MenuItem
                   label: 'Preview'
-                  translateLabel: true
                   hideMenuOnActivated: false
                   indication: previewVisibleHolder
                 )
@@ -978,7 +971,6 @@
                (MenuItem
                   label: 'Update'
                   itemValue: updateCurrentDirectory
-                  translateLabel: true
                 )
                )
               nil
@@ -987,23 +979,19 @@
           )
          (MenuItem
             label: 'Tools'
-            translateLabel: true
             submenuChannel: toolsMenuSpec
           )
          (MenuItem
             label: 'Source Code Management'
-            translateLabel: true
             submenuChannel: scmMenuSlice
             isMenuSlice: true
           )
          (MenuItem
             label: 'Extras'
-            translateLabel: true
             submenuChannel: extraMenu
           )
          (MenuItem
             label: 'MENU_Help'
-            translateLabel: true
             startGroup: conditionalRight
             submenu: 
            (Menu
@@ -1011,7 +999,6 @@
                (MenuItem
                   label: 'FileBrowser Documentation'
                   itemValue: openHTMLDocument:
-                  translateLabel: true
                   argument: 'tools/fbrowserV2/TOP.html'
                 )
                (MenuItem
@@ -1020,7 +1007,6 @@
                (MenuItem
                   label: 'About FileBrowser...'
                   itemValue: openAboutThisApplication
-                  translateLabel: true
                 )
                )
               nil
@@ -1986,31 +1972,32 @@
 
 update:something with:aParameter from:changedObject
     changedObject == self selectedDeviceDrive ifTrue:[
-	self selectedDeviceDriveChanged.
-	^ self.
+        self selectedDeviceDriveChanged.
+        ^ self.
     ].
     changedObject == self fileEntryFieldHolder ifTrue:[
-	self fileEntryFieldHolderChanged.
-	^ self.
+        self fileEntryFieldHolderChanged.
+        ^ self.
     ].
     changedObject == self currentFileNameHolder ifTrue:[
-	super update:something with:aParameter from:changedObject.
-	self currentFileNameHolderChanged.
-	^ self.
+        super update:something with:aParameter from:changedObject.
+        self currentFileNameHolderChanged.
+        ^ self.
     ].
     (changedObject == self previewVisibleHolder) ifTrue:[
-	self updatePreview.
-	^ self.
+        self updatePreview.
+        ^ self.
     ].
     (changedObject == self toolBarVisibleHolder
+    or:[changedObject == self bookmarkBarVisibleHolder
     or:[changedObject == self filenameEntryFieldVisibleHolder
-    or:[changedObject == self infoBarVisibleHolder]]) ifTrue:[
-	self updateToolVisibility.
-	^ self.
+    or:[changedObject == self infoBarVisibleHolder]]]) ifTrue:[
+        self updateToolVisibility.
+        ^ self.
     ].
     (changedObject == self sortBlockProperty or:[changedObject == self sortDirectoriesBeforeFiles]) ifTrue:[
-	self sortFileListsBy:(self sortBlockProperty value) withReverse:false.
-	^ self.
+        self sortFileListsBy:(self sortBlockProperty value) withReverse:false.
+        ^ self.
     ].
 
     ^ super update:something with:aParameter from:changedObject.
@@ -2086,8 +2073,13 @@
 
     bookmarkBarVisible := self bookmarkBarVisibleHolder value.
     bookmarkBarVisible ifTrue:[
-        bookmarkBar := bldr componentAt:#Bookmarks.
-        topOffset := topOffset + (bookmarkBar height max: 25)
+        bookmarkBar := bldr componentAt:#BookmarkBar.
+        d := bookmarkBar height. "/ layout bottomOffset - bookmarkBar layout topOffset.
+        bookmarkBar layout topOffset:topOffset bottomOffset:topOffset + d.
+        "/ that's the consequence of modifying the layout, instead of sending #layout:
+        "/ we have to tell the component that it changed here!!
+        bookmarkBar layoutChanged.
+        topOffset := topOffset + d
     ].
 
     filenameEntryFieldVisible := self filenameEntryFieldVisibleHolder value.
@@ -2095,10 +2087,10 @@
         filenameEntryField := bldr componentAt:#FilenameEntryFieldBox.
         d := filenameEntryField layout bottomOffset - filenameEntryField layout topOffset.
         filenameEntryField layout topOffset:topOffset bottomOffset:topOffset + d.
+        "/ that's the consequence of modifying the layout, instead of sending #layout:
+        "/ we have to tell the component that it changed here!!
+        filenameEntryField layoutChanged.
         topOffset := topOffset + filenameEntryField height.
-        filenameEntryField container notNil ifTrue:[
-            filenameEntryField containerChangedSize.
-        ].
     ].
 
     infoBarVisible := self infoBarVisibleHolder value.
@@ -2426,7 +2418,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.214 2014-02-05 18:59:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.215 2014-02-06 12:51:30 cg Exp $'
 ! !