trying to commit... for the 10th time!!!!

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@28 99eadd0c-20b8-1223-b5c4-2a2b2df33de2

InnoSetupScript/Custom_Messages.iss

@@ -20,6 +20,8 @@
 
 [CustomMessages]
 ;sm=Start Menu, tsk=Task, com=Comment, msg=Message
+;NOTE: Do NOT change the file encoding it must me UTF-8 Signature
+
 ;English
 en.msg_SetupIsRunningWarning=Subtitle Edit Setup is already running!
 en.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 2.0. Please download and install the .NET Framework and run setup again. %n%nDo you want to download the .NET Framework 2.0 now?
@@ -29,10 +31,7 @@ en.tsk_CurrentUser=For the current user only
 en.tsk_Other=Other:
 en.tsk_ResetSettings=Reset Subtitle Edit's settings
 en.run_VisitWebsite=Visit Subtitle Edit's Website
-en.sm_Changelog=Changelog
 en.sm_com_Changelog=Subtitle Edit's Changelog
-en.sm_Help=Help and Support
-en.sm_HelpFile=Subtitle Edit's Help
 en.sm_ReadmeFile=ReadMe
 en.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -45,10 +44,7 @@ dk.tsk_CurrentUser=For the current user only
 dk.tsk_Other=Other:
 dk.tsk_ResetSettings=Reset Subtitle Edit's settings
 dk.run_VisitWebsite=Visit Subtitle Edit's Website
-dk.sm_Changelog=Changelog
 dk.sm_com_Changelog=Subtitle Edit's Changelog
-dk.sm_Help=Help and Support
-dk.sm_HelpFile=Subtitle Edit's Help
 dk.sm_ReadmeFile=ReadMe
 dk.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -60,10 +56,7 @@ es.tsk_CurrentUser=For the current user only
 es.tsk_Other=Other:
 es.tsk_ResetSettings=Reset Subtitle Edit's settings
 es.run_VisitWebsite=Visit Subtitle Edit's Website
-es.sm_Changelog=Changelog
 es.sm_com_Changelog=Subtitle Edit's Changelog
-es.sm_Help=Help and Support
-es.sm_HelpFile=Subtitle Edit's Help
 es.sm_ReadmeFile=ReadMe
 es.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -75,10 +68,7 @@ fr.tsk_CurrentUser=For the current user only
 fr.tsk_Other=Other:
 fr.tsk_ResetSettings=Reset Subtitle Edit's settings
 fr.run_VisitWebsite=Visit Subtitle Edit's Website
-fr.sm_Changelog=Changelog
 fr.sm_com_Changelog=Subtitle Edit's Changelog
-fr.sm_Help=Help and Support
-fr.sm_HelpFile=Subtitle Edit's Help
 fr.sm_ReadmeFile=ReadMe
 fr.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -90,10 +80,7 @@ it.tsk_CurrentUser=For the current user only
 it.tsk_Other=Other:
 it.tsk_ResetSettings=Reset Subtitle Edit's settings
 it.run_VisitWebsite=Visit Subtitle Edit's Website
-it.sm_Changelog=Changelog
 it.sm_com_Changelog=Subtitle Edit's Changelog
-it.sm_Help=Help and Support
-it.sm_HelpFile=Subtitle Edit's Help
 it.sm_ReadmeFile=ReadMe
 it.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -105,10 +92,7 @@ nl.tsk_CurrentUser=For the current user only
 nl.tsk_Other=Other:
 nl.tsk_ResetSettings=Reset Subtitle Edit's settings
 nl.run_VisitWebsite=Visit Subtitle Edit's Website
-nl.sm_Changelog=Changelog
 nl.sm_com_Changelog=Subtitle Edit's Changelog
-nl.sm_Help=Help and Support
-nl.sm_HelpFile=Subtitle Edit's Help
 nl.sm_ReadmeFile=ReadMe
 nl.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -120,10 +104,7 @@ pl.tsk_CurrentUser=For the current user only
 pl.tsk_Other=Other:
 pl.tsk_ResetSettings=Reset Subtitle Edit's settings
 pl.run_VisitWebsite=Visit Subtitle Edit's Website
-pl.sm_Changelog=Changelog
 pl.sm_com_Changelog=Subtitle Edit's Changelog
-pl.sm_Help=Help and Support
-pl.sm_HelpFile=Subtitle Edit's Help
 pl.sm_ReadmeFile=ReadMe
 pl.sm_com_ReadmeFile=Subtitle Edit's ReadMe
 
@@ -135,9 +116,6 @@ ro.tsk_CurrentUser=For the current user only
 ro.tsk_Other=Other:
 ro.tsk_ResetSettings=Reset Subtitle Edit's settings
 ro.run_VisitWebsite=Visit Subtitle Edit's Website
-ro.sm_Changelog=Changelog
 ro.sm_com_Changelog=Subtitle Edit's Changelog
-ro.sm_Help=Help and Support
-ro.sm_HelpFile=Subtitle Edit's Help
 ro.sm_ReadmeFile=ReadMe
 ro.sm_com_ReadmeFile=Subtitle Edit's ReadMe

