Author: remi
Date: 2009-02-12 14:11:42 +0100 (Thu, 12 Feb 2009)
New Revision: 3626
Modified:
software_suite_v2/tuxware/installers/win/trunk/files/softwareUpdaterInstaller.exe
software_suite_v2/tuxware/installers/win/trunk/tuxsetup.nsi
Log:
* added the language selection
* added the "dongle unplug prevention" popup
Modified:
software_suite_v2/tuxware/installers/win/trunk/files/softwareUpdaterInstaller.exe
===================================================================
(Binary files differ)
Modified: software_suite_v2/tuxware/installers/win/trunk/tuxsetup.nsi
===================================================================
--- software_suite_v2/tuxware/installers/win/trunk/tuxsetup.nsi 2009-02-12
12:07:48 UTC (rev 3625)
+++ software_suite_v2/tuxware/installers/win/trunk/tuxsetup.nsi 2009-02-12
13:11:42 UTC (rev 3626)
@@ -67,163 +67,39 @@
; -----------------------------------------------------------------------------
!define MUI_ICON "installer.ico"
!define MUI_UNICON "installer.ico"
-!insertmacro MUI_PAGE_LICENSE "COPYING"
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_LANGUAGE "French"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Danish"
+;!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Norwegian"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+;!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Italian"
+
!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Arabic"
-!insertmacro MUI_LANGUAGE "Danish"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Swedish"
-!insertmacro MUI_LANGUAGE "Italian"
-!insertmacro MUI_LANGUAGE "Spanish"
+LicenseLangString license ${LANG_ENGLISH} "COPYING_ENGLISH"
+LangString REG_Language ${LANG_ENGLISH} "en_US"
+LangString CHECK_dongleDisconnected ${LANG_ENGLISH} "Make sure the USB dongle
is disconnected before continuing the installation."
-!define REG_Language "en_US"
+!insertmacro MUI_LANGUAGE "French"
+LicenseLangString license ${LANG_FRENCH} "COPYING_FRENCH"
+LangString REG_Language ${LANG_FRENCH} "fr"
+LangString CHECK_dongleDisconnected ${LANG_FRENCH} "Assurez-vous que le
poisson USB ne soit pas branch� avant de continuer l'installation."
-; -----------------------------------------------------------------------------
-; Automatically select the local language
-; -----------------------------------------------------------------------------
-Function SysLang
- Push $0
-
- System::Alloc "${NSIS_MAX_STRLEN}"
- Pop $0
-
- System::Call
"Kernel32::GetLocaleInfo(i,i,t,i)i(2048,0x2,.r0,${NSIS_MAX_STRLEN})i"
-
- Exch $0
- Pop "$LOCAL_LANGUAGE"
+!insertmacro MUI_LANGUAGE "Dutch"
+LicenseLangString license ${LANG_DUTCH} "COPYING_DUTCH"
+LangString REG_Language ${LANG_DUTCH} "nl_BE"
+LangString CHECK_dongleDisconnected ${LANG_DUTCH} "Gelieve te controleren of
de USB dongle niet verbonden is vooraleer verder te gaan met de installatie."
- ${WordFind} $LOCAL_LANGUAGE "English" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkFrench
- StrCpy $LANGUAGE "1033"
- Return
- checkFrench:
- ${WordFind} $LOCAL_LANGUAGE "French" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkDutch
- StrCpy $LANGUAGE "1036"
- Return
- checkDutch:
- ${WordFind} $LOCAL_LANGUAGE "Dutch" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkArabic
- StrCpy $LANGUAGE "1043"
- Return
- checkArabic:
- ${WordFind} $LOCAL_LANGUAGE "Arabic" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkDanish
- StrCpy $LANGUAGE "1025"
- Return
- checkDanish:
- ${WordFind} $LOCAL_LANGUAGE "Danish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkGerman
- StrCpy $LANGUAGE "1030"
- Return
- checkGerman:
- ${WordFind} $LOCAL_LANGUAGE "German" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkNorwegian
- StrCpy $LANGUAGE "1031"
- Return
- checkNorwegian:
- ${WordFind} $LOCAL_LANGUAGE "Norwegian" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkPortuguese
- StrCpy $LANGUAGE "2068"
- Return
- checkPortuguese:
- ${WordFind} $LOCAL_LANGUAGE "Portuguese" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkSwedish
- StrCpy $LANGUAGE "2070"
- Return
- checkSwedish:
- ${WordFind} $LOCAL_LANGUAGE "Swedish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkItalian
- StrCpy $LANGUAGE "1053"
- Return
- checkItalian:
- ${WordFind} $LOCAL_LANGUAGE "Italian" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkSpanish
- StrCpy $LANGUAGE "1040"
- Return
- checkSpanish:
- ${WordFind} $LOCAL_LANGUAGE "Spanish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE setDefault
- StrCpy $LANGUAGE "1034"
- Return
- setDefault:
- StrCpy $LANGUAGE "1033"
-FunctionEnd
-Function un.SysLang
- Push $0
-
- System::Alloc "${NSIS_MAX_STRLEN}"
- Pop $0
-
- System::Call
"Kernel32::GetLocaleInfo(i,i,t,i)i(2048,0x2,.r0,${NSIS_MAX_STRLEN})i"
-
- Exch $0
- Pop "$LOCAL_LANGUAGE"
+!insertmacro MUI_LANGUAGE "Spanish"
+LicenseLangString license ${LANG_SPANISH} "COPYING_SPANISH"
+LangString REG_Language ${LANG_SPANISH} "es"
+LangString CHECK_dongleDisconnected ${LANG_SPANISH} "Asegurese que el USB
dongle esta desconectado antes de continuar la instalacion."
- ${un.WordFind} $LOCAL_LANGUAGE "English" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkFrench
- StrCpy $LANGUAGE "1033"
- Return
- checkFrench:
- ${un.WordFind} $LOCAL_LANGUAGE "French" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkDutch
- StrCpy $LANGUAGE "1036"
- Return
- checkDutch:
- ${un.WordFind} $LOCAL_LANGUAGE "Dutch" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkArabic
- StrCpy $LANGUAGE "1043"
- Return
- checkArabic:
- ${un.WordFind} $LOCAL_LANGUAGE "Arabic" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkDanish
- StrCpy $LANGUAGE "1025"
- Return
- checkDanish:
- ${un.WordFind} $LOCAL_LANGUAGE "Danish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkGerman
- StrCpy $LANGUAGE "1030"
- Return
- checkGerman:
- ${un.WordFind} $LOCAL_LANGUAGE "German" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkNorwegian
- StrCpy $LANGUAGE "1031"
- Return
- checkNorwegian:
- ${un.WordFind} $LOCAL_LANGUAGE "Norwegian" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkPortuguese
- StrCpy $LANGUAGE "2068"
- Return
- checkPortuguese:
- ${un.WordFind} $LOCAL_LANGUAGE "Portuguese" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkSwedish
- StrCpy $LANGUAGE "2070"
- Return
- checkSwedish:
- ${un.WordFind} $LOCAL_LANGUAGE "Swedish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkItalian
- StrCpy $LANGUAGE "1053"
- Return
- checkItalian:
- ${un.WordFind} $LOCAL_LANGUAGE "Italian" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE checkSpanish
- StrCpy $LANGUAGE "1040"
- Return
- checkSpanish:
- ${un.WordFind} $LOCAL_LANGUAGE "Spanish" "#" $0
- StrCmp $0 $LOCAL_LANGUAGE setDefault
- StrCpy $LANGUAGE "1034"
- Return
- setDefault:
- StrCpy $LANGUAGE "1033"
-FunctionEnd
+!insertmacro MUI_PAGE_LICENSE $(license)
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_CONFIRM
; -----------------------------------------------------------------------------
; Initialization of the installer
@@ -234,7 +110,7 @@
WriteUninstaller "${UNINSTALLER_EXE}"
Quit
!else
- Call SysLang
+ !insertmacro MUI_LANGDLL_DISPLAY
StrCpy $TUXDROID_PATH "$PROGRAMFILES\Kysoh\Tuxdroid"
!endif
FunctionEnd
@@ -243,7 +119,7 @@
; Initialization of the uninstaller
; -----------------------------------------------------------------------------
Function un.onInit
- Call un.SysLang
+ !insertmacro MUI_UNGETLANGUAGE
StrCpy $TUXDROID_PATH "$PROGRAMFILES\Kysoh\Tuxdroid"
FunctionEnd
@@ -340,6 +216,9 @@
; Not update the PATH var
noWrite:
+ ; Check the dongle is not connected
+ MessageBox MB_OK "$(CHECK_dongleDisconnected)"
+
; Launch the installer
ExecWait "$TUXDROID_PATH\installers\sub\softwareUpdaterInstaller.exe"
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
