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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-04-22 16:38:57 +0200 (Sat, 22 Apr 2006)
New Revision: 277

Modified:
   trunk/ChangeLog
   trunk/src/inst-sections.nsi
   trunk/src/installer-options.ini.in
Log:
2006-04-22  Marcus Brinkmann  <marcus at g10code.de>

	* src/installer.nsi (T_InstOptLabelB): New string.
	(CustomPageOptions): Install new string.
	* src/installer-options.ini.in (Field 5): Add new field.
	(NumFields): Set to 5.
	* src/inst-sections.nsi: Do not install manuals and other
	documents in the quick launch bar.  Do not install the README on
	the desktop.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-04-22 02:10:27 UTC (rev 276)
+++ trunk/ChangeLog	2006-04-22 14:38:57 UTC (rev 277)
@@ -1,5 +1,13 @@
 2006-04-22  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/installer.nsi (T_InstOptLabelB): New string.
+	(CustomPageOptions): Install new string.
+	* src/installer-options.ini.in (Field 5): Add new field.
+	(NumFields): Set to 5.
+	* src/inst-sections.nsi: Do not install manuals and other
+	documents in the quick launch bar.  Do not install the README on
+	the desktop.
+
 	* src/Makefile.am (gpg4win_spkgs): Move man_novice_de and
 	man_advanced_de to ...
 	(gpg4win_ipkgs): ... here.

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-04-22 02:10:27 UTC (rev 276)
+++ trunk/src/inst-sections.nsi	2006-04-22 14:38:57 UTC (rev 277)
@@ -633,10 +633,6 @@
                    "$INSTDIR\share\gnupg\faq.html" \
                    "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
 
-    CreateShortCut "$DESKTOP\Gpg4Win README.lnk" \
-                   "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
-                   "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
-
 no_desktop:
 
 	
@@ -676,28 +672,6 @@
   no_sylpheed_quicklaunch:
 !endif
 
-!ifdef HAVE_PKG_MAN_NOVICE_DE
-    SectionGetFlags ${SEC_man_novice_de} $R0 
-    IntOp $R0 $R0 & ${SF_SELECTED} 
-    IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_quicklaunch
-    CreateShortCut \
-        "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk" \
-	"$INSTDIR\share\gpg4win\einsteiger.pdf" \
-        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
-  no_man_novice_de_quicklaunch:
-!endif
-
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
-    SectionGetFlags ${SEC_man_advanced_de} $R0 
-    IntOp $R0 $R0 & ${SF_SELECTED} 
-    IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_quicklaunch
-    CreateShortCut \
-        "$QUICKLAUNCH\$(DESC_Name_man_advanced_de).lnk" \
-	"$INSTDIR\share\gpg4win\durchblicker.pdf" \
-        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
-  no_man_advanced_de_quicklaunch:
-!endif
-
 !ifdef HAVE_PKG_GPGEE
     SectionGetFlags ${SEC_gpgee} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 
@@ -707,14 +681,6 @@
   no_gpgee_quicklaunch:
 !endif
 
-    CreateShortCut "$QUICKLAUNCH\GnuPG FAQ.lnk" \
-                   "$INSTDIR\share\gnupg\faq.html" \
-                   "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
-
-    CreateShortCut "$QUICKLAUNCH\Gpg4Win README.lnk" \
-                   "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
-                   "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
-
 no_quick_launch:
 
 

Modified: trunk/src/installer-options.ini.in
===================================================================
--- trunk/src/installer-options.ini.in	2006-04-22 02:10:27 UTC (rev 276)
+++ trunk/src/installer-options.ini.in	2006-04-22 14:38:57 UTC (rev 277)
@@ -1,5 +1,5 @@
 [Settings]
-NumFields=4
+NumFields=5
 
 ; The number of the fields here is known in installer.nsi.
 ; The tags must be "[Field N]" with N=1..NumFields
@@ -38,3 +38,10 @@
 ;Text=Quick Launch Bar
 State=0
 
+[Field 5]
+Type=Label
+Left=0
+Right=-1
+Top=90
+Bottom=130
+