--- oup/current/Main.pas	2006/12/23 16:26:43	46
+++ oup/current/Main.pas	2006/12/23 22:16:42	51
@@ -66,6 +66,11 @@ 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;
     function TryCloseAll: Boolean;
     procedure menu_AboutClick(Sender: TObject);
     procedure menu_settingsClick(Sender: TObject);
@@ -98,6 +103,8 @@ 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);
   private
   public
   end;
@@ -279,6 +286,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);
@@ -425,6 +454,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);