--- oup/rewrite/Main.pas	2007/01/22 23:05:45	97
+++ oup/current/Main.pas	2007/02/21 03:12:33	109
@@ -10,8 +10,7 @@ uses
   Functions,
   Settings, {Helper_LevelDB, }
   Template,
-  Preview;
-//  BinEdit, Extractor, RawEdit, TxmpReplace;
+  RawEdit, BinEdit, Extractor, Preview, TxmpReplace;
 
 type
   TForm_Main = class(TForm)
@@ -161,6 +160,7 @@ begin
   if RepMsg = SM_OK then
   begin
     UpdateStatBar;
+    UpdateConLists;
   end;
 end;
 
@@ -496,7 +496,7 @@ end;
 
 procedure TForm_Main.LoadFile(typedb: Boolean);
 var
-  ext: String;
+  i: Integer;
 begin
   opend.InitialDir := AppSettings.DatPath;
   opend.Filter     := 'Compatible level files|*.dat;*.oldb|Oni level (*.dat)|*.dat|OUP level database (*.oldb)|*.oldb|Any (*.*)|*';
@@ -506,15 +506,9 @@ begin
     opend.FilterIndex := 2;
   if opend.Execute then
   begin
-    ext := ExtractFileExt(opend.FileName);
-    if ext = '.dat' then
-    begin
-      CreateConnection(opend.FileName);
-    end else if ext = '.oldb' then
-    begin
-      CreateConnection(opend.FileName);
-    end else
-      ShowMessage('Incompatible file');
+    if opend.Files.Count > 0 then
+      for i := 0 to opend.Files.Count - 1 do
+        CreateConnection(opend.Files.Strings[i]);
     AppSettings.DatPath := ExtractFilepath(opend.FileName);
   end;
   UpdateStatBar;
@@ -692,6 +686,8 @@ begin
   begin
     CheckConnectionCloseable(index);
     ConManager.CloseConnectionByIndex(index, RepMsg);
+    ShowOpenMsg(RepMsg);
+    UpdateConLists;
   end;
   UpdateStatBar;
 end;
@@ -750,13 +746,13 @@ begin
 
   if window_context = 'binedit' then
   begin
-//    toolform         := TForm_BinEdit.Create(Self);
+    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         := TForm_Extractor.Create(Self);
     toolform.Caption := 'Extractor ' + caption_end;
     iconindex        := 8;
   end;
@@ -768,13 +764,13 @@ begin
   end;
   if window_context = 'rawedit' then
   begin
-//    toolform         := TForm_RawEdit.Create(Self);
+    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(Application);
+    toolform         := TForm_TxmpReplace.Create(Self);
     toolform.Caption := 'TXMP Replacer ' + caption_end;
     iconindex        := 7;
   end;