[Gpg4win-commits] r130 - in trunk: . doc doc/logo src

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Jan 20 19:42:52 CET 2006 

Author: werner
Date: 2006-01-20 19:42:52 +0100 (Fri, 20 Jan 2006)
New Revision: 130

Added:
   trunk/doc/logo/Makefile.am
   trunk/doc/logo/gpg4win-logo-400px.bmp
   trunk/doc/logo/gpg4win-logo-icon.ico
Removed:
   trunk/src/gpg4win-splash.bmp
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/ChangeLog
   trunk/doc/Makefile.am
   trunk/src/Makefile.am
   trunk/src/inst-sections.nsi
   trunk/src/installer.nsi
Log:
use new log as splash screen.
Try to use an Incon for the installer - does not work, though.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/ChangeLog	2006-01-20 18:42:52 UTC (rev 130)
@@ -1,3 +1,11 @@
+2006-01-20  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Create doc/log/Makefile.
+	* src/inst-sections.nsi: Replaced splash image by new logo.
+	* src/installer.nsi: Reserve that new file.
+	(Icon, UninstallIcon): New.
+	* src/gpg4win-splash.bmp: Removed.
+
 2006-01-19  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
 
 	* README.SVN: Extend sample configure call. Without the --host

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/configure.ac	2006-01-20 18:42:52 UTC (rev 130)
@@ -155,6 +155,7 @@
 AC_CONFIG_FILES(Makefile packages/Makefile include/Makefile src/Makefile)
 AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
 AC_CONFIG_FILES(doc/Makefile)
+AC_CONFIG_FILES(doc/logo/Makefile)
 AC_CONFIG_FILES(doc/manual-de/Makefile doc/manual-de/version.tex)
 AC_CONFIG_FILES(doc/website/Makefile)
 AC_OUTPUT

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/doc/ChangeLog	2006-01-20 18:42:52 UTC (rev 130)
@@ -1,5 +1,12 @@
 2006-01-20  Werner Koch  <wk at g10code.com>
 
+	* Makefile.am (SUBDIRS): Add logo.
+
+	* logo/Makefile.am: New.
+
+	* logo/gpg4win-logo-icon.ico: new. Created from the favicon.
+	* logo/gpg4win-logo-400px.bmp: New.  Created from the PNG.
+
 	* manual-de/einsteiger.tex: Minor cleanups.  Do not include
 	version.tex anymore but hardcode the macro at the top of the file.
 

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/doc/Makefile.am	2006-01-20 18:42:52 UTC (rev 130)
@@ -19,4 +19,4 @@
 
 EXTRA_DIST = nsi-mode.el
 
-SUBDIRS = manual-de website
+SUBDIRS = logo manual-de website

Added: trunk/doc/logo/Makefile.am
===================================================================
--- trunk/doc/logo/Makefile.am	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/doc/logo/Makefile.am	2006-01-20 18:42:52 UTC (rev 130)
@@ -0,0 +1,26 @@
+# Makefile.am - GnuPG 4 Windows Makefile for Logos.
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+EXTRA_DIST = gpg4win-logo.eps         \
+             gpg4win-logo-400px.png   \
+             gpg4win-logo-400px.bmp   \
+             gpg4win-logo-favicon.bmp \
+             gpg4win-logo-icon.ico
+
+

Added: trunk/doc/logo/gpg4win-logo-400px.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-logo-400px.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-logo-icon.ico
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-logo-icon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/src/Makefile.am	2006-01-20 18:42:52 UTC (rev 130)
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
         inst-gpg4win.nsi uninst-gpg4win.nsi \
-	libiconv.def libintl.def  gpg4win-splash.bmp gpg4win-splash.wav \
+	libiconv.def libintl.def  gpg4win-splash.wav \
 	exdll.h g4wihelp.c g4wihelp.nsi config.site loreley.mid
 
 # Need to clean the dll because we bypassed automake.

Deleted: trunk/src/gpg4win-splash.bmp
===================================================================
(Binary files differ)

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/src/inst-sections.nsi	2006-01-20 18:42:52 UTC (rev 130)
@@ -363,10 +363,10 @@
   Call G4wRunOnce
 
   SetOutPath $TEMP
-  File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
+  File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/doc/logo/gpg4win-logo-400px.bmp"
   File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
   g4wihelp::playsound $TEMP\gpgspltmp.wav
-  g4wihelp::showsplash 2000 $TEMP\gpgspltmp.bmp
+  g4wihelp::showsplash 2500 $TEMP\gpgspltmp.bmp
 
   Delete $TEMP\gpgspltmp.bmp
   ; Note that we delete gpgspltmp.wav in .onInst{Failed,Success}

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2006-01-20 17:20:00 UTC (rev 129)
+++ trunk/src/installer.nsi	2006-01-20 18:42:52 UTC (rev 130)
@@ -41,6 +41,8 @@
 # Set the output filename.
 OutFile "${PACKAGE}-${VERSION}.exe"
 
+Icon "${TOP_SRCDIR}/doc/logo/gpg4win-logo-icon.ico"
+UninstallIcon "${TOP_SRCDIR}/doc/logo/gpg4win-logo-icon.ico"
 
 # Set the installation directory.
 !ifndef INSTALL_DIR
@@ -153,7 +155,7 @@
 #!insertmacro MUI_RESERVEFILE_LANGDLL
 #!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 ReserveFile "${BUILD_DIR}\g4wihelp.dll"
-ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.bmp"
+ReserveFile "${TOP_SRCDIR}\doc\logo\gpg4win-logo-400px.bmp"
 ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.wav"
 ReserveFile "${TOP_SRCDIR}\COPYING"

More information about the Gpg4win-commits mailing list