mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
* optimizations and fixes for installation using a limited user account. default directory for a limited account is set to local application data.
* simplified initialization functions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24243 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg
parent
beed92af2b
commit
0aac671e83
@ -62,17 +62,17 @@ Var ComponentSize
|
||||
Pop $ExternalPage.Existing
|
||||
nsDialogs::OnClick /NOUNLOAD $ExternalPage.Existing $ExternalPage.RadioButton.Click
|
||||
|
||||
${NSD_CreateText} 10u 75u 255u 12u $Path${COMPONENT}
|
||||
${NSD_CreateText} 10u 80u 255u 12u $Path${COMPONENT}
|
||||
Pop $ExternalPage.Folder
|
||||
|
||||
${NSD_CreateBrowseButton} 270u 75u 20u 12u ...
|
||||
${NSD_CreateBrowseButton} 270u 80u 20u 12u ...
|
||||
Pop $ExternalPage.FolderBrowse
|
||||
nsDialogs::OnClick /NOUNLOAD $ExternalPage.FolderBrowse $ExternalPage.FolderBrowse.Click
|
||||
|
||||
${NSD_CreateLabel} 5u 95u 295u 10u $(TEXT_EXTERNAL_${COMPONENT}_FOLDER_INFO)
|
||||
${NSD_CreateLabel} 10u 100u 290u 10u $(TEXT_EXTERNAL_${COMPONENT}_FOLDER_INFO)
|
||||
Pop $ExternalPage.FolderInfo
|
||||
|
||||
${NSD_CreateRadioButton} 0u 115u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_NONE)
|
||||
${NSD_CreateRadioButton} 0u 120u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_NONE)
|
||||
Pop $ExternalPage.NoInstall
|
||||
nsDialogs::OnClick /NOUNLOAD $ExternalPage.NoInstall $ExternalPage.RadioButton.Click
|
||||
|
||||
@ -90,6 +90,7 @@ Var ComponentSize
|
||||
${NSD_SetState} $ExternalPage.Setup ${BST_CHECKED}
|
||||
${Else}
|
||||
${NSD_SetState} $ExternalPage.Existing ${BST_CHECKED}
|
||||
EnableWindow $ExternalPage.Setup 0
|
||||
${EndIf}
|
||||
${Else}
|
||||
${NSD_SetState} $ExternalPage.Setup $${COMPONENT}Setup.State
|
||||
|
||||
@ -22,6 +22,11 @@ Standard header files, shared variables
|
||||
!define MULTIUSER_INSTALLMODE_COMMANDLINE
|
||||
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${APP_REGKEY}"
|
||||
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
|
||||
|
||||
!define MULTIUSER_INSTALLMODE_INSTDIR "${APP_DIR}"
|
||||
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${APP_REGKEY}"
|
||||
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
|
||||
|
||||
!define MULTIUSER_INSTALLMODE_FUNCTION InitUser
|
||||
!define MULTIUSER_MUI
|
||||
|
||||
|
||||
@ -12,9 +12,6 @@ Installer user interface settings
|
||||
Name "${APP_NAME} ${APP_VERSION}"
|
||||
BrandingText " "
|
||||
|
||||
# Default installation folder
|
||||
InstallDir "${SETUP_DEFAULT_DIRECTORY}"
|
||||
|
||||
#--------------------------------
|
||||
# Interface settings
|
||||
|
||||
@ -26,7 +23,6 @@ InstallDir "${SETUP_DEFAULT_DIRECTORY}"
|
||||
!define MUI_HEADERIMAGE_RIGHT
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
|
||||
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
|
||||
!define MUI_CUSTOMFUNCTION_GUIINIT InitInterface
|
||||
!define MUI_COMPONENTSPAGE_NODESC
|
||||
|
||||
#--------------------------------
|
||||
@ -99,18 +95,3 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"
|
||||
|
||||
#--------------------------------
|
||||
# Interface initialization
|
||||
|
||||
Function InitInterface
|
||||
|
||||
# Warn the user when no Administrator or Power user privileges are available
|
||||
# These privileges are required to install ImageMagick or Ghostscript
|
||||
|
||||
${If} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_NO_PRIVILEDGES)
|
||||
${EndIf}
|
||||
|
||||
FunctionEnd
|
||||
|
||||
@ -29,11 +29,19 @@ Function .onInit
|
||||
|
||||
!insertmacro PRINTER_INIT
|
||||
!insertmacro MULTIUSER_INIT
|
||||
|
||||
|
||||
${IfNot} ${Silent}
|
||||
# Warn the user when no Administrator or Power user privileges are available
|
||||
# These privileges are required to install ImageMagick or Ghostscript
|
||||
${If} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_NO_PRIVILEDGES)
|
||||
${EndIf}
|
||||
|
||||
# Show banner while installer is intializating
|
||||
Banner::show /NOUNLOAD "Checking system"
|
||||
${EndIf}
|
||||
|
||||
|
||||
Call SearchExternal
|
||||
Call InitExternal
|
||||
|
||||
@ -54,7 +62,6 @@ FunctionEnd
|
||||
# User initialization
|
||||
|
||||
Var ComponentPath
|
||||
Var LyXPath
|
||||
Var LyXLangName
|
||||
|
||||
# COMPONENT can be LaTeX ImageMagick and Ghostscript
|
||||
@ -75,13 +82,7 @@ Var LyXLangName
|
||||
Function InitUser
|
||||
|
||||
# Get directories of components from registry
|
||||
|
||||
ReadRegStr $LyXPath SHELL_CONTEXT "${APP_REGKEY}" ""
|
||||
|
||||
${If} $LyXPath != ""
|
||||
StrCpy $INSTDIR $LyXPath
|
||||
${EndIf}
|
||||
|
||||
!insertmacro EXTERNAL_INIT LaTeX
|
||||
!insertmacro EXTERNAL_INIT ImageMagick
|
||||
!insertmacro EXTERNAL_INIT Ghostscript
|
||||
|
||||
@ -8,7 +8,7 @@ Author: Joost Verburg
|
||||
|
||||
!insertmacro LANGFILE_EXT "English"
|
||||
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "You do not have Administrator or Power User privileges.$\r$\n$\r$\nAlthough you can install ${APP_NAME} and the typesetting system, the utilities for image conversion and previewing cannot be installed without these priviledges."
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "You don't have Administrator or Power User privileges.$\r$\nThe utilities for image conversion cannot be installed without these priviledges."
|
||||
|
||||
${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ Author: Jean-Pierre Chr
|
||||
|
||||
!insertmacro LANGFILE_EXT "French"
|
||||
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Vous n'avez pas les privilèges d'administrateur.$\r$\n$\r$\nBien que vous puissiez installer ${APP_NAME} et le système typographique, les utilitaires de conversion de format graphique et de prévisualisation ne peuvent être installés sans ces privilèges."
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Vous n'avez pas les privilèges d'administrateur.$\r$\nLes utilitaires de conversion de format graphique ne peuvent être installés sans ces privilèges."
|
||||
|
||||
${LangFileString} TEXT_WELCOME_DOWNLOAD "Cet assistant va vous guider tout au long de l'installation de $(^NameDA), le constructeur de documents qui encourage une saisie fondée sur la structure du document plutôt que sur son apparence.$\r$\n$\r$\nCet assistant d'installation va paramétrer un environnement complet d'utilisation de ${APP_NAME} et peut télécharger automatiquement les composants manquants.$\r$\n$\r$\n$(^ClickNext)"
|
||||
${LangFileString} TEXT_WELCOME_INSTALL "Cet assistant va vous guider tout au long de l'installation de $(^NameDA), le constructeur de documents qui encourage une saisie fondée sur la structure du document plutôt que sur son apparence.$\r$\n$\r$\nCet assistant d'installation va paramétrer un environnement complet d'utilisation de ${APP_NAME} et peut installer automatiquement les composants manquants.$\r$\n$\r$\n$(^ClickNext)"
|
||||
|
||||
@ -8,7 +8,7 @@ Author: Andreas Deininger
|
||||
|
||||
!insertmacro LANGFILE_EXT "German"
|
||||
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Sie gehören weder der Gruppe der Administratoren noch der Gruppe der Hauptbenutzer an.$\r$\n$\r$\nSie können zwar ${APP_NAME} installieren und ebenso auch das Satzprogramm. Die Werkzeuge zur Grafikkonvertierung und für die Vorschau können jedoch ohne diese Rechte nicht installiert werden."
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Sie gehören weder der Gruppe der Administratoren noch der Gruppe der Hauptbenutzer an.$\r$\nDie Werkzeuge zur Grafikkonvertierung können ohne diese Rechte nicht installiert werden."
|
||||
|
||||
${LangFileString} TEXT_WELCOME_DOWNLOAD "Dieses Installationsprogramm wird Sie durch die Installation von $(^NameDA) leiten, des Dokumentenverarbeitungsprogramms welches das Verfassen von Texten basierend auf ihrer Struktur unterstützt, nicht das Verfassen von Texten ausgerichtet auf ihr Erscheinungsbild.$\r$\n$\r$\nDieses Installationsprogramm wird ein Komplettsystem zur Nutzung von ${APP_NAME} auf Ihrem Rechner erzeugen, dabei können fehlende Komponenten automatisch heruntergeladen werden.$\r$\n$\r$\n$(^ClickNext)"
|
||||
${LangFileString} TEXT_WELCOME_INSTALL "Dieses Installationsprogramm wird Sie durch die Installation von $(^NameDA) leiten, des Dokumentenverarbeitungsprogramms welches das Verfassen von Texten basierend auf ihrer Struktur unterstützt, nicht das Verfassen von Texten ausgerichtet auf ihr Erscheinungsbild.$\r$\n$\r$\nDieses Installationsprogramm wird ein Komplettsystem zur Nutzung von ${APP_NAME} auf Ihrem Rechner erzeugen, dabei können fehlende Komponenten automatisch heruntergeladen werden.$\r$\n$\r$\n$(^ClickNext)"
|
||||
|
||||
@ -8,7 +8,7 @@ Author: Enrico Forestieri
|
||||
|
||||
!insertmacro LANGFILE_EXT "Italian"
|
||||
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Non si hanno privilegi da amministratore o utente avanzato.$\r$\n$\r$\nSebbene sia possibile installare ${APP_NAME} ed il sistema di composizione tipografica, le utilità per la conversione delle immagini e per l'anteprima non possono essere installate senza tali privilegi."
|
||||
${LangFileString} TEXT_NO_PRIVILEDGES "Non si hanno privilegi da amministratore o utente avanzato.$\r$\nLe utilità per la conversione delle immagini non possono essere installate senza tali privilegi."
|
||||
|
||||
${LangFileString} TEXT_WELCOME_DOWNLOAD "Verrete guidati nell'installazione di $(^NameDA), il compilatore di documenti che incoraggia un approccio alla scrittura basato sulla struttura dei vostri testi, non sulla loro apparenza.$\r$\n$\r$\nQuesto installer preparerà un ambiente completo per usare ${APP_NAME} ed è in grado di scaricare automaticamente dalla rete i componenti mancanti.$\r$\n$\r$\n$(^ClickNext)"
|
||||
${LangFileString} TEXT_WELCOME_INSTALL "Verrete guidati nell'installazione di $(^NameDA), il compilatore di documenti che incoraggia un approccio alla scrittura basato sulla struttura dei vostri testi, non sulla loro apparenza.$\r$\n$\r$\nQuesto installer preparerà un ambiente completo per usare ${APP_NAME} ed è in grado di installare automaticamente i componenti mancanti.$\r$\n$\r$\n$(^ClickNext)"
|
||||
|
||||
@ -106,7 +106,8 @@ SetCompressor /SOLID lzma
|
||||
!define APP_VERSION_NUMBER "1.6.0.0"
|
||||
!define APP_SERIES_NAME "1.6"
|
||||
!define APP_SERIES_KEY "16"
|
||||
!define APP_DIR_USERDATA "LyX16"
|
||||
!define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
|
||||
!define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
|
||||
!define APP_INFO "${APP_NAME} - The Document Processor"
|
||||
!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2008 LyX Team"
|
||||
|
||||
@ -140,7 +141,6 @@ SetCompressor /SOLID lzma
|
||||
!define SETUP_EXE "${BundleExeFile}"
|
||||
!endif
|
||||
|
||||
!define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"
|
||||
!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
|
||||
!define SETUP_HEADERIMAGE "graphics\header.bmp"
|
||||
!define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
|
||||
|
||||
@ -144,8 +144,8 @@ SectionEnd
|
||||
|
||||
Section -PSPrinter
|
||||
|
||||
${If} $MultiUser.Privileges != "Admin"
|
||||
${OrIf} $MultiUser.Privileges != "Power"
|
||||
${If} $MultiUser.Privileges == "Admin"
|
||||
${OrIf} $MultiUser.Privileges == "Power"
|
||||
|
||||
# Delete printer
|
||||
ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user