diff -r 73efe0a84f4b -r dcfbf5a1e032 UIPainter.st
--- a/UIPainter.st	Mon May 18 12:10:10 2009 +0200
+++ b/UIPainter.st	Mon May 18 12:10:52 2009 +0200
@@ -1360,135 +1360,144 @@
         component: 
        (SpecCollection
           collection: (
-            (ViewSpec
-              name: 'ToolBar'
-              layout: (LayoutFrame 0 0 0 0 0 1 32 0)
-              visibilityChannel: toolBarVisibleHolder
-              component: 
-             (SpecCollection
-                collection: (
-                 (ActionButtonSpec
-                    label: 'hideToolBarIcon'
-                    name: 'HideToolBarButton'
-                    layout: (LayoutFrame 0 0 0 0 13 0 0 1)
-                    activeHelpKey: hideToolBar
-                    hasCharacterOrientedLabel: false
-                    translateLabel: true
-                    model: hideToolbar
-                    postBuildCallback: hideToolBarButtonCreated:
-                  )
-                 (MenuPanelSpec
-                    name: 'menuToolbarView'
-                    layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
-                    visibilityChannel: toolBarVisibleHolder
-                    menu: menuToolbar
-                    textDefault: true
-                  )
-                 )
-              )
-            ) 
-
-            (ViewSpec
-              name: 'EditToolBar'
-              layout: (LayoutFrame 0 0 32 0 0 1 64 0)
-              visibilityChannel: editToolBarVisibleHolder
-              component: 
-             (SpecCollection
-                collection: (
-                 (ActionButtonSpec
-                    label: 'hideToolBarIcon'
-                    name: 'HideEditToolBarButton'
-                    layout: (LayoutFrame 0 0 0 0 13 0 0 1)
-                    activeHelpKey: hideToolBar
-                    hasCharacterOrientedLabel: false
-                    translateLabel: true
-                    model: hideEditToolbar
-                    postBuildCallback: hideToolBarButtonCreated:
-                  )
-                 (MenuPanelSpec
-                    name: 'EditToolBar1'
-                    layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
-                    visibilityChannel: editToolBarVisibleHolder
-                    menu: editToolbar
-                    textDefault: true
-                  )
-                 )
-
-              )
-            )
-
-           (VariableHorizontalPanelSpec
-              name: 'Painter'
-              layout: (LayoutFrame 0 0.0 64 0.0 0 1.0 -24 1.0)
-              level: 1
+           (ViewSpec
+              name: 'mainPanel'
+              layout: (LayoutFrame 0 0 0 0 0 1 -24 1)
               component: 
              (SpecCollection
                 collection: (
-                 (ArbitraryComponentSpec
-                    name: 'treeView'
-                    tabable: true
-                    menu: menuEdit
-                    hasHorizontalScrollBar: true
-                    hasVerticalScrollBar: true
-                    miniScrollerHorizontal: true
-                    miniScrollerVertical: true
-                    hasBorder: false
-                    component: treeView
+                 (ViewSpec
+                    name: 'ToolBar'
+                    layout: (LayoutFrame 0 0 0 0 0 1 32 0)
+                    visibilityChannel: toolBarVisibleHolder
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (ActionButtonSpec
+                          label: 'hideToolBarIcon'
+                          name: 'HideToolBarButton'
+                          layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+                          activeHelpKey: hideToolBar
+                          hasCharacterOrientedLabel: false
+                          translateLabel: true
+                          model: hideToolbar
+                          postBuildCallback: hideToolBarButtonCreated:
+                        )
+                       (MenuPanelSpec
+                          name: 'menuToolbarView'
+                          layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+                          visibilityChannel: toolBarVisibleHolder
+                          menu: menuToolbar
+                          textDefault: true
+                        )
+                       )
+                     
+                    )
                   )
                  (ViewSpec
-                    name: 'specHolderView'
-                    level: 0
+                    name: 'EditToolBar'
+                    layout: (LayoutFrame 0 0 30 0 0 1 62 0)
+                    visibilityChannel: editToolBarVisibleHolder
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (ActionButtonSpec
+                          label: 'hideToolBarIcon'
+                          name: 'HideEditToolBarButton'
+                          layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+                          activeHelpKey: hideToolBar
+                          hasCharacterOrientedLabel: false
+                          translateLabel: true
+                          model: hideEditToolbar
+                          postBuildCallback: hideToolBarButtonCreated:
+                        )
+                       (MenuPanelSpec
+                          name: 'EditToolBar1'
+                          layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+                          visibilityChannel: editToolBarVisibleHolder
+                          menu: editToolbar
+                          textDefault: true
+                        )
+                       )
+                     
+                    )
+                  )
+                 (VariableHorizontalPanelSpec
+                    name: 'Painter'
+                    layout: (LayoutFrame 0 0.0 60 0.0 0 1.0 0 1.0)
+                    level: 1
                     component: 
                    (SpecCollection
                       collection: (
-                       (MenuPanelSpec
-                          name: 'menuToolbar2View'
-                          layout: (LayoutFrame 2 0.0 2 0 -2 1.0 32 0)
-                          level: 0
-                          tabable: true
-                          menu: menuToolbar2
-                        )
-                       (NoteBookViewSpec
-                          name: 'noteBook'
-                          layout: (LayoutFrame 2 0.0 32 0.0 -2 1.0 -28 1.0)
-                          level: 0
-                          enableChannel: enableChannel
+                       (ArbitraryComponentSpec
+                          name: 'treeView'
                           tabable: true
-                          model: tabModel
-                          menu: tabList
-                          translateLabel: true
-                          canvas: noteBookView
+                          menu: menuEdit
+                          hasHorizontalScrollBar: true
+                          hasVerticalScrollBar: true
+                          miniScrollerHorizontal: true
+                          miniScrollerVertical: true
+                          hasBorder: false
+                          component: treeView
                         )
-                       (HorizontalPanelViewSpec
-                          name: 'HorizontalPanel1'
-                          layout: (LayoutFrame 2 0 -26 1 -2 1 -2 1)
-                          horizontalLayout: fit
-                          verticalLayout: fit
-                          horizontalSpace: 3
-                          verticalSpace: 3
-                          reverseOrderIfOKAtLeft: true
+                       (ViewSpec
+                          name: 'specHolderView'
+                          level: 0
                           component: 
                          (SpecCollection
                             collection: (
-                             (ActionButtonSpec
-                                label: 'Cancel'
-                                name: 'cancelButton'
-                                activeHelpKey: commitCancel
+                             (MenuPanelSpec
+                                name: 'menuToolbar2View'
+                                layout: (LayoutFrame 2 0.0 2 0 -2 1.0 32 0)
+                                level: 0
+                                tabable: true
+                                menu: menuToolbar2
+                              )
+                             (NoteBookViewSpec
+                                name: 'noteBook'
+                                layout: (LayoutFrame 2 0.0 32 0.0 -2 1.0 -28 1.0)
+                                level: 0
+                                enableChannel: enableChannel
+                                tabable: true
+                                model: tabModel
+                                menu: tabList
                                 translateLabel: true
-                                tabable: true
-                                model: cancel
-                                enableChannel: modifiedChannel
-                                extent: (Point 201 24)
+                                canvas: noteBookView
                               )
-                             (ActionButtonSpec
-                                label: 'OK'
-                                name: 'acceptButton'
-                                activeHelpKey: commitOK
-                                translateLabel: true
-                                tabable: true
-                                model: accept
-                                enableChannel: modifiedChannel
-                                extent: (Point 201 24)
+                             (HorizontalPanelViewSpec
+                                name: 'HorizontalPanel1'
+                                layout: (LayoutFrame 2 0 -26 1 -2 1 -2 1)
+                                horizontalLayout: fit
+                                verticalLayout: fit
+                                horizontalSpace: 3
+                                verticalSpace: 3
+                                reverseOrderIfOKAtLeft: true
+                                component: 
+                               (SpecCollection
+                                  collection: (
+                                   (ActionButtonSpec
+                                      label: 'Cancel'
+                                      name: 'cancelButton'
+                                      activeHelpKey: commitCancel
+                                      translateLabel: true
+                                      tabable: true
+                                      model: cancel
+                                      enableChannel: modifiedChannel
+                                      extent: (Point 146 24)
+                                    )
+                                   (ActionButtonSpec
+                                      label: 'OK'
+                                      name: 'acceptButton'
+                                      activeHelpKey: commitOK
+                                      translateLabel: true
+                                      tabable: true
+                                      model: accept
+                                      enableChannel: modifiedChannel
+                                      extent: (Point 146 24)
+                                    )
+                                   )
+                                 
+                                )
                               )
                              )
                            
@@ -1497,11 +1506,11 @@
                        )
                      
                     )
+                    handles: (Any 0.5 1.0)
                   )
                  )
                
               )
-              handles: (Any 0.318868 1.0)
             )
            (UISubSpecification
               name: 'infoBarSubSpec'
@@ -1512,7 +1521,7 @@
             )
            )
          
-      )
+        )
       )
 ! !