-/*
+/*
init.nsh
Initialization functions
!macro EXTERNAL_INIT COMPONENT
# APP_REGKEY_SETUP = "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
- # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX16
+ # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX22
ReadRegStr $ComponentPath SHELL_CONTEXT "${APP_REGKEY_SETUP}" "${COMPONENT} Path"
# BIN_LATEX etc are defined in settings.nsh
Section "!${APP_NAME}" SecCore
SectionIn RO
+ !if ${SETUPTYPE} == BUNDLE
+ # if no TeX was found MiKTeX will be installed which requires space
+ !if $PathLaTeX == ""
+ AddSize 1020000 # size in KB
+ !endif
+ !endif
SectionEnd
Section "$(SecFileAssocTitle)" SecFileAssoc
- StrCpy $CreateFileAssociations "true"
+ StrCpy $CreateFileAssociations "true"
SectionEnd
Section "$(SecDesktopTitle)" SecDesktop
StrCpy $CreateDesktopIcon "true"
SectionEnd
-!if ${SETUPTYPE} == BUNDLE
- Section /o "$(SecInstJabRefTitle)" SecInstJabRef
- AddSize ${SIZE_JABREF}
- StrCpy $InstallJabRef "true"
- SectionEnd
-!endif
-
-SectionGroup "Dictionaries" SecDictionaries
+# Expand the list of dictionaries by default as this was requested by several
+# users. For the thesaurus this is was not requested because this section
+# is by default empty.
+SectionGroup /e "$(SecDictionaries)" SecDictionaries
Section /o "Afrikaans" SecDAfrikaans
StrCpy $DictCodes "af_ZA,$DictCodes"
AddSize 1440
SectionEnd
-Section /o "Arabic" SecDArabic
+Section /o "العربية" SecDArabic
StrCpy $DictCodes "ar_DZ,$DictCodes"
AddSize 2500
SectionEnd
-Section /o "Armenian" SecDArmenian
+Section /o "հայերեն" SecDArmenian
StrCpy $DictCodes "hy_AM,$DictCodes"
AddSize 2000
SectionEnd
AddSize 227
SectionEnd
-Section /o "Belarusian" SecDBelarusian
+Section /o "беларускі" SecDBelarusian
StrCpy $DictCodes "be_BY,$DictCodes"
AddSize 1730
SectionEnd
Section /o "Brezhoneg" SecDBreton
StrCpy $DictCodes "br_FR,$DictCodes"
- AddSize 11000
+ AddSize 5510
SectionEnd
-Section /o "Bulgarian" SecDBulgarian
+Section /o "български" SecDBulgarian
StrCpy $DictCodes "bg_BG,$DictCodes"
AddSize 985
SectionEnd
-Section /o "Català" SecDCatalanian
+Section /o "Català" SecDCatalanian
StrCpy $DictCodes "ca_ES,$DictCodes"
AddSize 1210
SectionEnd
-Section /o "Ce\9atina" SecDCzech
+Section /o "Ceština" SecDCzech
StrCpy $DictCodes "cs_CZ,$DictCodes"
AddSize 2190
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Coptic" SecDCoptic
-# StrCpy $DictCodes "cop_EG,$DictCodes"
-# AddSize 151
-#SectionEnd
+Section /o "Coptic" SecDCoptic
+ StrCpy $DictCodes "cop_EG,$DictCodes"
+ AddSize 151
+SectionEnd
Section /o "Cymraeg" SecDWelsh
StrCpy $DictCodes "cy_GB,$DictCodes"
AddSize 2470
SectionEnd
-Section /o "German (A)" SecDGermanAT
+Section /o "Deutsch (A)" SecDGermanAT
StrCpy $DictCodes "de_AT,$DictCodes"
AddSize 3620
SectionEnd
-Section /o "German (CH)" SecDGermanCH
+Section /o "Deutsch (CH)" SecDGermanCH
StrCpy $DictCodes "de_CH,$DictCodes"
AddSize 3620
SectionEnd
-Section "German (D)" SecDGermanD
+Section "Deutsch (D)" SecDGermanD
# already installed by default
SectionIn RO
#StrCpy $DictCodes "de_DE,$DictCodes"
AddSize 3620
SectionEnd
-Section /o "Greek" SecDGreek
+Section /o "Ελληνικά" SecDGreek
StrCpy $DictCodes "el_GR,$DictCodes"
AddSize 6550
SectionEnd
AddSize 4400
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "English (AU)" SecDEnglishAU
-# StrCpy $DictCodes "en_AU,$DictCodes"
-# AddSize 587
-#SectionEnd
+Section /o "English (AU)" SecDEnglishAU
+ StrCpy $DictCodes "en_AU,$DictCodes"
+ AddSize 552
+SectionEnd
Section /o "English (CA)" SecDEnglishCA
StrCpy $DictCodes "en_CA,$DictCodes"
- AddSize 690
+ AddSize 550
SectionEnd
Section "English (GB)" SecDEnglishGB
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 757
+ AddSize 742
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "English (NZ)" SecDEnglishNZ
-# StrCpy $DictCodes "en_NZ,$DictCodes"
-# AddSize 551
-#SectionEnd
+Section /o "English (NZ)" SecDEnglishNZ
+ StrCpy $DictCodes "en_NZ,$DictCodes"
+ AddSize 551
+SectionEnd
Section "English (US)" SecDEnglishUS
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 688
+ AddSize 548
SectionEnd
-Section "Español (ES)" SecDSpanishES
+Section "Español (ES)" SecDSpanishES
# already installed by default
SectionIn RO
#StrCpy $DictCodes "es_ES,$DictCodes"
AddSize 974
SectionEnd
-Section "Español (MX)" SecDSpanishMX
+Section "Español (MX)" SecDSpanishMX
# already installed by default
SectionIn RO
#StrCpy $DictCodes "es_MX,$DictCodes"
AddSize 4850
SectionEnd
-Section /o "Farsi" SecDFarsi
+Section /o "فارسی" SecDFarsi
StrCpy $DictCodes "fa_IR,$DictCodes"
AddSize 6710
SectionEnd
-Section "Français" SecDFrench
+Section "Français" SecDFrench
# already installed by default
SectionIn RO
#StrCpy $DictCodes "fr_FR,$DictCodes"
AddSize 1200
SectionEnd
+Section /o "Français (Canada)" SecDFrenchCanada
+ StrCpy $DictCodes "fr_CA,$DictCodes"
+ AddSize 1390
+SectionEnd
+
Section /o "Gaeilge" SecDGaelic
StrCpy $DictCodes "ga_IR,$DictCodes"
AddSize 1090
SectionEnd
-Section /o "Gàidhlig" SecDScottish
+Section /o "Gàidhlig" SecDScottish
StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 1660
+ AddSize 4161
SectionEnd
Section /o "Galego" SecDGalician
StrCpy $DictCodes "gl_ES,$DictCodes"
- AddSize 916
+ AddSize 3911
SectionEnd
-Section /o "Hebrew" SecDHebrew
+Section /o "עִברִית" SecDHebrew
StrCpy $DictCodes "he_IL,$DictCodes"
AddSize 3120
SectionEnd
AddSize 3380
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Hindi" SecDHindi
-# StrCpy $DictCodes "hi_IN,$DictCodes"
-# AddSize 1900
-#SectionEnd
+Section /o "हिंदी" SecDHindi
+ StrCpy $DictCodes "hi_IN,$DictCodes"
+ AddSize 1900
+SectionEnd
Section /o "Interlingua" SecDInterlingua
StrCpy $DictCodes "ia_IA,$DictCodes"
- AddSize 649
+ AddSize 613
SectionEnd
-Section /o "Íslenska" SecDIcelandic
+Section /o "Íslenska" SecDIcelandic
StrCpy $DictCodes "is_IS,$DictCodes"
AddSize 2320
SectionEnd
Section /o "Italiano" SecDItalian
StrCpy $DictCodes "it_IT,$DictCodes"
- AddSize 1300
+ AddSize 1380
SectionEnd
-Section /o "Kazakh" SecDKazakh
+Section /o "Қазақша" SecDKazakh
StrCpy $DictCodes "kk_KZ,$DictCodes"
AddSize 2120
SectionEnd
-Section /o "Korean" SecDKorean
+Section /o "한국어" SecDKorean
StrCpy $DictCodes "ko_KR,$DictCodes"
- AddSize 15200
+ AddSize 16540
SectionEnd
Section /o "Latina" SecDLatin
StrCpy $DictCodes "la_LA,$DictCodes"
- AddSize 1250
+ AddSize 2040
SectionEnd
Section /o "Lietuviu" SecDLithuanian
AddSize 1320
SectionEnd
-Section /o "Latvie\9au" SecDLatvian
+Section /o "Latviešu" SecDLatvian
StrCpy $DictCodes "lv_LV,$DictCodes"
- AddSize 2140
+ AddSize 2243
+SectionEnd
+
+Section /o "मराठी" SecDMarathi
+ StrCpy $DictCodes "mr_IN,$DictCodes"
+ AddSize 5290
SectionEnd
Section /o "Nederlands" SecDDutch
AddSize 1820
SectionEnd
-Section /o "Norsk (Bokmål)" SecDNorwegianNB
+Section /o "Norsk (Bokmål)" SecDNorwegianNB
StrCpy $DictCodes "nb_NO,$DictCodes"
- AddSize 4890
+ AddSize 5291
SectionEnd
Section /o "Norsk (Nynorsk)" SecDNorwegianNN
StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 2890
+ AddSize 3292
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Occitan" SecDOccitan
-# StrCpy $DictCodes "oc_FR,$DictCodes"
-# AddSize 31710
-#SectionEnd
+Section /o "Occitan" SecDOccitan
+ StrCpy $DictCodes "oc_FR,$DictCodes"
+ AddSize 31710
+SectionEnd
Section /o "Polski" SecDPolish
StrCpy $DictCodes "pl_PL,$DictCodes"
AddSize 4540
SectionEnd
-Section /o "Português (BR)" SecDPortugueseBR
+Section /o "Português (BR)" SecDPortugueseBR
StrCpy $DictCodes "pt_BR,$DictCodes"
AddSize 5280
SectionEnd
-Section /o "Português (PT)" SecDPortuguesePT
+Section /o "Português (PT)" SecDPortuguesePT
StrCpy $DictCodes "pt_PT,$DictCodes"
- AddSize 1460
+ AddSize 1568
SectionEnd
-Section /o "Româna" SecDRomanian
+Section /o "Româna" SecDRomanian
StrCpy $DictCodes "ro_RO,$DictCodes"
- AddSize 1930
+ AddSize 2255
SectionEnd
-Section /o "Russian" SecDRussian
+Section /o "Русский" SecDRussian
StrCpy $DictCodes "ru_RU,$DictCodes"
AddSize 1920
SectionEnd
-Section /o "Serb\9acina (Dolno)" SecDSorbianD
+Section /o "Serbšcina (Dolno)" SecDSorbianD
StrCpy $DictCodes "dsb_DE,$DictCodes"
- AddSize 904
+ AddSize 1035
SectionEnd
-Section /o "Serb\9acina (Horno)" SecDSorbianH
+Section /o "Serbšcina (Horno)" SecDSorbianH
StrCpy $DictCodes "hsb_DE,$DictCodes"
AddSize 740
SectionEnd
AddSize 2400
SectionEnd
-Section /o "Sloven\9acina" SecDSlovenian
+Section /o "Slovenšcina" SecDSlovenian
StrCpy $DictCodes "sl_SI,$DictCodes"
AddSize 2910
SectionEnd
-Section /o "Slovenský" SecDSlovakian
- StrCpy $DictCodes "sk_SK$ThesCodes"
- AddSize 4090
+Section /o "Slovenský" SecDSlovakian
+ StrCpy $DictCodes "sk_SK,$DictCodes"
+ AddSize 3310
SectionEnd
-Section /o "Srpski" SecDSerbian
+Section /o "Српски (Ћирилица)" SecDSerbianC
StrCpy $DictCodes "sr_RS,$DictCodes"
- AddSize 3460
+ AddSize 4401
+SectionEnd
+
+Section /o "Srpski (Latinica)" SecDSerbianL
+ StrCpy $DictCodes "sr_RS-Latin,$DictCodes"
+ AddSize 2843
SectionEnd
Section /o "Svenska" SecDSwedish
StrCpy $DictCodes "sv_SE,$DictCodes"
- AddSize 2030
+ AddSize 2028
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Tamil" SecDTamil
-# StrCpy $DictCodes "ta_IN,$DictCodes"
-# AddSize 5911
-#SectionEnd
+Section /o "தமிழ்" SecDTamil
+ StrCpy $DictCodes "ta_IN,$DictCodes"
+ AddSize 5911
+SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Telugu" SecDTelugu
-# StrCpy $DictCodes "te_IN,$DictCodes"
-# AddSize 3400
-#SectionEnd
+Section /o "తెలుగు" SecDTelugu
+ StrCpy $DictCodes "te_IN,$DictCodes"
+ AddSize 3400
+SectionEnd
-Section /o "Thai" SecDThai
+Section /o "ไทย" SecDThai
StrCpy $DictCodes "th_TH,$DictCodes"
AddSize 351
SectionEnd
-Section /o "Ukrainian" SecDUkrainian
+Section /o "Tibetan" SecDTibetan
+ StrCpy $DictCodes "bo_CN,$DictCodes"
+ AddSize 7
+SectionEnd
+
+Section /o "Türkmençe" SecDTurkmen
+ StrCpy $DictCodes "tk_TM,$DictCodes"
+ AddSize 950
+SectionEnd
+
+Section /o "Türkçe" SecDTurkish
+ StrCpy $DictCodes "tr_TR,$DictCodes"
+ AddSize 8870
+SectionEnd
+
+Section /o "Українська" SecDUkrainian
StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 2620
+ AddSize 5555
SectionEnd
-# enable this for LyX 2.1!
-#Section /o "Urdu" SecDUrdu
-# StrCpy $DictCodes "ur_PK,$DictCodes"
-# AddSize 1401
-#SectionEnd
+Section /o "اردو" SecDUrdu
+ StrCpy $DictCodes "ur_PK,$DictCodes"
+ AddSize 1401
+SectionEnd
-Section /o "Vietnamese" SecDVietnamese
+Section /o "Tiếng Việt" SecDVietnamese
StrCpy $DictCodes "vi_VN,$DictCodes"
AddSize 40
SectionEnd
SectionGroupEnd
-SectionGroup "Thesaurus" SecThesaurus
+SectionGroup "$(SecThesaurus)" SecThesaurus
-Section /o "Bulgarian" SecTBulgarian
- StrCpy $ThesCodes "bg_BG$ThesCodes"
+Section /o "български" SecTBulgarian
+ StrCpy $ThesCodes "bg_BG,$ThesCodes"
AddSize 3020
SectionEnd
-Section /o "Català" SecTCatalan
- StrCpy $ThesCodes "ca_ES$ThesCodes"
+Section /o "Català" SecTCatalan
+ StrCpy $ThesCodes "ca_ES,$ThesCodes"
AddSize 731
SectionEnd
-Section /o "Ce\9atina" SecTCzech
- StrCpy $ThesCodes "cs_CZ$ThesCodes"
+Section /o "Ceština" SecTCzech
+ StrCpy $ThesCodes "cs_CZ,$ThesCodes"
AddSize 635
SectionEnd
Section /o "Dansk" SecTDanish
- StrCpy $ThesCodes "da_DK$ThesCodes"
+ StrCpy $ThesCodes "da_DK,$ThesCodes"
AddSize 2360
SectionEnd
Section /o "Deutsch (D/A)" SecTGermanDA
- StrCpy $ThesCodes "de_DE$ThesCodes"
+ StrCpy $ThesCodes "de_DE,$ThesCodes"
AddSize 14600
SectionEnd
Section /o "Deutsch (CH)" SecTGermanCH
- StrCpy $ThesCodes "de_CH$ThesCodes"
+ StrCpy $ThesCodes "de_CH,$ThesCodes"
AddSize 14600
SectionEnd
+Section /o "English (AU)" SecTEnglishAU
+ StrCpy $ThesCodes "en_AU,$ThesCodes"
+ AddSize 21642
+SectionEnd
+
Section /o "English (GB)" SecTEnglishGB
- StrCpy $ThesCodes "en_GB$ThesCodes"
- AddSize 20600
+ StrCpy $ThesCodes "en_GB,$ThesCodes"
+ AddSize 14300
SectionEnd
-Section /o "English (US/AU)" SecTEnglishUSAU
- StrCpy $ThesCodes "en_US$ThesCodes"
- AddSize 20600
+Section /o "English (US)" SecTEnglishUS
+ StrCpy $ThesCodes "en_US,$ThesCodes"
+ AddSize 22095
SectionEnd
-Section /o "Español" SecTSpanish
- StrCpy $ThesCodes "es_ES$ThesCodes"
+Section /o "Español" SecTSpanish
+ StrCpy $ThesCodes "es_ES,$ThesCodes"
AddSize 2860
SectionEnd
-Section /o "Français" SecTFrench
- StrCpy $ThesCodes "fr_FR$ThesCodes"
+Section /o "Français" SecTFrench
+ StrCpy $ThesCodes "fr_FR,$ThesCodes"
AddSize 5060
SectionEnd
Section /o "Gaeilge" SecTGaelic
- StrCpy $ThesCodes "ga_IR$ThesCodes"
+ StrCpy $ThesCodes "ga_IR,$ThesCodes"
AddSize 30600
SectionEnd
-Section /o "Greek" SecTGreek
- StrCpy $ThesCodes "el_GR$ThesCodes"
+Section /o "Galego" SecTGalician
+ StrCpy $ThesCodes "gl_ES,$ThesCodes"
+ AddSize 510
+SectionEnd
+
+Section /o "Ελληνικά" SecTGreek
+ StrCpy $ThesCodes "el_GR,$ThesCodes"
AddSize 903
SectionEnd
+Section /o "Íslenska" SecTIcelandic
+ StrCpy $ThesCodes "is_IS,$ThesCodes"
+ AddSize 63
+SectionEnd
+
Section /o "Italiano" SecTItalian
- StrCpy $ThesCodes "it_IT$ThesCodes"
- AddSize 2640
+ StrCpy $ThesCodes "it_IT,$ThesCodes"
+ AddSize 2520
SectionEnd
Section /o "Magyar" SecTHungarian
- StrCpy $ThesCodes "hu_HU$ThesCodes"
+ StrCpy $ThesCodes "hu_HU,$ThesCodes"
AddSize 632
SectionEnd
-Section /o "Norsk" SecTNorwegian
- StrCpy $ThesCodes "no_NO$ThesCodes"
- AddSize 2470
+Section /o "Norsk (Bokmål)" SecTNorwegianNB
+ StrCpy $ThesCodes "nb_NO,$ThesCodes"
+ AddSize 2595
+SectionEnd
+
+Section /o "Norsk (Nynorsk)" SecTNorwegianNN
+ StrCpy $ThesCodes "nn_NO,$ThesCodes"
+ AddSize 2
SectionEnd
Section /o "Polski" SecTPolish
- StrCpy $ThesCodes "pl_PL$ThesCodes"
+ StrCpy $ThesCodes "pl_PL,$ThesCodes"
AddSize 5580
SectionEnd
-Section /o "Português" SecTPortuguese
- StrCpy $ThesCodes "pt_PT$ThesCodes"
- AddSize 855
+Section /o "Português" SecTPortuguese
+ StrCpy $ThesCodes "pt_PT,$ThesCodes"
+ AddSize 3950
SectionEnd
-Section /o "Româna" SecTRomanian
- StrCpy $ThesCodes "ro_RO$ThesCodes"
- AddSize 3640
+Section /o "Româna" SecTRomanian
+ StrCpy $ThesCodes "ro_RO,$ThesCodes"
+ AddSize 3650
SectionEnd
-Section /o "Russian" SecTRussian
- StrCpy $ThesCodes "ru_RU$ThesCodes"
+Section /o "Русский" SecTRussian
+ StrCpy $ThesCodes "ru_RU,$ThesCodes"
AddSize 2080
SectionEnd
-Section /o "Sloven\9acina" SecTSlovenian
- StrCpy $ThesCodes "sl_SI$ThesCodes"
- AddSize 1037
+Section /o "Slovenšcina" SecTSlovenian
+ StrCpy $ThesCodes "sl_SI,$ThesCodes"
+ AddSize 1110
SectionEnd
-Section /o "Slovenský" SecTSlovakian
- StrCpy $ThesCodes "sk_SK$ThesCodes"
- AddSize 907
+Section /o "Slovenský" SecTSlovakian
+ StrCpy $ThesCodes "sk_SK,$ThesCodes"
+ AddSize 930
SectionEnd
Section /o "Svenska" SecTSwedish
- StrCpy $ThesCodes "sv_SE$ThesCodes"
+ StrCpy $ThesCodes "sv_SE,$ThesCodes"
AddSize 720
SectionEnd
+Section /o "Українська" SecTUkrainian
+ StrCpy $ThesCodes "uk_UA,$ThesCodes"
+ AddSize 1339
+SectionEnd
+
SectionGroupEnd
# Section descriptions
!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)"
!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)"
-!if ${SETUPTYPE} == BUNDLE
- !insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)"
-!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(SecDictionariesDescription)"
!insertmacro MUI_DESCRIPTION_TEXT ${SecThesaurus} "$(SecThesaurusDescription)"
!insertmacro MUI_FUNCTION_DESCRIPTION_END
-#--------------------------------
-# Installer initialization
-
-!macro PRINTER_INIT
-
- ${If} ${AtLeastWinVista}
- StrCpy $PrinterConf "printui.exe"
- ${Else}
- StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry"
- ${EndIf}
-
-!macroend
-
# .onInit must be here after the section definition because we have to set
# the selection states of the dictionary sections
Function .onInit
- ${IfNot} ${IsNT}
- ${OrIfNot} ${AtLeastWinXP}
- MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows XP or later."
+ ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ ${if} $R0 == "5.0" # 2000
+ ${orif} $R0 == "5.1" # XP
+ ${orif} $R0 == "5.2" # 2003
+ MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows Vista or newer." /SD IDOK
Quit
- ${EndIf}
+ ${endif}
+ # Fixme: the Unicode version of FindProcDLL::FindProc
+ # reports always that it is already running
# check that the installer is not currently running
- System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e'
- Pop $R0
- ${if} $R0 != "0"
- MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)"
- Abort
- ${endif}
- System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e'
- Pop $R0
- ${if} $R0 != "0"
- MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)"
+ #FindProcDLL::FindProc "${BundleExeFile}"
+ #${if} $R0 == "1"
+ # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+ # Abort
+ #${endif}
+ #FindProcDLL::FindProc "${ExeFile}"
+ #${if} $R0 == "1"
+ # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+ # Abort
+ #${endif}
+ #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e'
+ #Pop $R0
+ #${if} $R0 != "0"
+ # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+ # Abort
+ #${endif}
+ #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e'
+ #Pop $R0
+ #${if} $R0 != "0"
+ # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+ # Abort
+ #${endif}
+
+ # Check that LyX is not currently running
+ FindProcDLL::FindProc "lyx.exe"
+ ${if} $R0 == "1"
+ MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK
Abort
${endif}
-
+
+ # read the user and computer name
+ ReadRegStr $ComputerName HKLM "System\CurrentControlSet\Control\ComputerName\ActiveComputerName" "ComputerName"
+ System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
+ StrCpy $UserName $0
+
!insertmacro MULTIUSER_INIT
# check if this LyX version is already installed
${if} $MultiUser.Privileges == "Admin"
${orif} $MultiUser.Privileges == "Power"
- ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher"
+ ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayIcon"
${else}
- ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "Publisher"
+ ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayIcon"
# handle also the case that LyX is already installed in HKLM
${if} $0 == ""
- ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher"
+ ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayIcon"
${endif}
${endif}
${if} $0 != ""
- MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
+ # check if the uninstaller was acidentally deleted
+ # if so don't bother the user if he realy wants to install a new LyX over an existing one
+ # because he won't have a chance to deny this
+ StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+ # (for FileCheck the variables $0 and $1 cannot be used)
+ !insertmacro FileCheck $5 "Uninstall-LyX.exe" "$4" # macro from LyXUtils.nsh
+ ${if} $5 == "False"
+ Goto ForceInstallation
+ ${endif}
+ # installing over an existing installation of the same LyX release is not necessary
+ # if the users does this he most probably has a problem with LyX that can better be solved
+ # by reinstalling LyX
+ # for beta and other test releases over-installing can even cause errors
+ MessageBox MB_YESNO|MB_DEFBUTTON2|MB_ICONEXCLAMATION "$(AlreadyInstalled)" /SD IDNO IDYES ForceInstallation
Abort
+ ForceInstallation:
${endif}
# check if there is an existing LyX installation of the same LyX series
${if} $MultiUser.Privileges == "Admin"
${orif} $MultiUser.Privileges == "Power"
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion"
+ # also check for an emergency release
+ ${if} $0 == ""
+ ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51" "DisplayVersion"
+ ${endif}
${else}
ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion"
+ # also check for an emergency release
+ ${if} $0 == ""
+ ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51" "DisplayVersion"
+ ${endif}
${endif}
${if} $0 != ""
StrCpy $R5 $0 # store the read version number
# we don't stop here because we want the latest installed version
${endif}
${next}
+
${if} $OldVersionNumber > ${APP_SERIES_KEY}
# store the version number and reformat it temporarily for the error message
StrCpy $R0 $OldVersionNumber
StrCpy $OldVersionNumber $R5
- MessageBox MB_OK|MB_ICONSTOP "$(NewerInstalled)"
+ MessageBox MB_OK|MB_ICONSTOP "$(NewerInstalled)" /SD IDOK
StrCpy $OldVersionNumber $R0
Abort
${endif}
- !insertmacro PRINTER_INIT
-
# this can be reset to "true" in section SecDesktop
StrCpy $CreateDesktopIcon "false"
StrCpy $CreateFileAssociations "false"
Call SearchExternal
- !if ${SETUPTYPE} == BUNDLE
- # don't let the installer sections appear when the programs are already installed
- ${if} $PathBibTeXEditor != ""
- SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
- ${endif}
- !endif
+ #!if ${SETUPTYPE} == BUNDLE
+ # # don't let the installer sections appear when the programs are already installed
+ # ${if} $PathBibTeXEditor != ""
+ # SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
+ # ${endif}
+ #!endif
# select sections of already installed spell-checker dictionaries, make them read-only
# and set the necessary size to 0 bytes
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDCoptic} $0
- # SectionSetSize ${SecDCoptic} 0
+ SectionSetFlags ${SecDCoptic} $0
+ SectionSetSize ${SecDCoptic} 0
${endif}
StrCpy $Search "cy_GB"
Call StrPoint
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDEnglishAU} $0
- # SectionSetSize ${SecDEnglishAU} 0
+ SectionSetFlags ${SecDEnglishAU} $0
+ SectionSetSize ${SecDEnglishAU} 0
${endif}
StrCpy $Search "en_CA"
Call StrPoint
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDEnglishNZ} $0
- # SectionSetSize ${SecDEnglishNZ} 0
+ SectionSetFlags ${SecDEnglishNZ} $0
+ SectionSetSize ${SecDEnglishNZ} 0
${endif}
StrCpy $Search "en_US"
Call StrPoint
SectionSetFlags ${SecDFarsi} $0
SectionSetSize ${SecDFarsi} 0
${endif}
+ StrCpy $Search "fr_CA"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDFrenchCanada} $0
+ SectionSetSize ${SecDFrenchCanada} 0
+ ${endif}
StrCpy $Search "fr_FR"
Call StrPoint
${if} $Pointer != "-1"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDHindi} $0
- # SectionSetSize ${SecDHindi} 0
+ SectionSetFlags ${SecDHindi} $0
+ SectionSetSize ${SecDHindi} 0
${endif}
StrCpy $Search "hr_HR"
Call StrPoint
SectionSetFlags ${SecDLatvian} $0
SectionSetSize ${SecDLatvian} 0
${endif}
+ StrCpy $Search "mr_IN"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDMarathi} $0
+ SectionSetSize ${SecDMarathi} 0
+ ${endif}
StrCpy $Search "nl_NL"
Call StrPoint
${if} $Pointer != "-1"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDOccitan} $0
- # SectionSetSize ${SecDOccitan} 0
+ SectionSetFlags ${SecDOccitan} $0
+ SectionSetSize ${SecDOccitan} 0
${endif}
StrCpy $Search "pl_PL"
Call StrPoint
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- SectionSetFlags ${SecDSerbian} $0
- SectionSetSize ${SecDSerbian} 0
+ SectionSetFlags ${SecDSerbianC} $0
+ SectionSetSize ${SecDSerbianC} 0
+ ${endif}
+ StrCpy $Search "sr_RS-Latin"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDSerbianL} $0
+ SectionSetSize ${SecDSerbianL} 0
${endif}
StrCpy $Search "sv_SE"
Call StrPoint
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDTamil} $0
- # SectionSetSize ${SecDTamil} 0
+ SectionSetFlags ${SecDTamil} $0
+ SectionSetSize ${SecDTamil} 0
${endif}
StrCpy $Search "te_IN"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDTelugu} $0
- # SectionSetSize ${SecDTelugu} 0
+ SectionSetFlags ${SecDTelugu} $0
+ SectionSetSize ${SecDTelugu} 0
${endif}
StrCpy $Search "th_TH"
Call StrPoint
SectionSetFlags ${SecDThai} $0
SectionSetSize ${SecDThai} 0
${endif}
+ StrCpy $Search "bo_CN"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDTibetan} $0
+ SectionSetSize ${SecDTibetan} 0
+ ${endif}
+ StrCpy $Search "tk_TM"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDTurkmen} $0
+ SectionSetSize ${SecDTurkmen} 0
+ ${endif}
+ StrCpy $Search "tr_TR"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDTurkish} $0
+ SectionSetSize ${SecDTurkish} 0
+ ${endif}
StrCpy $Search "uk_UA"
Call StrPoint
${if} $Pointer != "-1"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- # enable this for LyX 2.1!
- # SectionSetFlags ${SecDUrdu} $0
- # SectionSetSize ${SecDUrdu} 0
+ SectionSetFlags ${SecDUrdu} $0
+ SectionSetSize ${SecDUrdu} 0
${endif}
StrCpy $Search "vi_VN"
Call StrPoint
SectionSetFlags ${SecTGermanCH} $0
SectionSetSize ${SecTGermanCH} 0
${endif}
+ StrCpy $Search "en_AU"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTEnglishAU} $0
+ SectionSetSize ${SecTEnglishAU} 0
+ ${endif}
StrCpy $Search "en_GB"
Call StrPoint
${if} $Pointer != "-1"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- SectionSetFlags ${SecTEnglishUSAU} $0
- SectionSetSize ${SecTEnglishUSAU} 0
+ SectionSetFlags ${SecTEnglishUS} $0
+ SectionSetSize ${SecTEnglishUS} 0
${endif}
StrCpy $Search "es_ES"
Call StrPoint
SectionSetFlags ${SecTGaelic} $0
SectionSetSize ${SecTGaelic} 0
${endif}
+ StrCpy $Search "gl_ES"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTGalician} $0
+ SectionSetSize ${SecTGalician} 0
+ ${endif}
StrCpy $Search "el_GR"
Call StrPoint
${if} $Pointer != "-1"
SectionSetFlags ${SecTGreek} $0
SectionSetSize ${SecTGreek} 0
${endif}
+ StrCpy $Search "is_IS"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTIcelandic} $0
+ SectionSetSize ${SecTIcelandic} 0
+ ${endif}
StrCpy $Search "it_IT"
Call StrPoint
${if} $Pointer != "-1"
SectionSetFlags ${SecTHungarian} $0
SectionSetSize ${SecTHungarian} 0
${endif}
- StrCpy $Search "no_NO"
+ StrCpy $Search "nb_NO"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTNorwegianNB} $0
+ SectionSetSize ${SecTNorwegianNB} 0
+ ${endif}
+ StrCpy $Search "nn_NO"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- SectionSetFlags ${SecTNorwegian} $0
- SectionSetSize ${SecTNorwegian} 0
+ SectionSetFlags ${SecTNorwegianNN} $0
+ SectionSetSize ${SecTNorwegianNN} 0
${endif}
StrCpy $Search "pl_PL"
Call StrPoint
IntOp $0 ${SF_SELECTED} | ${SF_RO}
SectionSetFlags ${SecTSwedish} $0
SectionSetSize ${SecTSwedish} 0
- ${endif}*/
+ ${endif}
+ StrCpy $Search "uk_UA"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTUkrainian} $0
+ SectionSetSize ${SecTUkrainian} 0
+ ${endif}
${IfNot} ${Silent}
Banner::destroy
# this function is called at first after starting the uninstaller
Function un.onInit
- !insertmacro PRINTER_INIT
!insertmacro MULTIUSER_UNINIT
# Check that LyX is not currently running
FindProcDLL::FindProc "lyx.exe"
${if} $R0 == "1"
- MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)"
+ MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK
Abort
${endif}
${if} $0 != ""
${andif} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
- MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)"
+ MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" /SD IDOK
Abort
${endif}
# warning when LyX couldn't be found in the registry
${if} $0 == "" # check in HKCU
ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion"
${if} $0 == ""
- MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)"
+ MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)" /SD IDOK
${endif}
${endif}
SectionSetText 2 "" # hides the corresponding uninstaller section
${endif}
- # test if JabRef was installed together with LyX
- ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX"
- ${if} $0 == "Yes${APP_SERIES_KEY}"
- SectionSetText 3 "JabRef" # names the corersponding uninstaller section
- StrCpy $JabRefInstalled "Yes"
- ${else}
- SectionSetText 3 "" # hides the corresponding uninstaller section
- ${endif}
-
# question message if the user really wants to uninstall LyX
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2 # continue if yes
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" /SD IDYES IDYES +2 # continue if yes
Abort
FunctionEnd
-
projects / lyx.git / blobdiff