InnoSetupScript/Subtitle_Edit_installer.iss

@@ -22,33 +22,40 @@
 ; Requirements:
 ; *Inno Setup QuickStart Pack v5.3.11(+): http://www.jrsoftware.org/isdl.php#qsp
 
-#define installer_build_number "01"
+
+#define installer_build_number "02"
+
 #define VerMajor
 #define VerMinor
-#define VerRevision
 #define VerBuild
-#expr ParseVersion("D:\Dev\SubtitleEdit\bin\Release\SubtitleEdit.exe", VerMajor, VerMinor, VerRevision, VerBuild)
+#define VerRevision
-#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerRevision) + "." + str(VerBuild)
+
-#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerRevision)
+#expr ParseVersion("..\src\bin\Release\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
+#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
+
+;the following simple_app_version is for 2 digit releases, one of the two must be uncommented at a time
+;#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
+#define simple_app_version str(VerMajor) + "." + str(VerMinor)
+
 #define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
 
+
 [Setup]
 AppID=SubtitleEdit
-;AppCopyright=Copyright © 2009-2010, Nikse
+AppCopyright=Copyright © 2009-2010, Nikse
 AppContact=http://www.nikse.dk/se/
 AppName=Subtitle Edit
-AppVerName=Subtitle Edit 3.0 Release Candidate 2  
+AppVerName=Subtitle Edit {#= simple_app_version}
-;AppVerName=Subtitle Edit {#= simple_app_version} 
 AppVersion={#= simple_app_version}
 AppPublisher=Nikse
-AppPublisherURL=http://www.nikse.dk/
+AppPublisherURL=http://www.nikse.dk/se/
 AppSupportURL=http://www.nikse.dk/se/
 AppUpdatesURL=http://www.nikse.dk/se/
 UninstallDisplayName=Subtitle Edit {#= simple_app_version}
 DefaultDirName={pf}\Subtitle Edit
 DefaultGroupName=Subtitle Edit
 VersionInfoCompany=Nikse
-;VersionInfoCopyright=Copyright © 2009-2010, Nikse
+VersionInfoCopyright=Copyright © 2009-2010, Nikse
 VersionInfoDescription=Subtitle Edit {#= simple_app_version} Setup
 VersionInfoTextVersion={#= simple_app_version}
 VersionInfoVersion={#= simple_app_version}
@@ -56,35 +63,30 @@ VersionInfoProductName=Subtitle Edit
 VersionInfoProductVersion={#= simple_app_version}
 VersionInfoProductTextVersion={#= simple_app_version}
 MinVersion=0,5.0.2195
-;AppReadmeFile={app}\README.txt
+;AppReadmeFile={app}\Readme.txt
 LicenseFile=..\src\gpl.txt
-InfoAfterFile=CHANGELOG.txt
+InfoAfterFile=Changelog.txt
-;InfoBeforeFile=..\README.txt
+;InfoBeforeFile=..\Readme.txt
-SetupIconFile=..\src\SE.ico
+SetupIconFile=..\src\Icons\SE.ico
+UninstallDisplayIcon={app}\SubtitleEdit.exe
 ;WizardImageFile=Icons\WizardImageFile.bmp
 WizardSmallImageFile=Icons\WizardSmallImageFile.bmp
 OutputDir=.
 OutputBaseFilename=SubtitleEdit-{#= simple_app_version}-setup
-AllowNoIcons=false
+AllowNoIcons=yes
-Compression=lzma/Ultra64
+Compression=lzma/ultra64
-SolidCompression=false
+SolidCompression=yes
-EnableDirDoesntExistWarning=false
+EnableDirDoesntExistWarning=no
 DirExistsWarning=no
-ShowTasksTreeLines=false
+ShowTasksTreeLines=yes
-AlwaysShowDirOnReadyPage=false
+AlwaysShowDirOnReadyPage=yes
-AlwaysShowGroupOnReadyPage=false
+AlwaysShowGroupOnReadyPage=yes
 PrivilegesRequired=admin
 ShowLanguageDialog=yes
 DisableDirPage=auto
 DisableProgramGroupPage=auto
-;AppMutex=Global\SubtitleEditMutex
+AppMutex=Subtitle_Edit_Mutex
-ShowComponentSizes=false
+
-AlwaysShowComponentsList=false
-FlatComponentsList=false
-UsePreviousSetupType=false
-UsePreviousTasks=false
-TerminalServicesAware=false
-DisableReadyPage=true
 
 [Languages]
 Name: en; MessagesFile: compiler:Default.isl
@@ -105,11 +107,12 @@ BeveledLabel=Subtitle Edit v{#= simple_app_version} by Nikse, Setup v{#= install
 
 
 [Files]
+Source: Changelog.txt; DestDir: {app}; Flags: ignoreversion
 Source: ..\src\Bin\Release\Hunspellx86.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\src\Bin\Release\Interop.QuartzTypeLib.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\src\Bin\Release\NHunspell.dll; DestDir: {app}; Flags: ignoreversion
-Source: ..\src\Bin\Release\tessnet2_32.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\src\Bin\Release\SubtitleEdit.exe; DestDir: {app}; Flags: ignoreversion
+Source: ..\src\Bin\Release\tessnet2_32.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\src\Bin\Release\Icons\Find.png; DestDir: {app}\Icons; Flags: ignoreversion
 Source: ..\src\Bin\Release\Icons\Help.png; DestDir: {app}\Icons; Flags: ignoreversion
 Source: ..\src\Bin\Release\Icons\New.png; DestDir: {app}\Icons; Flags: ignoreversion
@@ -144,16 +147,17 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
 Name: desktopicon\user; Description: {cm:tsk_CurrentUser}; GroupDescription: {cm:AdditionalIcons}; Flags: exclusive
 Name: desktopicon\common; Description: {cm:tsk_AllUsers}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked exclusive
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.01; Flags: unchecked
+
 Name: reset_settings; Description: {cm:tsk_ResetSettings}; GroupDescription: {cm:tsk_Other}; Check: SettingsExistCheck(); Flags: checkedonce unchecked
 
 
 [Icons]
 Name: {group}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; Comment: Subtitle Edit {#= simple_app_version}; WorkingDir: {app}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
-;Name: {group}\{cm:sm_Help}\{cm:sm_Changelog}; Filename: {app}\CHANGELOG.txt; Comment: {cm:sm_com_Changelog}; WorkingDir: {app}
+Name: {group}\Help and Support\Changelog; Filename: {app}\Changelog.txt; Comment: {cm:sm_com_Changelog}; WorkingDir: {app}
-;Name: {group}\{cm:sm_Help}\{cm:sm_HelpFile}; Filename: {app}\Help.htm; Comment: {cm:sm_HelpFile}; WorkingDir: {app}
+;Name: {group}\Help and Support\Readme; Filename: {app}\Readme.txt; Comment: {cm:sm_com_ReadmeFile}; WorkingDir: {app}
-;Name: {group}\{cm:sm_Help}\{cm:sm_ReadmeFile}; Filename: {app}\README.txt; Comment: {cm:sm_com_ReadmeFile}; WorkingDir: {app}
+Name: {group}\Help and Support\{cm:ProgramOnTheWeb,Subtitle Edit}; Filename: http://www.nikse.dk/se/; Comment: {cm:ProgramOnTheWeb,Subtitle Edit}
-Name: {group}\{cm:sm_Help}\{cm:ProgramOnTheWeb,Subtitle Edit}; Filename: http://www.nikse.dk/se/; Comment: {cm:ProgramOnTheWeb,Subtitle Edit}
 Name: {group}\{cm:UninstallProgram,Subtitle Edit}; Filename: {uninstallexe}; IconFilename: {app}\uninstall.ico; Comment: {cm:UninstallProgram,Subtitle Edit}; WorkingDir: {app}
+
 Name: {commondesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; Tasks: desktopicon\common; Comment: Subtitle Edit {#= simple_app_version}; WorkingDir: {app}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
 Name: {userdesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; Tasks: desktopicon\user; Comment: Subtitle Edit {#= simple_app_version}; WorkingDir: {app}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; Tasks: quicklaunchicon; Comment: Subtitle Edit {#= simple_app_version}; WorkingDir: {app}; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
@@ -162,12 +166,13 @@ Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Subtitle Edit; File
 [InstallDelete]
 Type: files; Name: {userdesktop}\Subtitle Edit.lnk; Check: NOT IsTaskSelected('desktopicon\user') AND IsUpdate()
 Type: files; Name: {commondesktop}\Subtitle Edit.lnk; Check: NOT IsTaskSelected('desktopicon\common') AND IsUpdate()
+
 Type: files; Name: {userappdata}\Subtitle Edit\settings.xml; Tasks: reset_settings
 Type: dirifempty; Name: {userappdata}\Subtitle Edit; Tasks: reset_settings
 
 
 [Run]
-Filename: {app}\SubtitleEdit.exe; Description: {cm:LaunchProgram,Subtitle Edit}; Flags: nowait postinstall skipifsilent runascurrentuser
+Filename: {app}\SubtitleEdit.exe; Description: {cm:LaunchProgram,Subtitle Edit}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent runascurrentuser
 Filename: http://www.nikse.dk/se/; Description: {cm:run_VisitWebsite}; Flags: nowait postinstall skipifsilent shellexec runascurrentuser unchecked
 
 
@@ -271,4 +276,3 @@ begin
    end;
    CreateMutex(installer_mutex_name);
 end;
-

InnoSetupScript/todo.txt

@@ -0,0 +1,10 @@
+-fix the copyright year
+-add a readme file
+-tell translators to finish the custom messages translations
+ NOTE: Do NOT change the file encoding of custom_messages.iss, it has to be UTF-8 Signature
+
+on uninstall:
+-remove {app}\WaveForms
+-remove {app}\Dictionaries\*.aff
+-remove {app}\Dictionaries\*.dic
+-remove {app}\Dictionaries