diff --git a/installer/installer/AMXInstaller.cfg b/installer/installer/AMXInstaller.cfg index d696e73a..391c6b0e 100755 --- a/installer/installer/AMXInstaller.cfg +++ b/installer/installer/AMXInstaller.cfg @@ -32,8 +32,8 @@ -M -$M16384,1048576 -K$00400000 --LE"c:\programme\borland\delphi7\Projects\Bpl" --LN"c:\programme\borland\delphi7\Projects\Bpl" +-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" +-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" -DmadExcept -w-UNSAFE_TYPE -w-UNSAFE_CODE diff --git a/installer/installer/AMXInstaller.dpr b/installer/installer/AMXInstaller.dpr index 54598ec8..d2a8f9bf 100755 --- a/installer/installer/AMXInstaller.dpr +++ b/installer/installer/AMXInstaller.dpr @@ -7,7 +7,7 @@ program AMXInstaller; - Indy 9 (www.indyproject.org) - FlatStyle Components (www.torry.net) - - FlatPack Component Pack (www.torry.net) + - mxFlatPack Component Pack (www.maxcomponents.net/components.html) - JVCL Lib Pack 3.0 (jvcl.sourceforge.net) AMXX Installer for AMX Mod X is developed under GNU Public License diff --git a/installer/installer/AMXInstaller.exe b/installer/installer/AMXInstaller.exe index 117cd0b0..78b3b60b 100755 Binary files a/installer/installer/AMXInstaller.exe and b/installer/installer/AMXInstaller.exe differ diff --git a/installer/installer/UnitInstall.pas b/installer/installer/UnitInstall.pas index 304729e5..5e93c8d2 100755 --- a/installer/installer/UnitInstall.pas +++ b/installer/installer/UnitInstall.pas @@ -11,6 +11,7 @@ type TOS = (osWindows, osLinux32{, osLinux64}); procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True); procedure AddDone(Additional: String = ''); procedure AddSkipped; +procedure AddFailed; procedure AddNotFound; procedure MakeDir(Dir: String); procedure DownloadFile(eFile: String; eDestination: String); @@ -88,6 +89,17 @@ begin Application.ProcessMessages; end; +procedure AddFailed; +begin + frmMain.rtfDetails.SelStart := Length(frmMain.rtfDetails.Text); + frmMain.rtfDetails.SelAttributes.Color := clMaroon; + frmMain.rtfDetails.SelText := ' Failed.'; + frmMain.rtfDetails.Perform(WM_VSCROLL, SB_BOTTOM, 0); + + frmMain.Repaint; + Application.ProcessMessages; +end; + procedure AddNotFound; begin frmMain.rtfDetails.SelStart := Length(frmMain.rtfDetails.Text); @@ -173,8 +185,12 @@ begin if frmMain.IdFTP.TransferType <> TransferType then frmMain.IdFTP.TransferType := TransferType; // upload the file - frmMain.IdFTP.Put(eFile, eDestination); - AddDone; + try + frmMain.IdFTP.Put(eFile, eDestination); + AddDone; + except + AddFailed; + end; end; procedure FTPMakeDir(eDir: String); diff --git a/installer/installer/UnitfrmMain.pas b/installer/installer/UnitfrmMain.pas index ef5ceabc..fac3c441 100755 --- a/installer/installer/UnitfrmMain.pas +++ b/installer/installer/UnitfrmMain.pas @@ -4,12 +4,12 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, TFlatRadioButtonUnit, StdCtrls, ComCtrls, mxFlatControls, JvPageList, + Dialogs, StdCtrls, ComCtrls, mxFlatControls, JvPageList, ExtCtrls, JvExControls, JvComponent, TFlatButtonUnit, jpeg, TFlatEditUnit, TFlatGaugeUnit, ImgList, FileCtrl, Registry, CheckLst, TFlatComboBoxUnit, TFlatCheckBoxUnit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, IdException, IdAntiFreezeBase, IdAntiFreeze, - IdIntercept, IdLogBase, IdLogFile, JclFileUtils; + IdIntercept, IdLogBase, IdLogFile, JclFileUtils, TFlatRadioButtonUnit; type TfrmMain = class(TForm) @@ -148,7 +148,7 @@ var frmMain: TfrmMain; gMultiAccount: Boolean; -const VERSION = '1.76c'; +const VERSION = '1.77'; implementation