0.3.3

Licence.txt

@@ -13,5 +13,4 @@ This license does not restrict the ability for me to make ITD available under di
 Nicholas Sherlock
 
 Sherlock Software
-http://www.sherlocksoftware.org
-
+http://www.sherlocksoftware.org/

innotoolsdownloader.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "InnoTools Downloader"
-#define MyAppVerName "InnoTools Downloader 0.3.2"
+#define MyAppVerName "InnoTools Downloader 0.3.3"
 #define MyAppPublisher "Sherlock Software"
 #define MyAppURL "http://www.sherlocksoftware.org"
 #define MyAppUrlName "Sherlock Software.url"
@@ -47,7 +47,7 @@ Source: languages\*; DestDir: {app}\languages
 Filename: {app}\ITDHelp.chm; Flags: shellexec skipifdoesntexist postinstall skipifsilent; Languages: ; Description: View the help file
 
 [Icons]
-Name: {group}\Visit Sherlock Software; Filename: http://www.sherlocksoftware.org
+Name: {group}\Visit Sherlock Software; Filename: http://www.sherlocksoftware.org/
 Name: {group}\Read help file; Filename: {app}\ITDHelp.chm
 Name: {group}\Examples; Filename: {app}\examples
 Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe}

it_download.iss

@@ -5,19 +5,25 @@ Source: {#emit ReadReg(HKEY_LOCAL_MACHINE,'Software\Sherlock Software\InnoTools\
 (*
  Inno Tools Downloader DLL
  Copyright (C) Sherlock Software 2008
- Version 0.3.2
+ Version 0.3.3
 
  Contact:
   The author, Nicholas Sherlock, at nick@sherlocksoftware.org.
   Comments, questions and suggestions welcome.
 
  Website:
-  http://www.sherlocksoftware.org
+  http://www.sherlocksoftware.org/
 
  History:
-  0.3.2 - Minor tweaks to English language file and example script
+  0.3.3 - The "Hilbrand Edskes" release :), lots of suggestions and corrections from him, thank you!
+          The "Retry" button is now translated.
+          The "Current file" progress bar is hidden if only one file is being downloaded.
+          The page's title and description are updated in the case of failed downloads.
+          Several updates to the translations.
+          Several small GUI fixes.
+  0.3.2 - Minor tweaks to the English language file and the translation example script (example4.iss)
+          Added Dutch translation by Hilbrand Edskes
           Added French translation by Néo
-          Added Dutch translation Hilbrand Edskes
   0.3.1 - Added language file examples, fixed several missing language strings
           Preliminary support for proxy server autodetection
           Allows the size of a file to be queried with ITD_GetFileSize
@@ -95,16 +101,20 @@ const
   ITDERR_ERROR = 3;
 
   {Constants for Language String indexes:}
+  ITDS_DownloadFailed=104;
+
   ITDS_TitleCaption=200;
   ITDS_TitleDescription=201;
 
   ITDS_MessageFailRetryContinue=250;
   ITDS_MessageFailRetry=251;
 
+  ITDS_Retry=502;
+
 var
   itd_allowcontinue: boolean;
   itd_retryonback: boolean;
-  
+
   ITD_AfterSuccess:procedure(downloadPage:TWizardPage);
 
 procedure ITD_DownloadFiles();
@@ -160,28 +170,38 @@ begin
   wizardform.backbutton.enabled := false;
   wizardform.nextbutton.enabled := false;
 
+  sender.caption:=ITD_GetString(ITDS_TitleCaption);
+  sender.description:=ITD_GetString(ITDS_TitleDescription);
+
   err := ITD_Internal_DownloadFiles(sender.surface.handle);
 
   case err of
     ITDERR_SUCCESS: begin
         wizardform.nextbutton.enabled := true;
         wizardform.nextbutton.onclick(nil);
-        
+
         if itd_aftersuccess<>nil then
           itd_aftersuccess(sender);
       end;
     ITDERR_USERCANCEL: ; //Don't show a message, this happens on setup close and cancel click
   else begin
-    //Some unexpected error
-      wizardform.backbutton.caption := 'Retry';
+    //Some unexpected error, like connection interrupted
+      wizardform.backbutton.caption := ITD_GetString(ITDS_Retry);
       wizardform.backbutton.enabled := true;
       wizardform.backbutton.show();
       itd_retryonback := true;
 
+      wizardform.nextbutton.enabled := itd_allowcontinue;
+
       if itd_allowcontinue then begin //Download failed, we can retry, continue, or exit
-        wizardform.nextbutton.enabled := true;
+        sender.caption:=ITD_GetString(ITDS_DownloadFailed);
+        sender.description:=ITD_GetString(ITDS_MessageFailRetryContinue);
+
         MsgBox(ITD_GetString(ITDS_MessageFailRetryContinue), mbError, MB_OK)
       end else begin //Download failed, we must retry or exit setup
+        sender.caption:=ITD_GetString(ITDS_DownloadFailed);
+        sender.description:=ITD_GetString(ITDS_MessageFailRetry);
+
         MsgBox(ITD_GetString(ITDS_MessageFailRetry), mbError, MB_OK)
       end;
     end;
@@ -201,6 +221,7 @@ begin
   result := false;
   if itd_retryonback then begin
     itd_retryonback := false;
+    wizardform.backbutton.hide();
     itd_nowdodownload(sender);
   end;
 end;
@@ -213,7 +234,7 @@ end;
 function ITD_PostPage(const url, data:string; out response:string):boolean;
 begin
   result:=ITD_Internal_PostPage(PChar(url), PChar(data), length(data));
-  
+
   if result then begin
     setlength(response, ITD_GetResultLen);
     ITD_GetResultString(PChar(response), length(response));
@@ -230,7 +251,7 @@ begin
   itd_downloadpage.onbackbuttonclick := @itd_handlebackclick;
 
   itd_internal_initui(itd_downloadpage.surface.handle);
-  
+
   result:=itd_downloadpage;
 end;
 

languages/itd_en.ini

@@ -1,5 +1,5 @@
 [Author]
-Contributors=Nicholas Sherlock (http://www.sherlocksoftware.org)
+Contributors=Nicholas Sherlock (http://www.sherlocksoftware.org/)
 
 [Strings]
 100=Getting file information...
@@ -12,8 +12,8 @@ Contributors=Nicholas Sherlock (http://www.sherlocksoftware.org)
 200=Downloading additional files
 201=Please wait while setup downloads additional files...
 
-250=Sorry, the files could not be downloaded. Click 'retry' to try downloading the files again, or click 'next' to continue installing anyway.
-251=Sorry, the files could not be downloaded. Click 'retry' to try downloading the files again, or click 'cancel' to terminate setup.
+250=Sorry, the files could not be downloaded. Check your connection and click 'Retry' to try downloading the files again, or click 'Next' to continue installing anyway.
+251=Sorry, the files could not be downloaded. Check your connection and click 'Retry' to try downloading the files again, or click 'Cancel' to terminate setup.
 
 300=File:
 301=Speed:
@@ -44,4 +44,5 @@ Contributors=Nicholas Sherlock (http://www.sherlocksoftware.org)
 473=GB
 
 500=Details
-501=Hide
+501=Hide
+502=Retry

languages/itd_fr.ini

@@ -8,40 +8,41 @@ Contributors=N
 103=Téléchargement terminé!
 104=Téléchargement interrompu.
 105=Téléchargement (%s)...
- 
+
 200=Téléchargement des fichiers additionnels
 201=Veuillez patienter durant le téléchargement des fichiers additionnels...
- 
+
 250=Désolé, le fichier n'a pu être téléchargé. Cliquez réessayer pour essayer à nouveau de le télécharger, ou cliquez suivant pour continuer l'installation.
 251=Désolé, le fichier n'a pu être téléchargé. Cliquez réessayer pour essayer à nouveau de le télécharger, ou cliquez annuler pour terminer l'installation.
- 
+
 300=Fichier:
 301=Vitesse:
 302=Status:
 303=Temps écoulé:
 304=Temps restant:
 305=Fichier en cours:
 306=Progression générale:
- 
+
 400=inconnu
- 
+
 450=seconde
 451=secondes
 452=minute
 453=minutes
 454=heure
 455=heures
-456=Jour
+456=jour
 457=jours
 458=%1 %2/s
 459=%1 %2 de %3 %4
 460=%1 %2 de inconnu
 461=Non
- 
+
 470=B
 471=KB
 472=MB
 473=GB
- 
+
 500=Détails
 501=Cacher
+502=Réessayer

languages/itd_nl.ini

@@ -2,18 +2,18 @@
 Contributors=Hilbrand Edskes (http://finalbuilds.edskes.com/)
 
 [Strings]
-100=Informatie over de bestanden ophalen...
+100=Bestandsinformatie ophalen...
 101=Beginnen met downloaden...
 102=Downloaden...
 103=De download is klaar!
-104=De download is mislukt.
+104=Het downloaden is mislukt.
 105=%s downloaden...
 
 200=Extra bestanden downloaden
 201=Een ogenblik geduld, de extra bestanden worden gedownload...
 
-250=De bestanden konden helaas niet worden gedownload. Probeer het bestand opnieuw te downloaden, of klik op Volgende om zonder verder te gaan.
-251=De bestanden konden helaas niet worden gedownload. Probeer het bestand opnieuw te downloaden, of klik op Annuleren om te stoppen.
+250=De bestanden konden helaas niet worden gedownload. Controleer de verbinding en kies 'Opnieuw' om het nog eens te proberen, of klik op 'Volgende' om zonder verder te gaan.
+251=De bestanden konden helaas niet worden gedownload. Controleer de verbinding en kies 'Opnieuw' om het nog eens te proberen, of klik op 'Annuleren' om te stoppen.
 
 300=Bestand:
 301=Snelheid:
@@ -44,4 +44,5 @@ Contributors=Hilbrand Edskes (http://finalbuilds.edskes.com/)
 473=GB
 
 500=Details
-501=Verbergen
+501=Verbergen
+502=Opnieuw