--- oup/current/Tools/TxmpReplace.pas	2007/05/24 17:48:18	192
+++ oup/current/Tools/TxmpReplace.pas	2007/05/26 20:41:34	199
@@ -27,6 +27,7 @@ type
     procedure btn_saveClick(Sender: TObject);
     procedure btn_loadClick(Sender: TObject);
     procedure btn_replaceClick(Sender: TObject);
+    procedure Splitter1Moved(Sender: TObject);
   private
     OniImage_Old: TOniImage;
     OniImage_New: TOniImage;
@@ -56,7 +57,7 @@ begin
 
   OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
   old_size := OniImage_Old.GetImageSize(True);
-  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 0);
+  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
 
   check_fading.Checked := OniImage_Old.HasMipMaps;
 //  check_transparency.Checked := (depthbyte and $04) > 0;
@@ -66,6 +67,17 @@ begin
 end;
 
 
+procedure TForm_TxmpReplace.Splitter1Moved(Sender: TObject);
+begin
+  inherited;
+  image_txmppreview.Picture.Assign(nil);
+  image_bmppreview.Picture.Assign(nil);
+  if Length(OniImage_Old.Images) > 0 then
+    OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
+  if Length(OniImage_New.Images) > 0 then
+    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 1);
+end;
+
 procedure TForm_TxmpReplace.btn_loadClick(Sender: TObject);
 var
   mem:   TMemoryStream;
@@ -73,7 +85,7 @@ begin
   if opend.Execute then
   begin
     OniImage_New.LoadFromFile(opend.FileName);
-    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 0);
+    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 1);
     group_options.Enabled := True;
   end;
 end;
@@ -88,6 +100,8 @@ var
   oldfading: Byte;
   datbyte: Word;
   mem: TMemoryStream;
+  new_storetype: Byte;
+  formatinfo: TImageFormatInfo;
 begin
   if filelist.ItemIndex >= 0 then
   begin
@@ -114,6 +128,29 @@ begin
 
     mem := TMemoryStream.Create;
 
+    case OniImage_New.Format of
+      ifX1R5G5B5: new_storetype := 1;
+      ifA1R5G5B5: new_storetype := 2;
+      ifA4R4G4B4: new_storetype := 0;
+      ifA8R8G8B8:
+        begin
+          new_storetype := 8;
+          OniImage_New.Format := ifX8R8G8B8;
+        end;
+      ifX8R8G8B8: new_storetype := 8;
+      ifDXT1: new_storetype := 9;
+    else
+      if OniImage_New.FormatInfo.HasAlphaChannel then
+        ShowMessage('Loaded image has an alpha-channel.' + #13#10 +
+                    'Because the format is neither ARGB1555' +#13#10 +
+                    'nor ARGB4444 it can not be imported without conversion.' + #13#10 +
+                    'It is converted to RGB888, so alpha gets dropped.' + #13#10 +
+                    'If you need alpha you have to save your image in' + #13#10 +
+                    'one of the previously named formats.');  
+      OniImage_New.Format := ifX8R8G8B8;
+      new_storetype := 8;
+    end;
+
     OniImage_New.SaveDataToStream(check_fading.Checked, TStream(mem));
 
     newsize := mem.Size;
@@ -121,17 +158,17 @@ begin
 
     if (newsize > old_size) and (ConManager.Connection[ConnectionID].Backend = DB_ONI) then
       new_rawaddr := ConManager.Connection[ConnectionID].AppendRawFile(
-        not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN),
-        mem.Size, mem)
+        not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN), mem)
     else
     begin
       new_rawaddr := old_rawaddr;
       ConManager.Connection[ConnectionID].UpdateRawFile(fileid, $9C, mem);
     end;
 
-    datbyte := $00;
     if check_fading.Checked then
-      datbyte := datbyte or $01;
+      oldfading := oldfading or $01
+    else
+      oldfading := oldfading and (not Byte($01));
     ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $88, 1, @datbyte);
     datbyte := $10;
 //    if check_transparency.Checked then
@@ -141,27 +178,14 @@ begin
     ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8C, 2, @datbyte);
     datbyte := OniImage_New.Height[1];
     ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8E, 2, @datbyte);
-    case OniImage_New.Format of
-      ifA1R5G5B5: datbyte := 2;
-      ifA4R4G4B4: datbyte := 0;
-      ifA8R8G8B8:
-        begin
-          datbyte := 8;
-          OniImage_New.Format := ifX8R8G8B8;
-        end;
-      ifX8R8G8B8: datbyte := 8;
-      ifDXT1: datbyte := 9;
-    else
-      OniImage_New.Format := ifX8R8G8B8;
-      datbyte := 8;
-    end;
-    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $90, 1, @datbyte);
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $90, 1, @new_storetype);
     if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
       ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
     else
       ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
 
     ShowMessage('TXMP-image replaced');
+    Self.listClick(Self);
   end;
 end;