--- oup/current/Main.pas	2006/12/23 16:26:43	46
+++ oup/current/Main.pas	2006/12/23 23:36:07	53
@@ -66,6 +66,14 @@ type
     tb_rawedit: TTBItem;
     tb_datedit: TTBItem;
     menu_windows_tilevert: TTBItem;
+    tb_meta: TTBItem;
+    menu_meta: TTBItem;
+    TBSeparatorItem1: TTBSeparatorItem;
+    tb_db2dat: TTBItem;
+    tb_dat2db: TTBItem;
+    menu_loaddb: TTBItem;
+    tb_opendb: TTBItem;
+    procedure LoadFile(typedb: Boolean);
     function TryCloseAll: Boolean;
     procedure menu_AboutClick(Sender: TObject);
     procedure menu_settingsClick(Sender: TObject);
@@ -98,6 +106,9 @@ type
     procedure MDITabMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure menu_windows_tilevertClick(Sender: TObject);
+    procedure menu_metaClick(Sender: TObject);
+    procedure ToolbarDockChanged(Sender: TObject);
+    procedure menu_loaddbClick(Sender: TObject);
   private
   public
   end;
@@ -279,6 +290,28 @@ end;
 
 
 
+procedure TForm_Main.ToolbarDockChanged(Sender: TObject);
+var
+  toolbar: TTBToolbar;
+  position: TTBDockPosition;
+  mode: TTBItemDisplayMode;
+  i: Integer;
+  isEnabled: Boolean;
+begin
+  toolbar := TTBToolbar(Sender);
+  if toolbar.Floating then
+    mode := nbdmImageAndText
+  else begin
+    position := toolbar.CurrentDock.Position;
+    if position in [dpLeft, dpRight] then
+      mode := nbdmDefault
+    else
+      mode := nbdmImageAndText;
+  end;
+  for i := 0 to toolbar.Items.Count - 1 do
+    toolbar.Items.Items[i].DisplayMode := mode;
+end;
+
 function TForm_Main.TryCloseAll: Boolean;
 begin
   menu_windows_closeallClick(Self);
@@ -290,10 +323,8 @@ begin
 end;
 
 
- {#################################}
- {##### Main-Menu-Handlers    #####}
- {#################################}
-procedure TForm_Main.menu_loadfileClick(Sender: TObject);
+
+procedure TForm_Main.LoadFile(typedb: Boolean);
 var
   ext: String;
 begin
@@ -302,6 +333,10 @@ begin
     CloseDataConnection;
     opend.InitialDir := AppSettings.DatPath;
     opend.Filter     := 'Compatible level files|*.dat;*.oldb|Oni level (*.dat)|*.dat|OUP level database (*.oldb)|*.oldb|Any (*.*)|*';
+    if typedb then
+      opend.FilterIndex := 3
+    else
+      opend.FilterIndex := 2;
     if opend.Execute then
     begin
       ext := ExtractFileExt(opend.FileName);
@@ -324,6 +359,20 @@ begin
 end;
 
 
+ {#################################}
+ {##### Main-Menu-Handlers    #####}
+ {#################################}
+procedure TForm_Main.menu_loaddbClick(Sender: TObject);
+begin
+  LoadFile(True);
+end;
+
+procedure TForm_Main.menu_loadfileClick(Sender: TObject);
+begin
+  LoadFile(False);
+end;
+
+
 
 
 procedure TForm_Main.menu_settingsClick(Sender: TObject);
@@ -425,6 +474,12 @@ begin
 end;
 
 
+procedure TForm_Main.menu_metaClick(Sender: TObject);
+begin
+  ShowMessage('TBD');
+end;
+
+
 procedure TForm_Main.menu_filecompareClick(Sender: TObject);
 begin
   open_child('compare', -1);