# HG changeset patch # User andy simpson # Date 1278946731 -3600 # Node ID 49762640db60205b40f034b08a793f375496cd82 # Parent 312d2b433792705b38dc1566d1b34f923bf55472# Parent 2904da99c26dce72dabc043ab99b274ca1685e6d remerge Symbian Splash Screen and shutdown screen support (bug 2414 Bug 2524) also fix for Bug 2850 diff -r 312d2b433792 -r 49762640db60 coreapplicationuis/SysAp/Group/bld.inf --- a/coreapplicationuis/SysAp/Group/bld.inf Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Group/bld.inf Mon Jul 12 15:58:51 2010 +0100 @@ -21,11 +21,17 @@ PRJ_PLATFORMS DEFAULT +#define USE_SF_SPLASH_SVG //comment this to use standard S60 splash icon + PRJ_EXTENSIONS START EXTENSION s60/mifconv OPTION TARGETFILE sysap.mif OPTION HEADERFILE sysap.mbg - OPTION SOURCES -c8 qgn_startup_screen +#ifdef USE_SF_SPLASH_SVG + // use the local file (also called qgn_startup_screen to keep the mbg file the same) + OPTION SOURCEDIR ../../../startupservices/SplashScreen/sfimage +#endif + OPTION SOURCES -c8 qgn_startup_screen END diff -r 312d2b433792 -r 49762640db60 startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Mon Jun 21 15:51:07 2010 +0300 +++ b/startupservices/SplashScreen/group/bld.inf Mon Jul 12 15:58:51 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -18,6 +18,7 @@ #include +#define USE_SF_SPLASH_SVG //comment this to use standard S60 splash icon PRJ_PLATFORMS DEFAULT @@ -32,5 +33,9 @@ START EXTENSION s60/mifconv OPTION TARGETFILE splashscreen.mif OPTION HEADERFILE splashscreen.mbg +#ifdef USE_SF_SPLASH_SVG + // use the local file (also called qgn_startup_screen to keep the mbg file the same) + OPTION SOURCEDIR ../sfimage +#endif OPTION SOURCES -c8 qgn_startup_screen END diff -r 312d2b433792 -r 49762640db60 startupservices/SplashScreen/sfimage/qgn_startup_screen.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/SplashScreen/sfimage/qgn_startup_screen.svg Mon Jul 12 15:58:51 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + diff -r 312d2b433792 -r 49762640db60 startupservices/SplashScreen/src/SplashScreen.cpp diff -r 312d2b433792 -r 49762640db60 tzpcside/tzcompiler/group/BLD.INF --- a/tzpcside/tzcompiler/group/BLD.INF Mon Jun 21 15:51:07 2010 +0300 +++ b/tzpcside/tzcompiler/group/BLD.INF Mon Jul 12 15:58:51 2010 +0100 @@ -30,7 +30,7 @@ ../Release/TzIdentities.ini /epoc32/tools/tz/tzidentities.ini // TzCompiler User Documentation -"../documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc" "/epoc32/tools/tz/sgl.gt0197.232 app-services tz 9.1 how-to create the tz database.doc" +//"../documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc" "/epoc32/tools/tz/sgl.gt0197.232 app-services tz 9.1 how-to create the tz database.doc" // Sample Olson's Tz Database Source Files ../Release/Data/africa /epoc32/tools/tz/data/africa