--- oup/current/Main.dfm	2007/06/18 14:22:53	222
+++ oup/current/Main.dfm	2007/06/19 22:06:10	227
@@ -138,6 +138,10 @@ object Form_Main: TForm_Main
           ShortCut = 16461
           OnClick = menu_metaClick
         end
+        object menu_filemanager: TTBItem
+          Caption = '&FileManager'
+          OnClick = menu_filemanagerClick
+        end
         object menu_filecompare: TTBItem
           Caption = '&File compare ...'
           Enabled = False
@@ -198,6 +202,11 @@ object Form_Main: TForm_Main
             Checked = True
             OnClick = menu_view_toolbarClick
           end
+          object menu_view_toolbar_tools: TTBItem
+            Caption = '&Toolbar (Tools)'
+            Checked = True
+            OnClick = menu_view_toolbar_toolsClick
+          end
           object menu_view_statusbar: TTBItem
             Caption = '&Status bar'
             Checked = True
@@ -215,14 +224,14 @@ object Form_Main: TForm_Main
         OnClick = menu_AboutClick
       end
     end
-    object Toolbar: TTBToolbar
+    object Toolbar_main: TTBToolbar
       Left = 0
       Top = 23
-      Caption = 'Toolbar'
+      Caption = 'Toolbar_main'
       DragHandleStyle = dhDouble
       Images = MenuImages
       TabOrder = 1
-      OnDockChanged = ToolbarDockChanged
+      OnDockChanged = Toolbar_mainDockChanged
       object tbOpen: TTBItem
         Caption = 'Open .dat'
         DisplayMode = nbdmImageAndText
@@ -251,6 +260,51 @@ object Form_Main: TForm_Main
       end
       object TBSeparatorItem1: TTBSeparatorItem
       end
+    end
+    object MDIToolbar: TTBToolbar
+      Left = 29
+      Top = 49
+      Caption = 'MDIToolbar'
+      DockableTo = [dpTop, dpBottom]
+      DockMode = dmCannotFloat
+      DockPos = 29
+      DockRow = 3
+      DragHandleStyle = dhDouble
+      TabOrder = 2
+      object TBControlItem1: TTBControlItem
+        Control = MDITab
+      end
+      object MDITab: TMDITab
+        Left = 0
+        Top = 0
+        Width = 300
+        Height = 22
+        Cursor = crHandPoint
+        About = 'MDI Tab Control 1.4 - Copyright '#169' 1999,2002 MichaL MutL'
+        Align = alTop
+        DragKind = dkDock
+        HotTrack = True
+        Images = MenuImages
+        OwnerDraw = True
+        Style = tsFlatButtons
+        OnDrawTab = MDITabDrawTab
+        ParentShowHint = False
+        ShowHint = True
+        ShowOnChange = True
+        TabOrder = 0
+        OnMouseMove = MDITabMouseMove
+        OnMouseUp = MDITabMouseUp
+      end
+    end
+    object Toolbar_tools: TTBToolbar
+      Left = 328
+      Top = 23
+      Caption = 'Toolbar'
+      DockPos = 334
+      DragHandleStyle = dhDouble
+      Images = MenuImages
+      TabOrder = 3
+      OnDockChanged = Toolbar_mainDockChanged
       object tb_preview: TTBItem
         Caption = 'Preview'
         DisplayMode = nbdmImageAndText
@@ -293,6 +347,10 @@ object Form_Main: TForm_Main
         ImageIndex = 11
         OnClick = menu_metaClick
       end
+      object tb_filemanager: TTBItem
+        Caption = 'FileManager'
+        OnClick = menu_filemanagerClick
+      end
       object tb_compare: TTBItem
         Caption = 'File compare'
         DisplayMode = nbdmImageAndText
@@ -307,41 +365,6 @@ object Form_Main: TForm_Main
         ImageIndex = 12
       end
     end
-    object MDIToolbar: TTBToolbar
-      Left = 0
-      Top = 49
-      Caption = 'MDIToolbar'
-      DockableTo = [dpTop, dpBottom]
-      DockMode = dmCannotFloat
-      DockPos = 0
-      DockRow = 2
-      DragHandleStyle = dhDouble
-      TabOrder = 2
-      object TBControlItem1: TTBControlItem
-        Control = MDITab
-      end
-      object MDITab: TMDITab
-        Left = 0
-        Top = 0
-        Width = 300
-        Height = 22
-        Cursor = crHandPoint
-        About = 'MDI Tab Control 1.4 - Copyright '#169' 1999,2002 MichaL MutL'
-        Align = alTop
-        DragKind = dkDock
-        HotTrack = True
-        Images = MenuImages
-        OwnerDraw = True
-        Style = tsFlatButtons
-        OnDrawTab = MDITabDrawTab
-        ParentShowHint = False
-        ShowHint = True
-        ShowOnChange = True
-        TabOrder = 0
-        OnMouseMove = MDITabMouseMove
-        OnMouseUp = MDITabMouseUp
-      end
-    end
   end
   object DockLeft: TTBDock
     Left = 0