Some reorderings.

tim2view.lpi

@@ -27,7 +27,7 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
       <RevisionNr Value="90"/>
-      <BuildNr Value="61"/>
+      <BuildNr Value="68"/>
       <StringTable CompanyName="Lab 313" FileDescription="The best TIMs tool ever!:)" ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="6">

ucdimage.pas

@@ -40,7 +40,7 @@ procedure ReplaceTimInFileFromMemory(const FileName: string; TIM: PTIM;
 implementation
 
 uses
-  ucommon, ecc, edc, classes, FileUtil, sysutils;
+  ucommon, ecc, edc, classes, LazUTF8, LazFileUtils, sysutils;
 
 function bin2bcd(P: Integer): byte;
 begin
@@ -72,7 +72,7 @@ var
   tmp: TFileStream;
 begin
   Result := False;
-  Sz := FileSize(FileName);
+  Sz := FileSizeUTF8(FileName);
 
   if (Sz > cMaxFileSize) or (Sz = 0) then Exit;
 
@@ -210,7 +210,7 @@ var
 begin
   Result := False;
 
-  SIZE := FileSize(TimToInsert);
+  SIZE := FileSizeUTF8(TimToInsert);
   P := 0;
   TIM := LoadTimFromFile(TimToInsert, P, False, SIZE);
   // SaveTimToFile('test.tim', TIM);

uexportimport.pas

@@ -11,7 +11,7 @@ function LoadImage(const FileName: string): PDrawSurf;
 implementation
 
 uses
-  FPReadPNG, Classes, BGRABitmap, FileUtil, sysutils, zstream, FPWritePNG;
+  FPReadPNG, Classes, BGRABitmap, LazUTF8, sysutils, zstream, FPWritePNG;
 
 procedure SaveImage(const FileName: string; Surf: PDrawSurf; Indexed: Boolean);
 var

umain.lfm

@@ -889,15 +889,15 @@ object frmMain: TfrmMain
       object mnImportPng: TMenuItem
         Action = actPngImport
       end
-      object N21: TMenuItem
+    end
-        Caption = '-'
+    object mnExport: TMenuItem
+      Caption = '&Export'
+      object mnExtractAllPngs3: TMenuItem
+        Action = actExtractPngs
       end
       object mnExtractAllTims3: TMenuItem
         Action = actExtractTims
       end
-      object mnExtractAllPngs3: TMenuItem
-        Action = actExtractPngs
-      end
       object N22: TMenuItem
         Caption = '-'
       end

umain.pas

@@ -5,7 +5,7 @@ unit umain;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Dialogs, ActnList,
+  Classes, SysUtils, LazUTF8, LazFileUtils, Forms, Dialogs, ActnList,
   Menus, StdCtrls, ExtCtrls, ComCtrls, Grids, ExtDlgs,
 
   uscanresult, uscanthread, usettings, utim, udrawtim, types, Controls;
@@ -52,12 +52,12 @@ type
     dlgOpenFile: TOpenDialog;
     dlgSavePNG: TSavePictureDialog;
     dlgSaveFile: TSaveDialog;
+    mnExport: TMenuItem;
     mnExtractAllTimsAll: TMenuItem;
     mnExtractAllPngsAll: TMenuItem;
     N22: TMenuItem;
     mnExtractAllPngs3: TMenuItem;
     mnExtractAllTims3: TMenuItem;
-    N21: TMenuItem;
     N20: TMenuItem;
     mnSaveTIM1: TMenuItem;
     grdClut: TDrawGrid;
@@ -429,9 +429,9 @@ begin
       Application.ProcessMessages;
     end;
     Dispose(Image);
-    lblStatus.Caption := sStatusBarExtracted;
     pbProgress.Position := 0;
   end;
+  lblStatus.Caption := sStatusBarExtracted;
 end;
 
 procedure TfrmMain.actExtractPngsExecute(Sender: TObject);
@@ -540,9 +540,9 @@ begin
       pbProgress.Position := I;
       Application.ProcessMessages;
     end;
-    lblStatus.Caption := sStatusBarExtracted;
     pbProgress.Position := 0;
   end;
+  lblStatus.Caption := sStatusBarExtracted;
 end;
 
 procedure TfrmMain.actExtractTimsExecute(Sender: TObject);
@@ -622,7 +622,7 @@ var
   ScanRes: TScanResult;
 begin
   if not dlgOpenFile.Execute then Exit;
-  if FileSize(dlgOpenFile.FileName) > cTIMMaxSize then Exit;
+  if FileSizeUtf8(dlgOpenFile.FileName) > cTIMMaxSize then Exit;
 
   ScanRes := SelectedScanResult;
   ReplaceTimInFile(ScanRes.ScanFile, dlgOpenFile.FileName, SelectedTimInfo.Position, ScanRes.IsImage);
@@ -948,7 +948,7 @@ begin
 
   cbbFiles.Enabled := (cbbFiles.Items.Count <> 0);
   actExtractTimsAll.Enabled := cbbFiles.Enabled;
-
+  actExtractPngsAll.Enabled := cbbFiles.Enabled;
 
   pnlList.Enabled := cbbFiles.Enabled;
   actCloseFile.Enabled := cbbFiles.Enabled;

uscanthread.pas

@@ -37,7 +37,7 @@ type
 implementation
 
 uses
-  umain, ucdimage, sysutils, FileUtil;
+  umain, ucdimage, sysutils, LazUTF8, LazFileUtils;
 
 const
   cClearBufferSize = ((cTIMMaxSize div cSectorDataSize) + 1) * cSectorDataSize * 2;
@@ -51,7 +51,7 @@ begin
   FreeOnTerminate := True;
   pClearBufferPosition := 0;
   pFilePos := 0;
-  pFileSize := FileSize(FileToScan);
+  pFileSize := FileSizeUTF8(FileToScan);
   pStatusText := '';
   pStopScan := False;
 

usettings.pas

@@ -51,7 +51,7 @@ type
 
 implementation
 
-uses FileUtil
+uses LazUTF8
 
 {$IFDEF windows}
 ,windows, shlobj {for special folders}, ActiveX, ComObj

utim.pas

@@ -148,7 +148,7 @@ function ConvertCLUTColor(COLOR: TCLUT_COLOR): word;
 implementation
 
 uses
-  ucdimage, classes, sysutils, FileUtil;
+  ucdimage, classes, sysutils, LazUTF8;
 
 function ConvertTIMColor(COLOR: word): TCLUT_COLOR;
 begin