[Gpg4win-commits] r1579 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-11-02 09:57:02 +0100 (Tue, 02 Nov 2010)
New Revision: 1579

Modified:
   trunk/ChangeLog
   trunk/src/inst-gpg4win.nsi
   trunk/src/inst-sections.nsi
   trunk/src/installer.nsi
   trunk/src/uninst-gpg4win.nsi
Log:
Installed HOWTO-SMIME.de.txt and HOWTO-SMIME.en.txt.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-02 08:54:28 UTC (rev 1578)
+++ trunk/ChangeLog	2010-11-02 08:57:02 UTC (rev 1579)
@@ -3,6 +3,9 @@
 	* src/inst-gnupg2.nsi: Install trustlist.txt and trustlist.txt.example
 	  into $APPDATA\GNU\etc\gnupg.
 
+	* src/uninst-gpg4win.nsi, src/installer.nsi, src/inst-gpg4win.nsi,
+	  src/inst-sections.nsi: Install HOWTO-SMIME.de.txt and HOWTO-SMIME.en.txt.
+
 2010-09-24  Werner Koch  <wk at g10code.com>
 
 	* patches/gnupg2-2.0.16/06-reread-agent.patch: New.

Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi	2010-11-02 08:54:28 UTC (rev 1578)
+++ trunk/src/inst-gpg4win.nsi	2010-11-02 08:57:02 UTC (rev 1579)
@@ -33,6 +33,8 @@
   File /oname=README.fr.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.ru.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.pt.txt "${BUILD_DIR}/README.en.txt"
+  File "${BUILD_DIR}/../doc/HOWTO-SMIME.en.txt"
+  File "${BUILD_DIR}/../doc/HOWTO-SMIME.de.txt"
 
   File "${BUILD_DIR}/versioninfo.txt"
 
@@ -82,5 +84,8 @@
 LangString DESC_Menu_gpg4win_readme ${LANG_ENGLISH} \
    "General information on Gpg4win"
 
+LangString DESC_Menu_gpg4win_howtosmime ${LANG_ENGLISH} \
+   "Instruction to configure S/MIME"
+
 LangString DESC_Menu_gnupg_faq ${LANG_ENGLISH} \
    "Show the Frequently Asked Questions document for GnuPG"

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2010-11-02 08:54:28 UTC (rev 1578)
+++ trunk/src/inst-sections.nsi	2010-11-02 08:57:02 UTC (rev 1579)
@@ -1328,6 +1328,20 @@
       "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
       "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
 
+ StrCmp $LANGUAGE ${LANG_GERMAN} 0 +7
+    # German
+    CreateShortCut \
+      "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win HOWTO SMIME.lnk" \
+      "$INSTDIR\share\gpg4win\HOWTO-SMIME.de.txt" \
+      "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
+    Goto leave
+    # English
+    CreateShortCut \
+      "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win HOWTO SMIME.lnk" \
+      "$INSTDIR\share\gpg4win\HOWTO-SMIME.en.txt" \
+      "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
+    leave:
+  
 # No more uninstall link because Windows has its own feature to call
 #  the uninstaller.
 #    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2010-11-02 08:54:28 UTC (rev 1578)
+++ trunk/src/installer.nsi	2010-11-02 08:57:02 UTC (rev 1579)
@@ -166,8 +166,18 @@
 
 !define MUI_PAGE_CUSTOMFUNCTION_PRE PrintCloseOtherApps
 !insertmacro MUI_PAGE_INSTFILES
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
 
-!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
+# SMIME configuration page
+!define MUI_PAGE_HEADER_TEXT "$(T_SMIMEHeaderText)"
+!define MUI_PAGE_HEADER_SUBTEXT "$(T_SMIMEHeaderSubtext)"
+!define MUI_LICENSEPAGE_TEXT_TOP "$(T_SMIMETextTop)"
+!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(T_SMIMETextBottom)"
+!define MUI_LICENSEPAGE_CHECKBOX 
+!define MUI_LICENSEPAGE_CHECKBOX_TEXT "$(T_SMIMECheckboxText)"
+!insertmacro MUI_PAGE_LICENSE $(T_HowtoSmimeFile) 
+
+# Finish page
 !define MUI_FINISHPAGE_SHOWREADME "share\gpg4win\README.$(T_LangCode).txt"
 !define MUI_FINISHPAGE_SHOWREADME_TEXT "$(T_ShowReadme)"
 #!define MUI_FINISHPAGE_RUN
@@ -498,7 +508,33 @@
        $\r$\n\
       Do you want to continue installing Gpg4win?"
 
+#---------------------------------------------------
+# Strings pertaining to the SMIME configuration page
+#---------------------------------------------------
+LangString T_SMIMEHeaderText ${LANG_ENGLISH} \
+	"Define trustable root certificates"
+LangString T_SMIMEHeaderSubtext ${LANG_ENGLISH} \
+	"S/MIME configuration"
+LangString T_SMIMETextTop ${LANG_ENGLISH} \
+	"Gpg4win needs a list of root certificates which you trust."
+LangString T_SMIMETextBottom ${LANG_ENGLISH} \
+	"Therewith you can use S/MIME, the configuration is stringently \
+        required. Skip this configuration only if you don't want to use \
+        S/MIME."
+LangString T_SMIMECheckboxText ${LANG_ENGLISH} \
+	"Root certificate defined or skip configuration"
 
+LicenseLangString T_HowtoSmimeFile ${LANG_GERMAN} \
+	"${TOP_SRCDIR}/doc/HOWTO-SMIME.de.txt"
+LicenseLangString T_HowtoSmimeFile ${LANG_ENGLISH} \
+	"${TOP_SRCDIR}/doc/HOWTO-SMIME.en.txt"
+LicenseLangString T_HowtoSmimeFile ${LANG_FRENCH} \
+	"${TOP_SRCDIR}/doc/HOWTO-SMIME.en.txt"
+LicenseLangString T_HowtoSmimeFile ${LANG_SPANISH} \
+	"${TOP_SRCDIR}/doc/HOWTO-SMIME.en.txt"
+LicenseLangString T_HowtoSmimeFile ${LANG_PORTUGUESE} \
+	"${TOP_SRCDIR}/doc/HOWTO-SMIME.en.txt"
+
 #---------------------------------------------
 # From the old installation checking functions
 #---------------------------------------------

Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi	2010-11-02 08:54:28 UTC (rev 1578)
+++ trunk/src/uninst-gpg4win.nsi	2010-11-02 08:57:02 UTC (rev 1579)
@@ -44,6 +44,9 @@
   Delete "$INSTDIR\share\gpg4win\README.ru.txt"
   Delete "$INSTDIR\share\gpg4win\README.pt.txt"
 
+  Delete "$INSTDIR\share\gpg4win\HOWTO-SMIME.en.txt"
+  Delete "$INSTDIR\share\gpg4win\HOWTO-SMIME.de.txt"
+
   Delete "$INSTDIR\share\gpg4win\versioninfo.txt"
 
   Delete "$INSTDIR\VERSION"