[Gpg4win-commits] r234 - in trunk: . doc doc/manual-de packages src

Tue Mar 28 14:54:03 CEST 2006

Author: werner
Date: 2006-03-28 14:54:02 +0200 (Tue, 28 Mar 2006)
New Revision: 234

Added:
   trunk/doc/manual-de/sc-inst-options.png
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/doc/ChangeLog
   trunk/doc/manual-de/Makefile.am
   trunk/doc/manual-de/einsteiger.tex
   trunk/doc/manual-de/sc-inst-finished.png
   trunk/doc/manual-de/sc-inst-finished2.png
   trunk/doc/manual-de/sc-inst-welcome.png
   trunk/packages/packages.current
   trunk/src/inst-sections.nsi
   trunk/src/installer-options.ini
   trunk/src/installer.nsi
Log:
Preparing 1.0.0rc1


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/ChangeLog	2006-03-28 12:54:02 UTC (rev 234)
@@ -1,3 +1,10 @@
+2006-03-28  Werner Koch  <wk at g10code.com>
+
+	* src/installer.nsi (CustomPageOptions): Write Labels, so that
+	they are translatable.
+	* src/installer-options.ini: Add label field and removed static
+	texts.
+
 2006-03-27  Werner Koch  <wk at g10code.com>
 
 	* src/installer-options.ini: Don't create a desktop link by default.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/NEWS	2006-03-28 12:54:02 UTC (rev 234)
@@ -1,4 +1,4 @@
-Noteworthy changes in version 
+Noteworthy changes in version 1.0.0
 ------------------------------------------------
 
  * Shows a warning if an existing installation of GnuPP, GnuPT or

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/configure.ac	2006-03-28 12:54:02 UTC (rev 234)
@@ -24,8 +24,8 @@
 
 # Remember to change the version number immediately *after* a release.
 # Uncomment the my_iscvs macro for non-released code.
-m4_define(my_version, [0.9.9])
-m4_define(my_iscvs, yes)
+m4_define(my_version, [1.0.0rc1])
+#m4_define(my_iscvs, yes)
 
 AC_INIT([gpg4win], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
                   [$Revision$],[Ra-z $:])]),

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/doc/ChangeLog	2006-03-28 12:54:02 UTC (rev 234)
@@ -1,3 +1,8 @@
+2006-03-28  Werner Koch  <wk at g10code.com>
+
+	* manual-de/Makefile.am (png_files): Add sc-inst-options.png
+	* manual-de/einsteiger.tex: Docuemtn the new otpiosn page.
+
 2006-03-27  Werner Koch  <wk at g10code.com>
 
 	* logo/gpg4win-logo-150x57.bmp: New.

Modified: trunk/doc/manual-de/Makefile.am
===================================================================
--- trunk/doc/manual-de/Makefile.am	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/doc/manual-de/Makefile.am	2006-03-28 12:54:02 UTC (rev 234)
@@ -21,6 +21,7 @@
 png_files := \
         sc-inst-welcome.png sc-inst-license.png \
         sc-inst-components.png sc-inst-directory.png \
+        sc-inst-options.png \
         sc-inst-startmenu.png sc-inst-ready.png \
         sc-inst-finished.png sc-inst-finished2.png \
 	sc-winpt-sign-passwd.png \

Modified: trunk/doc/manual-de/einsteiger.tex
===================================================================
--- trunk/doc/manual-de/einsteiger.tex	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/doc/manual-de/einsteiger.tex	2006-03-28 12:54:02 UTC (rev 234)
@@ -300,6 +300,20 @@
 Klicken Sie anschließend auf \Button{Weiter}.
 
 \clearpage
+
+Auf der folgenden Seite können Sie festlegen, welche Verknüpfungen
+installiert werden.  Voreingestellt ist lediglich eine Verknüpfung mit
+dem Startmenü.  Bitte beachten Sie, daß sie diese Verknüpfungen auch
+jederzeit später mit den Bordmitteln von Windows verändern können.
+
+% screenshot: Auswahl des Links
+\begin{center}
+\IncludeImage{sc-inst-options}
+\end{center}
+
+Klicken Sie anschließend auf \Button{Weiter}.
+
+\clearpage
 %% Original page 12
 
 Das Programm legt nun ein Icon in das Windows Startup-Menü, damit Sie

Modified: trunk/doc/manual-de/sc-inst-finished.png
===================================================================
(Binary files differ)

Modified: trunk/doc/manual-de/sc-inst-finished2.png
===================================================================
(Binary files differ)

Added: trunk/doc/manual-de/sc-inst-options.png
===================================================================
(Binary files differ)


Property changes on: trunk/doc/manual-de/sc-inst-options.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/doc/manual-de/sc-inst-welcome.png
===================================================================
(Binary files differ)

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/packages/packages.current	2006-03-28 12:54:02 UTC (rev 234)
@@ -128,10 +128,9 @@
 # WinPT
 
 server http://wald.intevation.org/frs/download.php
-file  137/winpt-0.11.8.tar.bz2
-chk   b87a6d0d4f53fa305d27632f4ad5d6a5a5219e15
+file  156/winpt-0.11.9.tar.bz2
+chk   2c7ac9a0344d6b7059761780854e69f7363f21e4
 
