# HG changeset patch # User William Roberts # Date 1267206191 0 # Node ID 41c831b220fc56800f045b0b9e5daa6fbe7e0462 # Parent 0fdb7f6b0309d370e3670b121891d714d533664f# Parent a4d95d2c2540f3c492ea666eceef6002df73586a Remerge changes for Symbian Foundation splash screen diff -r 0fdb7f6b0309 -r 41c831b220fc startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Fri Feb 19 22:58:54 2010 +0200 +++ b/startupservices/SplashScreen/group/bld.inf Fri Feb 26 17:43:11 2010 +0000 @@ -18,19 +18,32 @@ #include +#define USE_SF_SPLASH_SVG //comment this to use standard S60 splash icon PRJ_PLATFORMS DEFAULT PRJ_EXPORTS ../rom/splashscreen.iby CORE_MW_LAYER_IBY_EXPORT_PATH(splashscreen.iby) ../rom/splashscreen_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(splashscreen_variant.iby) +#ifdef USE_SF_SPLASH_SVG +// Export to SF-specific subdirectory +../sfimage/sfsplash.svg /epoc32/s60/icons/sf_startup_screen.svg +#endif PRJ_MMPFILES +#ifdef USE_SF_SPLASH_SVG +sf_splashscreen.mmp +#else splashscreen.mmp +#endif PRJ_EXTENSIONS START EXTENSION s60/mifconv OPTION TARGETFILE splashscreen.mif OPTION HEADERFILE splashscreen.mbg +#ifdef USE_SF_SPLASH_SVG + OPTION SOURCES -c8 sf_startup_screen +#else OPTION SOURCES -c8 qgn_startup_screen +#endif END diff -r 0fdb7f6b0309 -r 41c831b220fc startupservices/SplashScreen/group/sf_splashscreen.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/SplashScreen/group/sf_splashscreen.mmp Fri Feb 26 17:43:11 2010 +0000 @@ -0,0 +1,20 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This is project specification file for the SplashScreen which +* displays splash screen upon booting the device. +* +*/ + +macro USE_SF_SPLASH_ENUM +#include "splashscreen.mmp" diff -r 0fdb7f6b0309 -r 41c831b220fc startupservices/SplashScreen/sfimage/sfsplash.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/SplashScreen/sfimage/sfsplash.svg Fri Feb 26 17:43:11 2010 +0000 @@ -0,0 +1,10 @@ + + +]> + + + + + + diff -r 0fdb7f6b0309 -r 41c831b220fc startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Fri Feb 19 22:58:54 2010 +0200 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Fri Feb 26 17:43:11 2010 +0000 @@ -361,7 +361,11 @@ if ( !err ) { TRACES("CMainWindow::ConstructL(): Image found"); +#ifdef USE_SF_SPLASH_ENUM + iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenSf_startup_screen ); +#else iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenQgn_startup_screen ); +#endif AknIconUtils::ExcludeFromCache(iBitmap); AknIconUtils::SetSize( iBitmap, iRect.Size(), EAspectRatioPreservedAndUnusedSpaceRemoved ); }