# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277125157 -10800 # Node ID 3b67655da2cc4eaee1f0abcdb0a60b40394d64bb # Parent 854ebc17f64bdeb9ed1aeec1ba5d51821761f0e7 Revision: 201023 Kit: 2010125 diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h --- a/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Mon Jun 21 15:59:17 2010 +0300 @@ -32,6 +32,7 @@ class CGSPluginInterface; class CAknSingleLargeStyleListBox; class MGSWatchDog; +class CGsContainerExt; /** * Container class for the GS Main view. @@ -233,8 +234,7 @@ CGSParentPlugin* iParentPlugin; // Pointer to GSWatchDog owned by GS Application document. Not owned. - MGSWatchDog* iGSWatchDog; - + CGsContainerExt* iExt; }; diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.cfg --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.cfg Wed Jun 09 10:00:07 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,426 +0,0 @@ -[Test] -title NewEngineL -create ProEngWrapAPI foobar -foobar NewEngineL pa ra me ters -delete foobar -[Endtest] - -[Test] -title NewEngineLC -create ProEngWrapAPI foobar -foobar NewEngineLC pa ra me ters -delete foobar -[Endtest] - -[Test] -title NewEngineLCWithRFsL -create ProEngWrapAPI foobar -foobar NewEngineLCWithRFsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title NewNotifyHandlerL -create ProEngWrapAPI foobar -foobar NewNotifyHandlerL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ReqProfActNotificationsL -create ProEngWrapAPI foobar -foobar ReqProfActNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CanProfActNotificationsL -create ProEngWrapAPI foobar -foobar CanProfActNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ReqActProfNotificationsL -create ProEngWrapAPI foobar -foobar ReqActProfNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CanActProfNotificationsL -create ProEngWrapAPI foobar -foobar CanActProfNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ReqProfNotificationsL -create ProEngWrapAPI foobar -foobar ReqProfNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CanProfNotificationsL -create ProEngWrapAPI foobar -foobar CanProfNotificationsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ReqProfNameArrayNotL -create ProEngWrapAPI foobar -foobar ReqProfNameArrayNotL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CanProfNameArrayNotL -create ProEngWrapAPI foobar -foobar CanProfNameArrayNotL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CancelAllL -create ProEngWrapAPI foobar -foobar CancelAllL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ActiveProfileLC -create ProEngWrapAPI foobar -foobar ActiveProfileLC pa ra me ters -delete foobar -[Endtest] - -[Test] -title ActiveProfileL -create ProEngWrapAPI foobar -foobar ActiveProfileL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ActiveProfileIdL -create ProEngWrapAPI foobar -foobar ActiveProfileIdL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileNameArrayLC -create ProEngWrapAPI foobar -foobar ProfileNameArrayLC pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetActiveProfileL -create ProEngWrapAPI foobar -foobar SetActiveProfileL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileLC -create ProEngWrapAPI foobar -foobar ProfileLC pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileL -create ProEngWrapAPI foobar -foobar ProfileL pa ra me ters -delete foobar -[Endtest] - -[Test] -title MdcaCountL -create ProEngWrapAPI foobar -foobar MdcaCountL pa ra me ters -delete foobar -[Endtest] - -[Test] -title MdcaPointL -create ProEngWrapAPI foobar -foobar MdcaPointL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileIdL -create ProEngWrapAPI foobar -foobar ProfileIdL pa ra me ters -delete foobar -[Endtest] - -[Test] -title FindByIdL -create ProEngWrapAPI foobar -foobar FindByIdL pa ra me ters -delete foobar -[Endtest] - -[Test] -title FindByNameL -create ProEngWrapAPI foobar -foobar FindByNameL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileNameL -create ProEngWrapAPI foobar -foobar ProfileNameL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ProfileTonesL -create ProEngWrapAPI foobar -foobar ProfileTonesL pa ra me ters -delete foobar -[Endtest] - -[Test] -title ToneSettingsL -create ProEngWrapAPI foobar -foobar ToneSettingsL pa ra me ters -delete foobar -[Endtest] - -[Test] -title AlertForL -create ProEngWrapAPI foobar -foobar AlertForL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetAlertForL -create ProEngWrapAPI foobar -foobar SetAlertForL pa ra me ters -delete foobar -[Endtest] - -[Test] -title IsSilentL -create ProEngWrapAPI foobar -foobar IsSilentL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CommitChangeL -create ProEngWrapAPI foobar -foobar CommitChangeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title NameL -create ProEngWrapAPI foobar -foobar NameL pa ra me ters -delete foobar -[Endtest] - -[Test] -title IdL -create ProEngWrapAPI foobar -foobar IdL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetNameL -create ProEngWrapAPI foobar -foobar SetNameL pa ra me ters -delete foobar -[Endtest] - -[Test] -title RingingTone1L -create ProEngWrapAPI foobar -foobar RingingTone1L pa ra me ters -delete foobar -[Endtest] - -[Test] -title RingingTone2L -create ProEngWrapAPI foobar -foobar RingingTone2L pa ra me ters -delete foobar -[Endtest] - -[Test] -title MessageAlertToneL -create ProEngWrapAPI foobar -foobar MessageAlertToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title EmailAlertToneL -create ProEngWrapAPI foobar -foobar EmailAlertToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title VideoCallRingingToneL -create ProEngWrapAPI foobar -foobar VideoCallRingingToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetRingingTone1L -create ProEngWrapAPI foobar -foobar SetRingingTone1L pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetRingingTone2L -create ProEngWrapAPI foobar -foobar SetRingingTone2L pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetMessageAlertToneL -create ProEngWrapAPI foobar -foobar SetMessageAlertToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetEmailAlertToneL -create ProEngWrapAPI foobar -foobar SetEmailAlertToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetVideoCallRingingToneL -create ProEngWrapAPI foobar -foobar SetVideoCallRingingToneL pa ra me ters -delete foobar -[Endtest] - -[Test] -title RingingTypeL -create ProEngWrapAPI foobar -foobar RingingTypeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title KeypadVolumeL -create ProEngWrapAPI foobar -foobar KeypadVolumeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title RingingVolumeL -create ProEngWrapAPI foobar -foobar RingingVolumeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title VibratingAlertL -create ProEngWrapAPI foobar -foobar VibratingAlertL pa ra me ters -delete foobar -[Endtest] - -[Test] -title WarningAndGameTonesL -create ProEngWrapAPI foobar -foobar WarningAndGameTonesL pa ra me ters -delete foobar -[Endtest] - -[Test] -title TextToSpeechL -create ProEngWrapAPI foobar -foobar TextToSpeechL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetRingingTypeL -create ProEngWrapAPI foobar -foobar SetRingingTypeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetKeypadVolumeL -create ProEngWrapAPI foobar -foobar SetKeypadVolumeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetRingingVolumeL -create ProEngWrapAPI foobar -foobar SetRingingVolumeL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetVibratingAlertL -create ProEngWrapAPI foobar -foobar SetVibratingAlertL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetWarningAndGameTonesL -create ProEngWrapAPI foobar -foobar SetWarningAndGameTonesL pa ra me ters -delete foobar -[Endtest] - -[Test] -title SetTextToSpeechL -create ProEngWrapAPI foobar -foobar SetTextToSpeechL pa ra me ters -delete foobar -[Endtest] - -[Test] -title NewAlertToneSeekerL -create ProEngWrapAPI foobar -foobar NewAlertToneSeekerL pa ra me ters -delete foobar -[Endtest] - -[Test] -title FetchAlertToneListL -create ProEngWrapAPI foobar -foobar FetchAlertToneListL pa ra me ters -delete foobar -[Endtest] - -[Test] -title CancelFetchL -create ProEngWrapAPI foobar -foobar CancelFetchL pa ra me ters -delete foobar -[Endtest] - -[Test] -title NewEngineLWithRFsL -create ProEngWrapAPI foobar -foobar NewEngineL pa ra me ters -delete foobar -[Endtest] diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp Mon Jun 21 15:59:17 2010 +0300 @@ -49,8 +49,10 @@ SYSTEMINCLUDE /epoc32/include/internal #endif // __S60_ +#endif // SBSV2 +APP_LAYER_SYSTEMINCLUDE + SOURCEPATH ../src -#endif // SBSV2 SOURCE ProEngWrapAPI.cpp SOURCE ProEngWrapAPIBlocks.cpp CSchedulerUtility.cpp diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/TestFramework.ini --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/TestFramework.ini Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/TestFramework.ini Mon Jun 21 15:59:17 2010 +0300 @@ -93,7 +93,7 @@ [New_Module] ModuleName= testscripter -TestCaseFile= c:\testframework\ProEngWrapAPI.cfg +TestCaseFile= c:\testframework\UI_ProEngWrapAPI.cfg [End_Module] diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/UI_ProEngWrapAPI.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/UI_ProEngWrapAPI.cfg Mon Jun 21 15:59:17 2010 +0300 @@ -0,0 +1,426 @@ +[Test] +title NewEngineL +create ProEngWrapAPI foobar +foobar NewEngineL pa ra me ters +delete foobar +[Endtest] + +[Test] +title NewEngineLC +create ProEngWrapAPI foobar +foobar NewEngineLC pa ra me ters +delete foobar +[Endtest] + +[Test] +title NewEngineLCWithRFsL +create ProEngWrapAPI foobar +foobar NewEngineLCWithRFsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title NewNotifyHandlerL +create ProEngWrapAPI foobar +foobar NewNotifyHandlerL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ReqProfActNotificationsL +create ProEngWrapAPI foobar +foobar ReqProfActNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CanProfActNotificationsL +create ProEngWrapAPI foobar +foobar CanProfActNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ReqActProfNotificationsL +create ProEngWrapAPI foobar +foobar ReqActProfNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CanActProfNotificationsL +create ProEngWrapAPI foobar +foobar CanActProfNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ReqProfNotificationsL +create ProEngWrapAPI foobar +foobar ReqProfNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CanProfNotificationsL +create ProEngWrapAPI foobar +foobar CanProfNotificationsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ReqProfNameArrayNotL +create ProEngWrapAPI foobar +foobar ReqProfNameArrayNotL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CanProfNameArrayNotL +create ProEngWrapAPI foobar +foobar CanProfNameArrayNotL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CancelAllL +create ProEngWrapAPI foobar +foobar CancelAllL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ActiveProfileLC +create ProEngWrapAPI foobar +foobar ActiveProfileLC pa ra me ters +delete foobar +[Endtest] + +[Test] +title ActiveProfileL +create ProEngWrapAPI foobar +foobar ActiveProfileL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ActiveProfileIdL +create ProEngWrapAPI foobar +foobar ActiveProfileIdL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileNameArrayLC +create ProEngWrapAPI foobar +foobar ProfileNameArrayLC pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetActiveProfileL +create ProEngWrapAPI foobar +foobar SetActiveProfileL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileLC +create ProEngWrapAPI foobar +foobar ProfileLC pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileL +create ProEngWrapAPI foobar +foobar ProfileL pa ra me ters +delete foobar +[Endtest] + +[Test] +title MdcaCountL +create ProEngWrapAPI foobar +foobar MdcaCountL pa ra me ters +delete foobar +[Endtest] + +[Test] +title MdcaPointL +create ProEngWrapAPI foobar +foobar MdcaPointL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileIdL +create ProEngWrapAPI foobar +foobar ProfileIdL pa ra me ters +delete foobar +[Endtest] + +[Test] +title FindByIdL +create ProEngWrapAPI foobar +foobar FindByIdL pa ra me ters +delete foobar +[Endtest] + +[Test] +title FindByNameL +create ProEngWrapAPI foobar +foobar FindByNameL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileNameL +create ProEngWrapAPI foobar +foobar ProfileNameL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ProfileTonesL +create ProEngWrapAPI foobar +foobar ProfileTonesL pa ra me ters +delete foobar +[Endtest] + +[Test] +title ToneSettingsL +create ProEngWrapAPI foobar +foobar ToneSettingsL pa ra me ters +delete foobar +[Endtest] + +[Test] +title AlertForL +create ProEngWrapAPI foobar +foobar AlertForL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetAlertForL +create ProEngWrapAPI foobar +foobar SetAlertForL pa ra me ters +delete foobar +[Endtest] + +[Test] +title IsSilentL +create ProEngWrapAPI foobar +foobar IsSilentL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CommitChangeL +create ProEngWrapAPI foobar +foobar CommitChangeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title NameL +create ProEngWrapAPI foobar +foobar NameL pa ra me ters +delete foobar +[Endtest] + +[Test] +title IdL +create ProEngWrapAPI foobar +foobar IdL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetNameL +create ProEngWrapAPI foobar +foobar SetNameL pa ra me ters +delete foobar +[Endtest] + +[Test] +title RingingTone1L +create ProEngWrapAPI foobar +foobar RingingTone1L pa ra me ters +delete foobar +[Endtest] + +[Test] +title RingingTone2L +create ProEngWrapAPI foobar +foobar RingingTone2L pa ra me ters +delete foobar +[Endtest] + +[Test] +title MessageAlertToneL +create ProEngWrapAPI foobar +foobar MessageAlertToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title EmailAlertToneL +create ProEngWrapAPI foobar +foobar EmailAlertToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title VideoCallRingingToneL +create ProEngWrapAPI foobar +foobar VideoCallRingingToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetRingingTone1L +create ProEngWrapAPI foobar +foobar SetRingingTone1L pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetRingingTone2L +create ProEngWrapAPI foobar +foobar SetRingingTone2L pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetMessageAlertToneL +create ProEngWrapAPI foobar +foobar SetMessageAlertToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetEmailAlertToneL +create ProEngWrapAPI foobar +foobar SetEmailAlertToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetVideoCallRingingToneL +create ProEngWrapAPI foobar +foobar SetVideoCallRingingToneL pa ra me ters +delete foobar +[Endtest] + +[Test] +title RingingTypeL +create ProEngWrapAPI foobar +foobar RingingTypeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title KeypadVolumeL +create ProEngWrapAPI foobar +foobar KeypadVolumeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title RingingVolumeL +create ProEngWrapAPI foobar +foobar RingingVolumeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title VibratingAlertL +create ProEngWrapAPI foobar +foobar VibratingAlertL pa ra me ters +delete foobar +[Endtest] + +[Test] +title WarningAndGameTonesL +create ProEngWrapAPI foobar +foobar WarningAndGameTonesL pa ra me ters +delete foobar +[Endtest] + +[Test] +title TextToSpeechL +create ProEngWrapAPI foobar +foobar TextToSpeechL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetRingingTypeL +create ProEngWrapAPI foobar +foobar SetRingingTypeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetKeypadVolumeL +create ProEngWrapAPI foobar +foobar SetKeypadVolumeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetRingingVolumeL +create ProEngWrapAPI foobar +foobar SetRingingVolumeL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetVibratingAlertL +create ProEngWrapAPI foobar +foobar SetVibratingAlertL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetWarningAndGameTonesL +create ProEngWrapAPI foobar +foobar SetWarningAndGameTonesL pa ra me ters +delete foobar +[Endtest] + +[Test] +title SetTextToSpeechL +create ProEngWrapAPI foobar +foobar SetTextToSpeechL pa ra me ters +delete foobar +[Endtest] + +[Test] +title NewAlertToneSeekerL +create ProEngWrapAPI foobar +foobar NewAlertToneSeekerL pa ra me ters +delete foobar +[Endtest] + +[Test] +title FetchAlertToneListL +create ProEngWrapAPI foobar +foobar FetchAlertToneListL pa ra me ters +delete foobar +[Endtest] + +[Test] +title CancelFetchL +create ProEngWrapAPI foobar +foobar CancelFetchL pa ra me ters +delete foobar +[Endtest] + +[Test] +title NewEngineLWithRFsL +create ProEngWrapAPI foobar +foobar NewEngineL pa ra me ters +delete foobar +[Endtest] diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/bld.inf --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/bld.inf Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/bld.inf Mon Jun 21 15:59:17 2010 +0300 @@ -43,7 +43,7 @@ */ proeng_z.bat /epoc32/winscw/c/proeng_z.bat proeng_c.bat /epoc32/winscw/c/proeng_c.bat -ProEngWrapAPI.cfg /Epoc32/winscw/c/testframework/ProEngWrapAPI.cfg +UI_ProEngWrapAPI.cfg /Epoc32/winscw/c/testframework/UI_ProEngWrapAPI.cfg testframework.ini /Epoc32/winscw/c/testframework/testframework_ProEngWrapAPI.ini PRJ_TESTMMPFILES diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/sis/50_SP_PROENG.SIS Binary file gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/sis/50_SP_PROENG.SIS has changed diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/sis/50_SP_PROENG.pkg --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/sis/50_SP_PROENG.pkg Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/sis/50_SP_PROENG.pkg Mon Jun 21 15:59:17 2010 +0300 @@ -32,5 +32,5 @@ "\Epoc32\Release\armv5\urel\ProEngWrapAPI.dll"-"!:\sys\bin\ProEngWrapAPI.dll" "\Epoc32\winscw\c\testframework\testframework_ProEngWrapAPI.ini"-"!:\TestFramework\testframework_ProEngWrapAPI.ini" -"\Epoc32\winscw\c\testframework\ProEngWrapAPI.cfg"-"!:\TestFramework\ProEngWrapAPI.cfg" +"\Epoc32\winscw\c\testframework\UI_ProEngWrapAPI.cfg"-"!:\TestFramework\UI_ProEngWrapAPI.cfg" "\epoc32\winscw\c\proeng_c.bat"-"!:\proeng.bat" \ No newline at end of file diff -r 854ebc17f64b -r 3b67655da2cc gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp Wed Jun 09 10:00:07 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -64,7 +64,7 @@ ENTRY( "ReqProfActNotificationsL", CProEngWrapAPI::RequestProfileActivationNotificationsL ), ENTRY( "CanProfActNotificationsL", CProEngWrapAPI::CancelProfileActivationNotificationsL ), ENTRY( "ReqActProfNotificationsL", CProEngWrapAPI::RequestActiveProfileNotificationsL ), - ENTRY( "CanActProfNotificationsL", CProEngWrapAPI::CancelProfileActivationNotificationsL ), + ENTRY( "CanActProfNotificationsL", CProEngWrapAPI::CancelActiveProfileNotificationsL ), ENTRY( "ReqProfNotificationsL", CProEngWrapAPI::RequestProfileNotificationsL ), ENTRY( "CanProfNotificationsL", CProEngWrapAPI::CancelProfileNotificationsL ), ENTRY( "ReqProfNameArrayNotL", CProEngWrapAPI::RequestProfileNameArrayNotificationsL ), @@ -222,8 +222,22 @@ CleanupStack::PushL( observer ); TRAP_IGNORE(nh->RequestProfileActivationNotificationsL ( *observer ) ); - engine->SetActiveProfileL( EProfileMeetingId ); - iSchedulerUtility->Start(); + + TInt previousid( engine->ActiveProfileId() ); + if ( previousid == EProfileMeetingId ) //example for active profile change + { + engine->SetActiveProfileL( EProfileOutdoorId ); + } + else + { + engine->SetActiveProfileL( EProfileMeetingId ); + } + TInt activeid( engine->ActiveProfileId() ); + if ( previousid!=activeid ) + { + iSchedulerUtility->Start(); + } + CleanupStack::PopAndDestroy( observer ); CleanupStack::PopAndDestroy( wrapper ); CleanupStack::PopAndDestroy(); // engine @@ -253,8 +267,21 @@ CleanupStack::PushL( observer ); TRAP_IGNORE(nh->RequestProfileActivationNotificationsL ( *observer ) ); - engine->SetActiveProfileL( EProfileMeetingId ); - iSchedulerUtility->Start(); + TInt previousid( engine->ActiveProfileId() ); + if ( previousid == EProfileMeetingId ) //example for active profile change + { + engine->SetActiveProfileL( EProfileOutdoorId ); + } + else + { + engine->SetActiveProfileL( EProfileMeetingId ); + } + TInt activeid( engine->ActiveProfileId() ); + if ( previousid!=activeid ) + { + iSchedulerUtility->Start(); + } + nh->CancelProfileActivationNotifications(); CleanupStack::PopAndDestroy( observer ); CleanupStack::PopAndDestroy( wrapper ); diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/BWINS/GSFrameworkU.DEF --- a/gssettingsuis/Gs/BWINS/GSFrameworkU.DEF Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/BWINS/GSFrameworkU.DEF Mon Jun 21 15:59:17 2010 +0300 @@ -76,4 +76,7 @@ ?CreateContainerL@CGSBaseView@@MAEXXZ @ 75 NONAME ; void CGSBaseView::CreateContainerL(void) ??0CGSBaseDocument@@IAE@AAVCEikApplication@@@Z @ 76 NONAME ; CGSBaseDocument::CGSBaseDocument(class CEikApplication &) ?CreateShimmedViewL@CGSBaseDocument@@QAEXVTUid@@@Z @ 77 NONAME ; void CGSBaseDocument::CreateShimmedViewL(class TUid) + ?NewL@CGsContainerExt@@SAPAV1@XZ @ 78 NONAME ; class CGsContainerExt * CGsContainerExt::NewL(void) + ?NewL@CGsDoubleClickPreventer@@SAPAV1@XZ @ 79 NONAME ; class CGsDoubleClickPreventer * CGsDoubleClickPreventer::NewL(void) + ?Start@CGsDoubleClickPreventer@@QAEXXZ @ 80 NONAME ; void CGsDoubleClickPreventer::Start(void) diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/EABI/GSFrameworkU.DEF --- a/gssettingsuis/Gs/EABI/GSFrameworkU.DEF Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/EABI/GSFrameworkU.DEF Mon Jun 21 15:59:17 2010 +0300 @@ -119,4 +119,7 @@ _ZN15CGSEComNotifierD2Ev @ 118 NONAME _ZN15CGSPluginLoader15RequestPriorityEN7CActive9TPriorityE @ 119 NONAME _ZN15CGSBaseDocument18CreateShimmedViewLE4TUid @ 120 NONAME + _ZN15CGsContainerExt4NewLEv @ 121 NONAME + _ZN23CGsDoubleClickPreventer4NewLEv @ 122 NONAME + _ZN23CGsDoubleClickPreventer5StartEv @ 123 NONAME diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h --- a/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Mon Jun 21 15:59:17 2010 +0300 @@ -27,6 +27,7 @@ class CAknViewAppUi; class CAknSingleLargeStyleListBox; class CGSPluginInterface; +class CGsContainerExt; /** * Container class for the GS Main view. @@ -185,6 +186,8 @@ // It is needed because iPluginArray also contains non-visible plugins // and therefore the indexes do not match to lbx items. CArrayPtrFlat* iVisiblePlugins; + // Extension for main container. + CGsContainerExt* iExt; }; diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp --- a/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -37,6 +37,7 @@ #include // For CGulIcon #include #include // for KUidGS +#include "GsContainerExt.h" //For CGsContainerExt //CONSTANTS @@ -85,6 +86,7 @@ // Obtain reference to listbox's item text array: iItemTextArray = STATIC_CAST( CDesCArray*, iListBox->Model()->ItemTextArray() ); + iExt = CGsContainerExt::NewL(); SetRect( aRect ); ActivateL(); @@ -115,6 +117,7 @@ { delete iListBox; } + delete iExt; __GSLOGSTRING( "[CGSMainContainer] ~CGSMainContainer" ); } @@ -346,7 +349,11 @@ // Negative listbox value -> no item selected? break; } - + if ( iExt->iDblClickPreventer->IsActive() ) + { + break; + } + iExt->iDblClickPreventer->Start(); CGSPluginInterface* selectedPlugin = iVisiblePlugins->operator[]( aListBox->CurrentItemIndex()); diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSFramework/GSFramework.mmp --- a/gssettingsuis/Gs/GSFramework/GSFramework.mmp Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/GSFramework/GSFramework.mmp Mon Jun 21 15:59:17 2010 +0300 @@ -103,5 +103,8 @@ SOURCEPATH ../Data DOCUMENT GSCommonResources.rss +SOURCEPATH src +SOURCE GsContainerExt.cpp + //End of File diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSFramework/inc/GsContainerExt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gssettingsuis/Gs/GSFramework/inc/GsContainerExt.h Mon Jun 21 15:59:17 2010 +0300 @@ -0,0 +1,65 @@ +/* +* Copyright (c) 2005 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: Container for GSParentPlugin. +* +*/ + +#ifndef GSCONTAINEREXT_H +#define GSCONTAINEREXT_H + +// INCLUDES +#include +#include + +// CLASS DECLARATION +class MGSWatchDog; + +/* + * Double click preventer. + */ +class CGsDoubleClickPreventer : public CTimer + { +public: + IMPORT_C static CGsDoubleClickPreventer* NewL(); + + CGsDoubleClickPreventer(); + IMPORT_C void Start(); +private: + void ConstructL(); +protected: + void RunL() {}; + }; + +/** + * Extension for container. + * + */ +class CGsContainerExt : public CBase + { +public: + IMPORT_C static CGsContainerExt* NewL(); + ~CGsContainerExt() + { + iDblClickPreventer->Cancel(); + delete iDblClickPreventer; + } +private: + void ConstructL(); +public: + MGSWatchDog* iGSWatchDog; + CGsDoubleClickPreventer* iDblClickPreventer; + + }; + +#endif // GSCONTAINEREXT_H diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp --- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Wed Jun 09 10:00:07 2010 +0300 +++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -35,6 +35,7 @@ #include #include #include +#include "GsContainerExt.h" //For CGsContainerExt //CONSTANTS const TInt KGSPluginArrayInitSize = 10; @@ -62,7 +63,8 @@ iParentPlugin = aParentPlugin; CGSBaseDocument* doc = static_cast< CGSBaseDocument* >( iAppUi->Document() ); - iGSWatchDog = doc->WatchDog(); + iExt = CGsContainerExt::NewL(); + iExt->iGSWatchDog = doc->WatchDog(); // Initialize the array containing pointers to plugins that are actually // displayed in lbx. @@ -106,6 +108,7 @@ { delete iListBox; } + delete iExt; __GSLOGSTRING( "[CGSParentContainer] ~CGSParentContainer()-|" ); } @@ -157,7 +160,7 @@ // -> A good place to use quarantine to catch panicking plugins in // any of these calls. #ifdef GS_ENABLE_WATCH_DOG - iGSWatchDog->QuarantineL( plugin->Id() ); + iExt->iGSWatchDog->QuarantineL( plugin->Id() ); #endif if( plugin->Visible() ) @@ -168,7 +171,7 @@ iconCounter ); } #ifdef GS_ENABLE_WATCH_DOG - iGSWatchDog->RemoveFromQuarantineL( plugin->Id() ); + iExt->iGSWatchDog->RemoveFromQuarantineL( plugin->Id() ); #endif } @@ -539,6 +542,11 @@ break; } + if(iExt->iDblClickPreventer->IsActive()) + { + break; + } + iExt->iDblClickPreventer->Start(); CGSPluginInterface* selectedPlugin = iVisiblePlugins->operator[]( aListBox->CurrentItemIndex() ); diff -r 854ebc17f64b -r 3b67655da2cc gssettingsuis/Gs/GSFramework/src/GsContainerExt.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gssettingsuis/Gs/GSFramework/src/GsContainerExt.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -0,0 +1,100 @@ +/* +* Copyright (c) 2005-2008 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: Container for GSParentPlugin. +* +*/ + +#include "GsContainerExt.h" + +const TInt KInterval = 1000000; // 1 seconds + +// ========================= MEMBER FUNCTIONS ================================ +// ----------------------------------------------------------------------------- +// CGsDoubleClickPreventer::CGsDoubleClickPreventer() +// +// +// ----------------------------------------------------------------------------- +// +CGsDoubleClickPreventer::CGsDoubleClickPreventer() + : CTimer(CActive::EPriorityStandard) + { + } + +// ----------------------------------------------------------------------------- +// CGsDoubleClickPreventer::NewL() +// +// +// ----------------------------------------------------------------------------- +// +EXPORT_C CGsDoubleClickPreventer* CGsDoubleClickPreventer::NewL() + { + CGsDoubleClickPreventer* self = new(ELeave) CGsDoubleClickPreventer(); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// CGsDoubleClickPreventer::ConstructL() +// +// +// ----------------------------------------------------------------------------- +// +void CGsDoubleClickPreventer::ConstructL() + { + CTimer::ConstructL(); + CActiveScheduler::Add(this); + } + +// ----------------------------------------------------------------------------- +// CGsDoubleClickPreventer::Start() +// +// +// ----------------------------------------------------------------------------- +// +EXPORT_C void CGsDoubleClickPreventer::Start() + { + if(!IsActive()) + { + After(KInterval); + } + } + +// ----------------------------------------------------------------------------- +// CGsContainerExt::NewL() +// +// +// ----------------------------------------------------------------------------- +// +EXPORT_C CGsContainerExt* CGsContainerExt::NewL() + { + CGsContainerExt* self = new(ELeave) CGsContainerExt; + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +// ----------------------------------------------------------------------------- +// CGsContainerExt::ConstructL() +// +// +// ----------------------------------------------------------------------------- +// +void CGsContainerExt::ConstructL() + { + iDblClickPreventer = CGsDoubleClickPreventer::NewL(); + } + diff -r 854ebc17f64b -r 3b67655da2cc profilesservices/MediaFileList/Src/mediafilepreview.cpp --- a/profilesservices/MediaFileList/Src/mediafilepreview.cpp Wed Jun 09 10:00:07 2010 +0300 +++ b/profilesservices/MediaFileList/Src/mediafilepreview.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -101,6 +101,12 @@ iProperty.Close(); iApaSession.Close(); + + if ( iBacklightTimer ) + { + delete iBacklightTimer; + iBacklightTimer = NULL; + } } @@ -581,12 +587,6 @@ { delete iVideoPlayer; } - - if ( iBacklightTimer ) - { - delete iBacklightTimer; - iBacklightTimer = NULL; - } } diff -r 854ebc17f64b -r 3b67655da2cc profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp --- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Wed Jun 09 10:00:07 2010 +0300 +++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Mon Jun 21 15:59:17 2010 +0300 @@ -27,7 +27,20 @@ #include "CProEngProfileImpl.h" #include "CProEngToneHandler.h" #include "CProEngProfileNameArrayImpl.h" +#include +#include +#include +#include +#include +#include +#include // RResourceFile +#include // BaflUtils +namespace + { + // The filename of the resource file + _LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" ); + } // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -154,7 +167,7 @@ MProEngProfile* profileWrapper = ActiveProfileLC(); CleanupStack::Pop(); // profileWrapper - + return profileWrapper; } @@ -190,6 +203,50 @@ // void CProEngEngineImpl::SetActiveProfileL( TInt aId ) { + if ( // active profile is Off-line + ( iProfileEngine->ActiveProfileId() == EProfileOffLineId ) && + // and currently focused profile is not Off-line + ( aId != EProfileOffLineId ) ) + { + + TInt simCStatus( ESimNotPresent ); + RProperty simStatus; + CleanupClosePushL( simStatus ); + + User::LeaveIfError( simStatus.Attach( KPSUidStartup, KPSSimStatus ) ); + User::LeaveIfError( simStatus.Get( simCStatus ) ); + CleanupStack::PopAndDestroy();//simStatus + + // SIM card does not exist. + if ( simCStatus == ESimNotPresent ) + { + TParse* fp = new ( ELeave ) TParse(); + fp->Set( KProEngResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL ); + TFileName localizedFileName( fp->FullName() ); + delete fp; + + RFs fs; + User::LeaveIfError( fs.Connect() ); + CleanupClosePushL( fs ); + + BaflUtils::NearestLanguageFile( fs, localizedFileName ); + + RConeResourceLoader resourceLoader( *CCoeEnv::Static() ); + CleanupClosePushL( resourceLoader ); + + TRAP_IGNORE( resourceLoader.OpenL( localizedFileName ) ); + + HBufC* infoNoteText = StringLoader::LoadLC( + R_PROFILE_TEXT_INSERT_SIM ); + CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue ); + note->ExecuteLD( *infoNoteText ); + + CleanupStack::PopAndDestroy( infoNoteText ); + CleanupStack::PopAndDestroy( 2 ); //resourceLoader&fs + + return; + } + } iProfileEngine->SetActiveProfileL( aId ); } diff -r 854ebc17f64b -r 3b67655da2cc profilesservices/ProfileEngine/WrapperSrc/ProEngWrapper.rss --- a/profilesservices/ProfileEngine/WrapperSrc/ProEngWrapper.rss Wed Jun 09 10:00:07 2010 +0300 +++ b/profilesservices/ProfileEngine/WrapperSrc/ProEngWrapper.rss Mon Jun 21 15:59:17 2010 +0300 @@ -24,6 +24,9 @@ // INCLUDES #include #include +#include +#include +#include // CONSTANTS // MACROS @@ -47,4 +50,11 @@ // RESOURCE LBUF r_proeng_text_drm_prev_rights_set { txt = qtn_drm_prev_rights_set; } +// ----------------------------------------------------------------------------- +// +// r_profile_text_insert_sim +// +// ----------------------------------------------------------------------------- +// +RESOURCE TBUF r_profile_text_insert_sim { buf = qtn_su_note_insert_sim; } // End of File diff -r 854ebc17f64b -r 3b67655da2cc profilesservices/ProfileEngine/group/ProfileEngine.mmp --- a/profilesservices/ProfileEngine/group/ProfileEngine.mmp Wed Jun 09 10:00:07 2010 +0300 +++ b/profilesservices/ProfileEngine/group/ProfileEngine.mmp Mon Jun 21 15:59:17 2010 +0300 @@ -75,7 +75,11 @@ LIBRARY PlatformEnv.lib // PathInfo LIBRARY ContentListingFramework.lib LIBRARY mmfcontrollerframework.lib - +LIBRARY avkon.lib +LIBRARY eikcdlg.lib +LIBRARY eikctl.lib +LIBRARY CommonEngine.lib +LIBRARY cone.lib LIBRARY DRMCommon.lib LIBRARY DrmRights.lib LIBRARY caf.lib cafutils.lib // Content access framework