[Gpg4win-commits] r48 - in trunk: . src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 8 13:18:10 CET 2005
Author: werner
Date: 2005-11-08 13:18:10 +0100 (Tue, 08 Nov 2005)
New Revision: 48
Modified:
trunk/ChangeLog
trunk/TODO
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/inst-gnupg.nsi
trunk/src/inst-gpa.nsi
trunk/src/inst-gpgee.nsi
trunk/src/inst-man_advanced_de.nsi
trunk/src/inst-man_novice_de.nsi
trunk/src/inst-sections.nsi
trunk/src/inst-winpt.nsi
trunk/src/installer-finish.nsi
trunk/src/installer.nsi
Log:
Add a link to the finish page, allow running gpa after the installer,
properly cleanup the start menu, display toolstips for all start menu items, better descriptions for the selection dialog and fixed the too big title on the first page.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/ChangeLog 2005-11-08 12:18:10 UTC (rev 48)
@@ -1,3 +1,15 @@
+2005-11-08 Werner Koch <wk at g10code.com>
+
+ * src/installer.nsi (T_WelcomeTitle): New.
+ (MUI_WELCOMEPAGE_TITLE): New.
+ (MUI_FINISHPAGE): Enhanced.
+
+ * src/installer-finish.nsi (Uninstall): use a loop to delete the
+ startmenu. Fixed Registry cleaning.
+
+ * src/inst-sections.nsi (onInit): Make sure that only one
+ installer is running.
+
2005-11-07 Werner Koch <wk at g10code.com>
* src/installer-finish.nsi: Fixed dereferencing of variable.
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/TODO 2005-11-08 12:18:10 UTC (rev 48)
@@ -1,15 +1,19 @@
-*- outline -*-
* Missing stuff
-** No sources yet for WinPT due to current changes in its build system
** WinPT signature file should better be named .sig
+** System.dll is unsuable under DLL.
+ We should write a custom Plugin DLL for gpg4win to collect
+ function we need. This can also do the check for existing versions
+ of GnuPG etc. And maybe to display a jpeg splash screen and to
+ play continuesly an ogg encoded tune.
+
* Component related issues:
** Check out which locale files to install and where. !!!
** Check which iconv to use !!
** Finish integration of GnuPG.
-** Add the missing packages: gpgee, Sylpheed, WinPT, Eudore extensions.
-** gpgol needs to be registered. !!!
+** Add the missing packages: Sylpheed Eudore extensions.
* The following items are related to package auto-detection and
configuration. They are not critical.
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/gpg4win-src.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -40,6 +40,11 @@
!define INSTALL_DIR "GnuPG\Source"
+!define WELCOME_TITLE_ENGLISH \
+ "Welcome to the installation of the Gpg4Win sources"
+!define WELCOME_TITLE_GERMAN \
+ "Willkommen bei der Installation der Gpg4Win Quellen"
+
!define ABOUT_ENGLISH \
"GnuPG is GNU's tool for secure communication and data storage. \
It can be used to encrypt data and to create digital signatures. \
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/gpg4win.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -37,6 +37,12 @@
!define INSTALL_DIR "GnuPG"
+!define WELCOME_TITLE_ENGLISH \
+ "Welcome to the installation of Gpg4Win"
+
+!define WELCOME_TITLE_GERMAN \
+ "Willkommen bei der Installation von Gpg4Win"
+
!define ABOUT_ENGLISH \
"GnuPG is GNU's tool for secure communication and data storage. \
It can be used to encrypt data and to create digital signatures. \
Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-gnupg.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -59,3 +59,9 @@
"Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil \
dieser Software. GnuPG stellt die eigentlichen \
Verschlüsselungsfunktionen sowie die Schlüsselverwaltung bereit."
+
+LangString DESC_Menu_gnupg_faq ${LANG_ENGLISH} \
+ "Show the Frequently Asked Questions Document for GnuPG"
+LangString DESC_Menu_gnupg_faq ${LANG_GERMAN} \
+ "Das Dokument mit den häufig gestellten Fragen (FAQ) zu GnuPG anzeigen"
+
Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-gpa.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -43,4 +43,14 @@
LangString DESC_SEC_gpa ${LANG_ENGLISH} \
"GNU Privacy Assistant"
LangString DESC_SEC_gpa ${LANG_GERMAN} \
- "GNU Privacy Assistent"
+ "GNU Privacy Assistent (GPA) ist ein Schlüsselverwaltungsprogramm \
+ welches für mehrere Betriebsysteme verfügbar ist. Es kann zusammen \
+ oder anstatt von WinPT benutzt werden."
+
+
+LangString DESC_Menu_gpa ${LANG_ENGLISH} \
+ "Run the GNU Privacy Assistant key management tool. \
+ This is an alternative to the WinPT key management tool."
+LangString DESC_Menu_gpa ${LANG_GERMAN} \
+ "Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen. \
+ Dies ist eine Alternative zu dem WinPT Programm."
Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-gpgee.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -51,7 +51,7 @@
verschlüsseln."
LangString DESC_Menu_gpgee_hlp ${LANG_ENGLISH} \
- "Show the online manula of GPGee"
-LangString DESC_Menu_gpgee_hlp ${LANG_German} \
+ "Show the online manual of GPGee"
+LangString DESC_Menu_gpgee_hlp ${LANG_GERMAN} \
"Das englische Handbuch zu GPGee anzeigen"
Modified: trunk/src/inst-man_advanced_de.nsi
===================================================================
--- trunk/src/inst-man_advanced_de.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-man_advanced_de.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -40,3 +40,9 @@
"Gpg4Win Manual for the Advanced User (German)"
LangString DESC_SEC_man_advanced_de ${LANG_GERMAN} \
"Gpg4Win Handbuch für den Durchblicker"
+
+
+LangString DESC_Menu_man_advanced_de ${LANG_ENGLISH} \
+ "Show the German online manual of Gpg4Win for advanced users"
+LangString DESC_Menu_man_advanced_de ${LANG_GERMAN} \
+ "Das Online-Handbuch von Gpg4Win für den Durchblicker anzeigen"
Modified: trunk/src/inst-man_novice_de.nsi
===================================================================
--- trunk/src/inst-man_novice_de.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-man_novice_de.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -40,3 +40,8 @@
"Gpg4Win Manual for the Novice User (German)"
LangString DESC_SEC_man_novice_de ${LANG_GERMAN} \
"Gpg4Win Handbuch für den Einsteiger"
+
+LangString DESC_Menu_man_novice_de ${LANG_ENGLISH} \
+ "Show the German online manual of Gpg4Win for novice users"
+LangString DESC_Menu_man_novice_de ${LANG_GERMAN} \
+ "Das Online-Handbuch von Gpg4Win für den Einsteiger anzeigen"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-sections.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -285,7 +285,20 @@
FunctionEnd
+#LangString T_AlreadyRunning ${LANG_ENGLISH} \
+# "An instance of this installer is already running."
+#LangString T_AlreadyRunning ${LANG_GERMAN} \
+# "Ein Exemplar dieses Installers läuft bereits."
+
Function .onInit
+ # Debian's NSIS package comes without System.dll because it can't be
+ # compiled with mingw. Thus we can't use the code below.
+ #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gpg4win") i .r1 ?e'
+ #Pop $R0
+ #StrCmp $R0 0 +3
+ # MessageBox MB_OK $(T_AlreadyRunning)
+ # Abort
+
SetOutPath $TEMP
File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
@@ -349,7 +362,8 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WINPT.lnk" \
- "$INSTDIR\winpt.exe"
+ "$INSTDIR\winpt.exe" \
+ "" "$INSTDIR\winpt.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_winpt)
no_winpt_menu:
!endif
@@ -358,7 +372,8 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_gpa_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPA.lnk" \
- "$INSTDIR\gpa.exe"
+ "$INSTDIR\gpa.exe" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpa)
no_gpa_menu:
!endif
@@ -367,7 +382,8 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Novice Manual.lnk" \
- "$INSTDIR\share\gpg4win\man_novice_de.html"
+ "$INSTDIR\share\gpg4win\man_novice_de.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
no_man_novice_de_menu:
!endif
@@ -376,7 +392,8 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Advanced Manual.lnk" \
- "$INSTDIR\share\gpg4win\man_novice_de.html"
+ "$INSTDIR\share\gpg4win\man_novice_de.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
no_man_advanced_de_menu:
!endif
@@ -391,7 +408,8 @@
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG FAQ.lnk" \
- "$INSTDIR\share\gnupg\faq.html"
+ "$INSTDIR\share\gnupg\faq.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
"$INSTDIR\${PACKAGE}-uninstall.exe"
Modified: trunk/src/inst-winpt.nsi
===================================================================
--- trunk/src/inst-winpt.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/inst-winpt.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -44,4 +44,14 @@
LangString DESC_SEC_winpt ${LANG_ENGLISH} \
"Windows Privacy Tray"
LangString DESC_SEC_winpt ${LANG_GERMAN} \
- "Windows Privacy Tray"
+ "Windows Privacy Tray (WinPT) ist ein vielseitiges Programm zur \
+ Schlüsselverwaltung sowie aller anderen Funktionen von GnuPG. Es \
+ installiert sich in die Startleiste."
+
+LangString DESC_Menu_winpt ${LANG_ENGLISH} \
+ "Run the Windows Privacy Tray key management tool. \
+ This is a versatile key management and encryption tool."
+LangString DESC_Menu_winpt ${LANG_GERMAN} \
+ "Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen. \
+ Dies ist ein vielseitiges Programm zur Schlüsselverwaltung und \
+ Verschlüsselung. Es installiert sich in die Startleiste."
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/installer-finish.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -46,26 +46,20 @@
# we printed a warning that installation will not succeed.
SetShellVarContext all
-!insertmacro MUI_STARTMENU_GETFOLDER ${STARTMENU_FOLDER} $R0
-!ifdef HAVE_PKG_WINPT
- Delete "$SMPROGRAMS\$R0\WinPT.lnk"
-!endif
-!ifdef HAVE_PKG_GPA
- Delete "$SMPROGRAMS\$R0\GPA.lnk"
-!endif
-!ifdef HAVE_PKG_MAN_NOVICE_DE
- Delete "$SMPROGRAMS\$R0\Novice Manual.lnk"
-!endif
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
- Delete "$SMPROGRAMS\$R0\Advanced Manual.lnk"
-!endif
-!ifdef HAVE_PKG_GPGEE
- Delete "$SMPROGRAMS\$R0\GPGee Manual.lnk"
-!endif
+ #---------------------------------------------------
+ # Delete the menu entries and any empty parent menus
+ #---------------------------------------------------
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $MYTMP
+ Delete "$SMPROGRAMS\$MYTMP\*.lnk"
+ StrCpy $MYTMP "$SMPROGRAMS\$MYTMP"
+ startMenuDeleteLoop:
+ ClearErrors
+ RMDir $MYTMP
+ GetFullPathName $MYTMP "$MYTMP\.."
+ IfErrors startMenuDeleteLoopDone
+ StrCmp $MYTMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
+ startMenuDeleteLoopDone:
-
- Delete "$SMPROGRAMS\$R0\Uninstall.lnk"
- RMDir "$SMPROGRAMS\$R0"
DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
"Start Menu Folder"
!endif
@@ -78,5 +72,5 @@
"Install Directory"
DeleteRegKey /ifempty HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
# Remove Windows Add/Remove Programs support.
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuPG"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRETTY_PACKAGE_SHORT}"
SectionEnd
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2005-11-07 20:47:57 UTC (rev 47)
+++ trunk/src/installer.nsi 2005-11-08 12:18:10 UTC (rev 48)
@@ -96,7 +96,8 @@
# The list of wizard pages.
-!define MUI_WELCOMEPAGE_TEXT "$(T_About)"
+!define MUI_WELCOMEPAGE_TITLE "$(T_WelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(T_About)"
!insertmacro MUI_PAGE_WELCOME
!define MUI_LICENSEPAGE_BUTTON "$(^NextBtn)"
@@ -118,6 +119,12 @@
!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_RUN "$INSTDIR\gpa.exe"
+!define MUI_FINISHPAGE_RUN_PARAMETERS "--keyring"
+!define MUI_FINISHPAGE_RUN_TEXT "$(T_RunKeyManager)"
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_LINK "$(T_MoreInfo)"
+!define MUI_FINISHPAGE_LINK_LOCATION http://www.gpg4win.org
!insertmacro MUI_PAGE_FINISH
@@ -144,12 +151,17 @@
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
ReserveFile "${NSISDIR}\Plugins\advsplash.dll"
+#ReserveFile "${NSISDIR}\Plugins\System.dll"
ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.bmp"
ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.wav"
ReserveFile "${TOP_SRCDIR}\COPYING"
# Language support
+# The WelcomeTitle is displayed on the first page.
+LangString T_WelcomeTitle ${LANG_ENGLISH} "${WELCOME_TITLE_ENGLISH}"
+LangString T_WelcomeTitle ${LANG_GERMAN} "${WELCOME_TITLE_GERMAN}"
+
# The About string as displayed on the first page.
LangString T_About ${LANG_ENGLISH} "${ABOUT_ENGLISH}"
LangString T_About ${LANG_GERMAN} "${ABOUT_GERMAN}"
@@ -173,7 +185,17 @@
einzusetzen. Sie können die Software weitergeben, sofern Sie dem \
Empfänger dieselben Rechte einräumen, die auch Sie erhalten haben."
+LangString T_RunKeyManager ${LANG_ENGLISH} \
+ "Run the key manager"
+LangString T_RunKeyManager ${LANG_GERMAN} \
+ "Die Schlüsselverwaltung aufrufen"
+LangString T_MoreInfo ${LANG_ENGLISH} \
+ "Click here for the project's homepage"
+LangString T_MoreInfo ${LANG_GERMAN} \
+ "Hier klicken um zur Homepage des Projekts zu gelangen"
+
+
# Functions
# PrintNonAdminWarning
More information about the Gpg4win-commits
mailing list