From 027b7b52f83ce0c9c402805311213dc298f3ced2 Mon Sep 17 00:00:00 2001 From: Joost Verburg Date: Thu, 17 Feb 2011 17:08:50 +0000 Subject: [PATCH] remove unused installer code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37715 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/Makefile.am | 1 - .../packaging/installer/gui/langselect.nsh | 77 ------------------- .../packaging/installer/include/langlist.nsh | 44 ----------- .../packaging/installer/lang/english.nsh | 2 - .../Win32/packaging/installer/lang/french.nsh | 2 - .../Win32/packaging/installer/lang/german.nsh | 2 - .../packaging/installer/lang/italian.nsh | 2 - development/Win32/packaging/installer/lyx.nsi | 7 +- 8 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 development/Win32/packaging/installer/gui/langselect.nsh delete mode 100644 development/Win32/packaging/installer/include/langlist.nsh diff --git a/development/Makefile.am b/development/Makefile.am index f01175ca1d..1b8a9911f0 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -41,7 +41,6 @@ Win32/packaging/installer/include/dictlist.nsh \ Win32/packaging/installer/include/filelist.nsh \ Win32/packaging/installer/include/gui.nsh \ Win32/packaging/installer/include/init.nsh \ -Win32/packaging/installer/include/langlist.nsh \ Win32/packaging/installer/include/nsis.nsh \ Win32/packaging/installer/include/variables.nsh \ Win32/packaging/installer/lang/english.nsh \ diff --git a/development/Win32/packaging/installer/gui/langselect.nsh b/development/Win32/packaging/installer/gui/langselect.nsh deleted file mode 100644 index d8d7469037..0000000000 --- a/development/Win32/packaging/installer/gui/langselect.nsh +++ /dev/null @@ -1,77 +0,0 @@ -/* - -langselect.nsh - -Selection of language for LyX interface - -*/ - -Var LangSelectPage -Var LangSelectPage.Info -Var LangSelectPage.DropList - -Var LangSystem - -!macro LoadLang VAR LANGNAME LANGISOCODE LANGID - - ${NSD_CB_AddString} $LangSelectPage.DropList "${LANGNAME}" - -!macroend - -!macro SetSystemLang VAR LANGNAME LANGISOCODE LANGID - - ${If} ${VAR} == ${LANGID} - ${NSD_CB_SelectString} $LangSelectPage.DropList "${LANGNAME}" - ${EndIf} - -!macroend - -!macro GetISOLangCode VAR_LANGNAME VAR_LANGISOCODE LANGNAME LANGISOCODE LANGID - - ${If} ${VAR_LANGNAME} == "${LANGNAME}" - StrCpy ${VAR_LANGISOCODE} "${LANGISOCODE}" - ${EndIf} - -!macroend - -# Page functions - -Function PageLanguage - - # Build the dialog - - !insertmacro MUI_HEADER_TEXT "$(TEXT_LANGUAGE_TITLE)" "$(TEXT_LANGUAGE_SUBTITLE)" - - nsDialogs::Create /NOUNLOAD 1018 - Pop $LangSelectPage - - ${NSD_CreateLabel} 0u 0u 300u 20u $(TEXT_LANGUAGE_INFO) - Pop $LangSelectPage.Info - - ${NSD_CreateDropList} 0u 40u 110u 100u "" - Pop $LangSelectPage.DropList - - # Load list of languages - !insertmacro Languages '!insertmacro LoadLang $LangSystem' - - ${If} $LangName == "" - # Set the default for the language selection dialog to the Windows language - System::Call "kernel32::GetUserDefaultUILanguage()i.s" - Pop $LangSystem - !insertmacro Languages '!insertmacro SetSystemLang $LangSystem' - ${Else} - # Restore previous user selection - ${NSD_CB_SelectString} $LangSelectPage.DropList $LangName - ${EndIf} - - nsDialogs::Show - -FunctionEnd - -Function PageLanguageValidate - - ${NSD_GetText} $LangSelectPage.DropList $LangName - # Convert to ISO code - !insertmacro Languages '!insertmacro GetISOLangCode $LangName $LangISOCode' - -FunctionEnd diff --git a/development/Win32/packaging/installer/include/langlist.nsh b/development/Win32/packaging/installer/include/langlist.nsh deleted file mode 100644 index 108d864c20..0000000000 --- a/development/Win32/packaging/installer/include/langlist.nsh +++ /dev/null @@ -1,44 +0,0 @@ -/* - -langlist.nsh - -List of langauges supported by the LyX - -*/ - -!macro Languages COMMAND - - # List of LyX translations with ISO code and language identifier - - ${COMMAND} "Català" ca_ES 1027 - ${COMMAND} "Ceština" cs_CZ 1029 - ${COMMAND} "Chinese (Simplified)" zh_CN 2052 - ${COMMAND} "Chinese (Traditional)" zh_TW 1028 - # ${COMMAND} "Dansk" da_DK 1030 - ${COMMAND} "Deutsch" de_DE 1031 - ${COMMAND} "English" en_EN 1033 - ${COMMAND} "Español" es_ES 1034 - ${COMMAND} "Euskara" eu_EU 1069 - ${COMMAND} "Français" fr_FR 1036 - ${COMMAND} "Galego" gl_ES 1036 - ${COMMAND} "Hebrew" he_IL 1037 - ${COMMAND} "Italiano" it_IT 1057 - ${COMMAND} "Japanese" ja_JP 1041 - # ${COMMAND} "Korean" ko 1042 - ${COMMAND} "Magyar" hu_HU 1038 - # ${COMMAND} "Nederlands" nl_NL 1043 - ${COMMAND} "Norsk (Bokmål)" nb_NO 1044 - ${COMMAND} "Norsk (Nynorsk)" nn_NO 2068 - ${COMMAND} "Português" pt_PT 1046 - ${COMMAND} "Polski" pl_PL 1045 - ${COMMAND} "Româna" ro_RO 1048 - # ${COMMAND} "Russian" ru_RU 1049 - # ${COMMAND} "Slovencina" sk_SK 1060 - # ${COMMAND} "Slovenšcina" sl_SI 1051 - ${COMMAND} "Suomi" fi_FI 1035 - # ${COMMAND} "Svenska" sv_SE 1053 - # ${COMMAND} "Türkçe" tr_TR 1055 - ${COMMAND} "Ukrainian" uk_UK 1058 - # ${COMMAND} "Walon" wa_BE 1055 - -!macroend diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index 3f246dddb9..a501525c45 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -88,5 +88,3 @@ ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" ${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" - -${LangFileString} UNTEXT_WELCOME "This wizard will guide you through the uninstallation of $(^NameDA). Please close $(^NameDA) before you continue.$\r$\n$\r$\nNote that this wizard will only uninstall LyX itself. If you want to uninstall other applications you installed for use with LyX, uninstall them using their entry in Add/Remove Programs.$\r$\n$\r$\n$_CLICK" diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 2a71100244..e4d2c62f02 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -88,5 +88,3 @@ ${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX (MiKTeX peut t ${LangFileString} TEXT_FINISH_DESKTOP "Créer un raccourci sur le bureau" ${LangFileString} TEXT_FINISH_WEBSITE "Consulter les dernières nouvelles, trucs et astuces sur le site lyx.org" - -${LangFileString} UNTEXT_WELCOME "Cet assistant va vous guider tout au long de la désinstallation de $(^NameDA). Merci de quitter $(^NameDA) avant de poursuivre.$\r$\n$\r$\nNotez bien que cet assistant ne désinstallera que LyX proprement dit. Si vous désirez désinstaller d'autres applications que vous avez installées pour les besoins de $(^NameDA), effectuez cette désinstallation via la page « Ajout/Suppression de programmes ».$\r$\n$\r$\n$_CLICK" diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index a6e9c2da8d..41183492b9 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -82,5 +82,3 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "Die Installation der W ${LangFileString} TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberfläche erzeugen" ${LangFileString} TEXT_FINISH_WEBSITE "Besuchen Sie lyx.org für aktuelle Neuigkeiten" - -${LangFileString} UNTEXT_WELCOME "Dieses Installationsprogramm wird Sie durch die Deinstallation von $(^NameDA) leiten. Bitte schließen Sie $(^NameDA) bevor Sie fortfahren.$\r$\n$\r$\nBeachten Sie bitte, dass im folgenden nur LyX selbst deinstalliert wird. Falls Sie andere Anwendungen aus ihrem System entfernen möchten, die zur Nutzung von Lyx installiert wurden, benutzen Sie hierzu bitte den Eintrag Software im Menü Systemsteuerung und wählen Sie dort dann den entsprechenden Eintrag für das Programm aus.$\r$\n$\r$\n$_CLICK" diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh index d0a8648f1f..742c45409b 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/lang/italian.nsh @@ -82,5 +82,3 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "L'installazione del dizionario ortogra ${LangFileString} TEXT_FINISH_DESKTOP "Crea icona sul desktop" ${LangFileString} TEXT_FINISH_WEBSITE "Visitate lyx.org per ultime novità, aiuto e suggerimenti" - -${LangFileString} UNTEXT_WELCOME "Verrete guidati nella disinstallazione di $(^NameDA). Per favore, chiudete $(^NameDA) prima di continuare.$\r$\n$\r$\nNotate che verrà disinstallato solamente LyX. Se volete disinstallare le altre applicazioni installate insieme a LyX, dovrete farlo mediante la voce corrispondente in 'Installazione applicazioni'.$\r$\n$\r$\n$_CLICK" diff --git a/development/Win32/packaging/installer/lyx.nsi b/development/Win32/packaging/installer/lyx.nsi index ef3433dbeb..2ab59a5327 100644 --- a/development/Win32/packaging/installer/lyx.nsi +++ b/development/Win32/packaging/installer/lyx.nsi @@ -1,10 +1,8 @@ /* -NSIS Script - LyX 1.5/1.6 Installer for Win32 +NSIS Script - LyX 1.6 Installer for Win32 Authors: Joost Verburg, Angus Leeming, Uwe Stöhr -Requires NSIS 2.36 or later - -Licence details for all installer scripts can be found in the file COPYING +Compatible with NSIS 2.46 */ @@ -19,7 +17,6 @@ Licence details for all installer scripts can be found in the file COPYING !include include\dictlist.nsh !include include\filelist.nsh -!include include\langlist.nsh !include include\detection.nsh !include include\gui.nsh