--- a/controlpanel/examples/groupplugin/groupplugin.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/examples/groupplugin/groupplugin.pro Mon Oct 04 00:35:00 2010 +0300
@@ -26,3 +26,6 @@
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/examples/themeplugin/themeplugin.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/examples/themeplugin/themeplugin.pro Mon Oct 04 00:35:00 2010 +0300
@@ -27,3 +27,6 @@
symbian {
TARGET.UID3 = 0X20025FDB
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/examples/viewplugin/viewplugin.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/examples/viewplugin/viewplugin.pro Mon Oct 04 00:35:00 2010 +0300
@@ -25,3 +25,6 @@
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/src/cpframework/cpframework.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/src/cpframework/cpframework.pro Mon Oct 04 00:35:00 2010 +0300
@@ -32,3 +32,6 @@
LIBS += -lcplogger
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/src/logger/logger.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/src/logger/logger.pro Mon Oct 04 00:35:00 2010 +0300
@@ -26,3 +26,6 @@
DEFINES += BUILD_LOGGER_DLL
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/firstpluginfortest.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/firstpluginfortest.pro Mon Oct 04 00:35:00 2010 +0300
@@ -55,3 +55,6 @@
src/firstpluginviewfortest.h
SOURCES += src/firstpluginfortest.cpp \
src/firstpluginviewfortest.cpp
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/secondpluginfortest.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/secondpluginfortest.pro Mon Oct 04 00:35:00 2010 +0300
@@ -56,3 +56,6 @@
SOURCES += src/secondpluginfortest.cpp \
src/secondpluginviewfortest.cpp
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/thirdpluginfortest.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/thirdpluginfortest.pro Mon Oct 04 00:35:00 2010 +0300
@@ -56,3 +56,6 @@
SOURCES += src/thirdpluginfortest.cpp \
src/thirdpluginviewfortest.cpp
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/testplugin/testplugin.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/testplugin/testplugin.pro Mon Oct 04 00:35:00 2010 +0300
@@ -67,3 +67,6 @@
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -19,4 +19,6 @@
void CpTestView::testClose()
{
close();
-}
\ No newline at end of file
+}
+
+//End of File
--- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Mon Oct 04 00:35:00 2010 +0300
@@ -59,4 +59,6 @@
test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
}
-}
\ No newline at end of file
+}
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpbasesettingview/ut_cpbasesettingview.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpbasesettingview/ut_cpbasesettingview.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xEE3E465B
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpdataformbuttonentryviewitem/ut_cpdataformbuttonentryviewitem.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpdataformbuttonentryviewitem/ut_cpdataformbuttonentryviewitem.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xE43C01BC
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpdataformlistentryviewitem/ut_cpdataformlistentryviewitem.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpdataformlistentryviewitem/ut_cpdataformlistentryviewitem.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xE93910F0
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpitemdatahelper/ut_cpitemdatahelper.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpitemdatahelper/ut_cpitemdatahelper.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xE1FF1D09
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpplugin/ut_cpplugin.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpplugin/ut_cpplugin.pro Mon Oct 04 00:35:00 2010 +0300
@@ -52,4 +52,6 @@
SOURCES += ../../../src/cpframework/src/cppluginloader.cpp
SOURCES += ../../../src/cpframework/src/cppluginconfigreader.cpp
SOURCES += ../../../src/cpframework/src/cppluginconfig.cpp
-SOURCES += ../../../src/cpframework/src/cputility.cpp
\ No newline at end of file
+SOURCES += ../../../src/cpframework/src/cputility.cpp
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cppluginlauncher/ut_cppluginlauncher.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cppluginlauncher/ut_cppluginlauncher.pro Mon Oct 04 00:35:00 2010 +0300
@@ -38,3 +38,6 @@
DEPLOYMENT += testplugindll testpluginconfig testpluginstub
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cppluginloader/ut_cppluginloader.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cppluginloader/ut_cppluginloader.pro Mon Oct 04 00:35:00 2010 +0300
@@ -39,3 +39,6 @@
DEPLOYMENT += testplugindll testpluginconfig testpluginstub
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cppluginutility/ut_cppluginutility.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cppluginutility/ut_cppluginutility.pro Mon Oct 04 00:35:00 2010 +0300
@@ -25,3 +25,6 @@
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpsettingformentryitemdata/ut_cpsettingformentryitemdata.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpsettingformentryitemdata/ut_cpsettingformentryitemdata.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xEF97598F
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpsettingformitemdata/ut_cpsettingformitemdata.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpsettingformitemdata/ut_cpsettingformitemdata.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xEA4617EA
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cputility/ut_cputility.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cputility/ut_cputility.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xE98BA02A
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_cpviewlauncher/ut_cpviewlauncher.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpviewlauncher/ut_cpviewlauncher.pro Mon Oct 04 00:35:00 2010 +0300
@@ -23,3 +23,6 @@
symbian: {
TARGET.UID3 = 0xEF52815A
}
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/controlpanel/tsrc/unit/ut_profileengwrapper/ut_profileengwrapper.pro Fri Sep 17 08:31:27 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_profileengwrapper/ut_profileengwrapper.pro Mon Oct 04 00:35:00 2010 +0300
@@ -40,3 +40,6 @@
# Input
HEADERS += src/ut_profileengwrapper.h
SOURCES += src/ut_profileengwrapper.cpp
+
+
+symbian:MMP_RULES += SMPSAFE
--- a/ftuwizardmodel/bwins/ftuwizardmodelu.def Fri Sep 17 08:31:27 2010 +0300
+++ b/ftuwizardmodel/bwins/ftuwizardmodelu.def Mon Oct 04 00:35:00 2010 +0300
@@ -20,4 +20,5 @@
??0FtuWizard@@IAE@XZ @ 19 NONAME ; FtuWizard::FtuWizard(void)
?infoTextUpdated@FtuWizard@@IAEXPAV1@VQString@@@Z @ 20 NONAME ; void FtuWizard::infoTextUpdated(class FtuWizard *, class QString)
?trUtf8@FtuWizard@@SA?AVQString@@PBD0H@Z @ 21 NONAME ; class QString FtuWizard::trUtf8(char const *, char const *, int)
+ ?wizardSettingsChanged@FtuWizard@@IAEXPAV1@@Z @ 22 NONAME ; void FtuWizard::wizardSettingsChanged(class FtuWizard *)
--- a/ftuwizardmodel/eabi/ftuwizardmodelu.def Fri Sep 17 08:31:27 2010 +0300
+++ b/ftuwizardmodel/eabi/ftuwizardmodelu.def Mon Oct 04 00:35:00 2010 +0300
@@ -15,4 +15,5 @@
_ZNK9FtuWizard10metaObjectEv @ 14 NONAME
_ZTI9FtuWizard @ 15 NONAME
_ZTV9FtuWizard @ 16 NONAME
+ _ZN9FtuWizard21wizardSettingsChangedEPS_ @ 17 NONAME
--- a/ftuwizardmodel/inc/ftuwizard.h Fri Sep 17 08:31:27 2010 +0300
+++ b/ftuwizardmodel/inc/ftuwizard.h Mon Oct 04 00:35:00 2010 +0300
@@ -57,6 +57,12 @@
* The text to be shown in table of contents UI component.
*/
QString mTocLabel;
+
+ /**
+ * Secondary text to be shown in table of contents UI component.
+ */
+ QString mTocSecondaryLabel;
+
/**
* Informs Framework whether a plugin is having any ftu view or not.
* It should be set to false by plugin if it has any FTU view to be shown
@@ -239,6 +245,15 @@
* @param caller The calling wizard plugin instance.
*/
void wizardDeactivated(FtuWizard *caller);
+
+ /**
+ * Emit this signal to update the text/icons of the widget.
+ * FTU framework reads settings through wizardSettings()and
+ * displays accordingly. It should be ensured by plugin/wizard
+ * that the modified settings are reflected through wizardSettings().
+ * @param caller The calling wizard plugin instance.
+ */
+ void wizardSettingsChanged(FtuWizard *caller);
};
--- a/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h Fri Sep 17 08:31:27 2010 +0300
+++ b/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h Mon Oct 04 00:35:00 2010 +0300
@@ -57,6 +57,12 @@
* The text to be shown in table of contents UI component.
*/
QString mTocLabel;
+
+ /**
+ * Secondary text to be shown in table of contents UI component.
+ */
+ QString mTocSecondaryLabel;
+
/**
* Informs Framework whether a plugin is having any ftu view or not.
* It should be set to false by plugin if it has any FTU view to be shown
@@ -104,7 +110,6 @@
* @param wizardIdx Index of the Cenrep key for a wizard.
* If wizard is invoking another application, it should provide cenrepOwnerId and wizardIdx
* to the application. Application should write 1 into the wizardIdx cenrep on completion.
- * @since S60 ?S60_version.
*/
virtual void initializeWizard(qint32 cenrepOwnerId, int wizardIdx) = 0;
@@ -238,7 +243,15 @@
* @param caller The calling wizard plugin instance.
*/
void wizardDeactivated(FtuWizard *caller);
-
+
+ /**
+ * Emit this signal to update the text/icons of the widget.
+ * FTU framework reads settings through wizardSettings()and
+ * displays accordingly. It should be ensured by plugin/wizard
+ * that the modified settings are reflected through wizardSettings().
+ * @param caller The calling wizard plugin instance.
+ */
+ void wizardSettingsChanged(FtuWizard *caller);
};
#endif // FTUWIZARD_H
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -1241,22 +1241,10 @@
void CProfileEngineImpl::SetSilenceModeL( TBool aSilenceMode )
{
User::LeaveIfError( iCenRep->Set( KProEngSilenceMode, aSilenceMode ? 1 : 0 ) );
- //Also set profiles' ring type to silence
- TInt countOfProfiles = iProfileLocalisedNames->MdcaCount();
- for (TInt i = 0; i < countOfProfiles; ++i)
- {
- const MProfileName* profileName = iProfileLocalisedNames->ProfileName(i);
- if (profileName)
- {
- MProfileExtended2* profile = Profile2LC(profileName->Id());
- TProfileToneSettings setToneSettings = profile->ProfileSetTones().SetToneSettings();
- setToneSettings.iRingingType = aSilenceMode ? EProfileRingingTypeSilent : EProfileRingingTypeRinging;
- CommitChange2L(*profile);
- CleanupStack::PopAndDestroy();
- }
-
- }
+ //Send event through P&S
+ CreatePubSubKeysIfNeededL();
+ PublishChangeL( KProEngActiveProfileModified );
}
// End of File
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -142,6 +142,14 @@
aProfileId ), value ) );
iProfileToneSettings.iRingingType = TProfileRingingType( value );
+ //Since 10.1, check if silence mode
+ User::LeaveIfError(
+ aCenRep.Get( KProEngSilenceMode , value) );
+ if ( value )
+ {
+ iProfileToneSettings.iRingingType = EProfileRingingTypeSilent;
+ }
+
User::LeaveIfError(
aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngKeypadVolume,
aProfileId ), value ) );
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -32,10 +32,11 @@
// CONSTANTS
-namespace
- {
- _LIT( KProfileScheduleEventResourceDriveAndDir, "Z:ProfileScheduleEvent.rsc" );
- }
+
+//namespace
+// {
+// _LIT( KProfileScheduleEventResourceDriveAndDir, "Z:ProfileScheduleEvent.rsc" );
+// }
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -33,7 +33,7 @@
// CONSTANTS
_LIT( KProEngROMDriveLetter, "Z:" );
// The filename of the resource file
- _LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" );
+ //_LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" );
}
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Mon Oct 04 00:35:00 2010 +0300
@@ -116,10 +116,14 @@
// CProEngToneSettingsImpl::
// -----------------------------------------------------------------------------
//
-TInt CProEngToneSettingsImpl::SetRingingType( TProfileRingingType /*aRingingType*/ )
+TInt CProEngToneSettingsImpl::SetRingingType( TProfileRingingType aRingingType )
{
- // since 10.1, ring type can't be set by user
- return KErrNotSupported;
+ if( iModifiableFlags & EProfileFlagRingingType )
+ {
+ iToneSettings.iRingingType = aRingingType;
+ return KErrNone;
+ }
+ return KErrAccessDenied;
}
// -----------------------------------------------------------------------------
Binary file profilesservices/ProfileEngine/conf/profilesengine.confml has changed
Binary file profilesservices/ProfileEngine/conf/profilesengine_101F8798.crml has changed
--- a/profilesservices/ProfileEngine/group/ProfileEng.rss Fri Sep 17 08:31:27 2010 +0300
+++ b/profilesservices/ProfileEngine/group/ProfileEng.rss Mon Oct 04 00:35:00 2010 +0300
@@ -62,7 +62,7 @@
naviname = qtn_navi_mode_active_general;
titlename = qtn_mode_title_general;
},
- PROFILE
+/* PROFILE
{
id = EProfileSilentId;
name = qtn_mode_silent;
@@ -70,6 +70,7 @@
naviname = qtn_navi_mode_active_silent;
titlename = qtn_mode_title_silent;
},
+*/
PROFILE
{
id = EProfileMeetingId;
@@ -77,7 +78,9 @@
shortname = qtn_navi_mode_meeting;
naviname = qtn_navi_mode_active_meeting;
titlename = qtn_mode_title_meeting;
- },
+ }
+/*
+ ,
PROFILE
{
id = EProfileOutdoorId;
@@ -115,7 +118,8 @@
naviname = qtn_navi_mode_active_drive;
titlename = qtn_mode_title_drive;
}
-#endif
+#endif
+*/
};
}