-
 # GPGee
 # Note that the -bin package has been repackaged from the
 # -noinstaller package using these commands:
@@ -153,10 +152,9 @@
 # GPGol
 server ftp://ftp.g10code.com/g10code/gpgol
 
-file gpgol-0.9.6.tar.bz2
-chk  a637d8a024d3106eba320af47066574817624ab3  
+file gpgol-0.9.8.tar.bz2
+chk 03db1c683354b5e83ab5cdefd2aac2c1abedd2bb
 
-
 # GnuPG stuff. 
 
 server ftp://ftp.gnupg.org/gcrypt

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/src/inst-sections.nsi	2006-03-28 12:54:02 UTC (rev 234)
@@ -463,7 +463,7 @@
 
   # Check if the start menu entries where requested.
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
-	"Field 1" "State"
+	"Field 2" "State"
   IntCmp $R0 0 no_start_menu
 
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -560,7 +560,7 @@
 
   # Check if the desktop entries where requested.
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
-	"Field 2" "State"
+	"Field 3" "State"
   IntCmp $R0 0 no_desktop
 
 !ifdef HAVE_PKG_WINPT
@@ -637,7 +637,7 @@
 	
   # Check if the quick launch bar entries where requested.
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
-	"Field 3" "State"
+	"Field 4" "State"
   IntCmp $R0 0 no_quick_launch
   StrCmp $QUICKLAUNCH $TEMP no_quick_launch
 

Modified: trunk/src/installer-options.ini
===================================================================
--- trunk/src/installer-options.ini	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/src/installer-options.ini	2006-03-28 12:54:02 UTC (rev 234)
@@ -1,33 +1,40 @@
 [Settings]
-NumFields=3
+NumFields=4
 
 ; The number of the fields here is known in installer.nsi.
+; The tags must be "[Field N]" with N=1..NumFields
 
 [Field 1]
-Type=Checkbox
+Type=Label
 Left=0
 Right=-1
 Top=0
-Bottom=10
-Text=Start Menu
-State=1
+Bottom=20
 
 [Field 2]
 Type=Checkbox
 Left=0
 Right=-1
-Top=20
-Bottom=30
-Text=Desktop
-State=0
+Top=30
+Bottom=40
+;Text=Start Menu
+State=1
 
 [Field 3]
 Type=Checkbox
 Left=0
 Right=-1
-Top=40
-Bottom=50
-Text=Quick Launch Bar
+Top=50
+Bottom=60
+;Text=Desktop
 State=0
 
+[Field 4]
+Type=Checkbox
+Left=0
+Right=-1
+Top=70
+Bottom=80
+;Text=Quick Launch Bar
+State=0
 

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2006-03-27 11:10:38 UTC (rev 233)
+++ trunk/src/installer.nsi	2006-03-28 12:54:02 UTC (rev 234)
@@ -245,8 +245,19 @@
 # Control function for the Custom page to select special
 # install options.
 #
-Function CustomPageOptions  
+Function CustomPageOptions
   !insertmacro MUI_HEADER_TEXT "$(T_InstallOptions)" "$(T_InstallOptLinks)"
+  # Note, that the default selection is done in the ini file
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "installer-options.ini" \
+	"Field 1" "Text"  "$(T_InstOptLabelA)"
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "installer-options.ini" \
+	"Field 2" "Text"  "$(T_InstOptFieldA)"
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "installer-options.ini" \
+	"Field 3" "Text"  "$(T_InstOptFieldB)"
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "installer-options.ini" \
+	"Field 4" "Text"  "$(T_InstOptFieldC)"
+
+
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "installer-options.ini"
 FunctionEnd
 
@@ -360,7 +371,7 @@
 
 Function CheckIfStartMenuWanted
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
-	"Field 1" "State"
+	"Field 2" "State"
   IntCmp $R0 1 +2
     Abort
 FunctionEnd
@@ -401,7 +412,26 @@
 LangString T_InstallOptLinks ${LANG_ENGLISH} "Start links"
 LangString T_InstallOptLinks ${LANG_GERMAN}  "Startlinks"
 
+LangString T_InstOptLabelA  ${LANG_ENGLISH} \
+     "Please select where Gpg4win shall install links:"
+LangString T_InstOptLabelA  ${LANG_GERMAN} \
+     "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
 
+LangString T_InstOptFieldA  ${LANG_ENGLISH} \
+     "Start Menu"
+LangString T_InstOptFieldA  ${LANG_GERMAN} \
+     "Startmenü"
+
+LangString T_InstOptFieldB  ${LANG_ENGLISH} \
+     "Desktop"
+LangString T_InstOptFieldB  ${LANG_GERMAN} \
+     "Arbeitsfläche"
+
+LangString T_InstOptFieldC  ${LANG_ENGLISH} \
+     "Quick Launch Bar"
+LangString T_InstOptFieldC  ${LANG_GERMAN} \
+     "Schnellstartleiste"
+
 #------------------------------------------------
 # String pertaining to the existing version check
 #------------------------------------------------

