# HG changeset patch # User William Roberts # Date 1272029837 -3600 # Node ID c82a39b81a38398e9726dfa99adb4941b8f37bc3 # Parent 5964140ed25a642fe40e768e371451c5e01856ed# Parent cf376912743d1fc0a1d2fc414951aeda236640c3 Rework addition of Symbian splash screen to reduce the source impact (uses SVG from Bug 2414) Notes: by using the OPTION SOURCEDIR parameter in the mifconv extension instructions, I can arrange to use the same source file name in sfimage, without having to export over the original Nokia file. This means that the name inside splashscreen.mbg is the same, which removes the need for the conditional compilation in SplashScreen.cpp, and gets rid of sf_splashscreen.mmp. diff -r cf376912743d -r c82a39b81a38 coreapplicationuis/SysAp/Inc/SysApAppUi.h --- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri Apr 02 17:08:57 2010 +0100 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri Apr 23 14:37:17 2010 +0100 @@ -1681,6 +1681,9 @@ //Offset of profile-related menu items in power key menu TInt iProfileItemsOffset; + //Flag to record if the TD network is enalbed. + TBool iTDEnable; + }; #endif // SYSAPAPPUI_H diff -r cf376912743d -r c82a39b81a38 coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Apr 02 17:08:57 2010 +0100 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Apr 23 14:37:17 2010 +0100 @@ -2020,9 +2020,17 @@ case EPSGprsUnattached: default: + if ( iTDEnable ) + { + signalGprsIndicatorState = EAknSignalEdgeIndicatorAvailable; + signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable; + } + else + { signalGprsIndicatorState = EAknSignalEdgeIndicatorOff; signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff; - iGprsSuspendedNoteShown = EFalse; + } + iGprsSuspendedNoteShown = EFalse; iGprsActivated = EFalse; iGprsSuspended = EFalse; iCallActivated = EFalse; @@ -2077,8 +2085,17 @@ case EPSGprsUnattached: default: + if ( iTDEnable ) + { + signalGprsIndicatorState = EAknSignalGprsIndicatorAvailable; + signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable; + } + else + { signalGprsIndicatorState = EAknSignalGprsIndicatorOff; signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff; + } + iGprsSuspendedNoteShown = EFalse; iGprsActivated = EFalse; iGprsSuspended = EFalse; diff -r cf376912743d -r c82a39b81a38 coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul --- a/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul Fri Apr 02 17:08:57 2010 +0100 +++ b/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul Fri Apr 23 14:37:17 2010 +0100 @@ -11,10 +11,6 @@ None - - - Off - diff -r cf376912743d -r c82a39b81a38 startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Fri Apr 02 17:08:57 2010 +0100 +++ b/startupservices/SplashScreen/group/bld.inf Fri Apr 23 14:37:17 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" @@ -25,25 +25,17 @@ 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 + // 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 -#endif END diff -r cf376912743d -r c82a39b81a38 startupservices/SplashScreen/group/sf_splashscreen.mmp --- a/startupservices/SplashScreen/group/sf_splashscreen.mmp Fri Apr 02 17:08:57 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* -* 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 cf376912743d -r c82a39b81a38 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 Fri Apr 23 14:37:17 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + diff -r cf376912743d -r c82a39b81a38 startupservices/SplashScreen/sfimage/sfsplash.svg --- a/startupservices/SplashScreen/sfimage/sfsplash.svg Fri Apr 02 17:08:57 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - -]> - - diff -r cf376912743d -r c82a39b81a38 startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Fri Apr 02 17:08:57 2010 +0100 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Fri Apr 23 14:37:17 2010 +0100 @@ -361,11 +361,7 @@ 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 ); } diff -r cf376912743d -r c82a39b81a38 systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss --- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Fri Apr 02 17:08:57 2010 +0100 +++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Fri Apr 23 14:37:17 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -788,7 +788,7 @@ { number = EAknSettingPageNoOrdinalDisplayed; label = qtn_acc_sett_def_prof; - softkey_resource = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT; + softkey_resource = R_AVKON_SOFTKEYS_CANCEL; type = EAknSetListBox; editor_resource_id = r_setting_listbox; }