--- oup/current/Main.pas	2007/02/21 03:12:33	109
+++ oup/current/Main.pas	2007/04/08 23:52:14	172
@@ -137,6 +137,9 @@ var
 
 implementation
 
+uses
+  LevelDB;
+
 {$R *.dfm}
 
 
@@ -169,6 +172,7 @@ var
   i: Integer;
   toolform: TForm_ToolTemplate;
 begin
+  Result := True;
   if MDITab.MDIChildCount > 0 then
   begin
     for i := 0 to MDITab.MDIChildCount - 1 do
@@ -179,7 +183,10 @@ begin
         if toolform.ConnectionID = ConManager.ConnectionByIndex[index].ConnectionID then
         begin
           if not toolform.Closeable then
-            ShowMessage('Can not close toolwindow: ' + toolform.Caption); 
+          begin
+            ShowMessage('Can not close toolwindow: ' + toolform.Caption);
+            Result := False;
+          end;
         end; 
       end;
     end;
@@ -234,8 +241,6 @@ end;
 
 
 procedure TForm_Main.FormCreate(Sender: TObject);
-var
-  RepMsg: TStatusMessages;
 begin
   Self.Caption := 'Oni Un/Packer ' + version;
   Self.FormResize(Self);
@@ -254,7 +259,6 @@ begin
   begin
     AppSettings.DatPath        := ExtractFilepath(Application.EXEname);
     AppSettings.ExtractPath    := ExtractFilepath(Application.EXEname) + '\extract';
-    AppSettings.FilenumbersAsHex := False;
     AppSettings.CharSet        := DEFAULT_CHARSET;
     AppSettings.HideUnusedData := False;
   end;
@@ -441,7 +445,6 @@ var
   position: TTBDockPosition;
   mode: TTBItemDisplayMode;
   i: Integer;
-  isEnabled: Boolean;
 begin
   toolbar := TTBToolbar(Sender);
   if toolbar.Floating then
@@ -547,29 +550,27 @@ end;
  {####################################}
 procedure TForm_Main.menu_createdbClick(Sender: TObject);
 begin
-  ShowMessage('Not yet usable');
-{
+//  ShowMessage('Not yet usable');
+
   opend.Filter     := 'Oni-Dat-Files|*.dat';
   saved.Filter     := 'OUP-Level-DB (*.oldb)|*.oldb';
   saved.DefaultExt := 'oldb';
   if opend.Execute then
     if saved.Execute then
       Form_LevelDB.CreateDatabase(opend.FileName, saved.FileName);
-}
 end;
 
 
 procedure TForm_Main.menu_createlvlClick(Sender: TObject);
 begin
-  ShowMessage('Not yet usable');
-{
+//  ShowMessage('Not yet usable');
+
   opend.Filter     := 'OUP-Level-DB (*.oldb)|*.oldb';
   saved.Filter     := 'Oni-Dat-Files|*.dat';
   saved.DefaultExt := 'dat';
   if opend.Execute then
     if saved.Execute then
       Form_LevelDB.CreateLevel(opend.FileName, saved.FileName);
-}
 end;
 
 
@@ -674,7 +675,6 @@ end;
 procedure TForm_Main.menu_conns_itemClick(Sender: TObject);
 var
   name: String;
-  i: Integer;
   index: Integer;
   RepMsg: TStatusMessages;
 begin
@@ -726,11 +726,26 @@ end;
 
 
 function TForm_Main.open_child(window_context: String; connection, fileid: Integer): TForm_ToolTemplate;
+type
+  TTemplate = class of TForm_ToolTemplate;
+  TTool = record
+      name: String;
+      icon: Integer;
+      caption: String;
+      classt: TTemplate;
+  end;
+const
+  Tools: array[0..4] of TTool = (
+    (name: 'binedit';     icon: 5; caption: 'Binary .dat-Editor'; classt: TForm_BinEdit),
+    (name: 'extractor';   icon: 8; caption: 'Extractor';          classt: TForm_Extractor),
+    (name: 'preview';     icon: 4; caption: 'Preview-Window';     classt: TForm_Preview),
+    (name: 'rawedit';     icon: 6; caption: 'Binary .raw-Editor'; classt: TForm_RawEdit),
+    (name: 'txmpreplace'; icon: 7; caption: 'TXMP Replacer';      classt: TForm_TxmpReplace)
+  );
 var
   toolform:    TForm_ToolTemplate;
   i:           Integer;
   tag:         Integer;
-  caption_end: String;
   iconindex:   Integer;
 begin
   Result := nil;
@@ -742,37 +757,19 @@ begin
         tag := MDIChildren[i].Tag + 1;
 
   iconindex := -1;
-  caption_end := IntToStr(tag) + '       ';
 
-  if window_context = 'binedit' then
-  begin
-    toolform         := TForm_BinEdit.Create(Self);
-    toolform.Caption := 'Binary .dat-Editor ' + caption_end;
-    iconindex        := 5;
-  end;
-  if window_context = 'extractor' then
-  begin
-    toolform         := TForm_Extractor.Create(Self);
-    toolform.Caption := 'Extractor ' + caption_end;
-    iconindex        := 8;
-  end;
-  if window_context = 'preview' then
-  begin
-    toolform         := TForm_Preview.Create(Self);
-    toolform.Caption := 'Preview-Window ' + caption_end;
-    iconindex        := 4;
-  end;
-  if window_context = 'rawedit' then
-  begin
-    toolform         := TForm_RawEdit.Create(Self);
-    toolform.Caption := 'Binary .raw-Editor ' + caption_end;
-    iconindex        := 6;
-  end;
-  if window_context = 'txmpreplace' then
-  begin
-    toolform         := TForm_TxmpReplace.Create(Self);
-    toolform.Caption := 'TXMP Replacer ' + caption_end;
-    iconindex        := 7;
+  toolform := nil;
+
+  for i := 0 to High(Tools) do
+    if Tools[i].name = window_context then
+      Break;
+  if i < Length(Tools) then
+  begin
+    toolform         := TTemplate(Tools[i].classt).Create(Self);
+    toolform.Caption := Tools[i].caption + ' ' + IntToStr(tag) + '       ';
+    iconindex        := Tools[i].icon;
+  end else begin
+    ShowMessage('WindowContext not found!');
   end;
 
   if Assigned(toolform) then