# HG changeset patch # User hgs # Date 1270063725 -28800 # Node ID 8844afdb7529a9e113087e4bbd6b0e52da8cf8ee # Parent 6263db1704527540227150a5eca85a09c1ac70df 201009 diff -r 6263db170452 -r 8844afdb7529 controlpanel/controlpanel_plat/inc/cplogger.h --- a/controlpanel/controlpanel_plat/inc/cplogger.h Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/controlpanel_plat/inc/cplogger.h Thu Apr 01 03:28:45 2010 +0800 @@ -24,18 +24,27 @@ Format: - [ControlPanel] + [CpFramework] logdatetime = 1 logloggername = 1 + datetimeformat = hh:mm:ss:zzz output = debugoutput fileoutput - fileoutput/logfile = C:/data/logs/controlpanel.log - fileoutput/truncate = 0 + fileoutput/logfile = C:/data/logs/cpframework.log + fileoutput/truncate = 1 + + [CpPerformance] + logdatetime = 1 + datetimeformat = hh:mm:ss:zzz + output = fileoutput + fileoutput/logfile = C:/data/logs/cpperformance.log + fileoutput/truncate = 1 */ #include #include -#define CPFW_LOGGER_NAME QLatin1String("CpFramework") +#define CPFW_LOGGER_NAME QLatin1String("CpFramework") +#define CPPERF_LOGGER_NAME QLatin1String("CpPerformance") #if defined (Q_OS_SYMBIAN) #define CP_LOGGER_CONFIG_PATH QLatin1String("C:/data/.config/controlpanellog.conf") @@ -47,6 +56,7 @@ #endif #endif -#define CPFW_LOG(str) Logger::instance(CPFW_LOGGER_NAME)->log(str); +#define CPFW_LOG(str) Logger::instance(CPFW_LOGGER_NAME)->log(str); +#define CPPERF_LOG(str) Logger::instance(CPPERF_LOGGER_NAME)->log(str); #endif /* CPLOGGER_H */ diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/cpframework/src/cpdataformviewitem.cpp --- a/controlpanel/src/cpframework/src/cpdataformviewitem.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/cpframework/src/cpdataformviewitem.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -110,9 +110,9 @@ if (itemType == HbDataFormModelItem::CustomItemBase+1) { HbPushButton *button = new HbPushButton(QString("Push button")); d_ptr->mWidget = button; - button->setMinimumHeight(50); - button->setMaximumHeight(60); - button->setOrientation(Qt::Horizontal); + //button->setMinimumHeight(50); + //button->setMaximumHeight(60); + //button->setOrientation(Qt::Horizontal); button->setTextAlignment( Qt::AlignLeft ); return button; } @@ -122,7 +122,7 @@ /*! Inherit from HbDataForm. This function is called by hbdataform's framework, for supporting to load entry item's text, icon and additional text dynamically. - It is not recommanded to call this function mannually. + It is not recommended to call this function manually. */ void CpDataFormViewItem::load() { diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/cpframework/src/cppluginloader.cpp --- a/controlpanel/src/cpframework/src/cppluginloader.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/cpframework/src/cppluginloader.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -40,6 +40,8 @@ template static PLUGIN* loadPlugin(const QString &pluginFile) { + CPPERF_LOG( QLatin1String("Loading plugin: ") + pluginFile ); + QFileInfo fileInfo(pluginFile); if (!fileInfo.isAbsolute()) { @@ -52,6 +54,7 @@ foreach(const QString &pluginDir,pluginDirs) { fileInfo.setFile(pluginDir + fileName); if (fileInfo.exists() && QLibrary::isLibrary(fileInfo.absoluteFilePath())) { + CPPERF_LOG( QLatin1String("Valid plugin stub found: ") + fileInfo.absoluteFilePath() ); break; } } @@ -62,6 +65,8 @@ if (!plugin) { loader.unload(); } + + CPPERF_LOG( QLatin1String("Load plugin ") + (plugin ? QLatin1String("succeed.") : QLatin1String("failed.")) ); return plugin; } diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/cpframework/src/cppluginutility.cpp --- a/controlpanel/src/cpframework/src/cppluginutility.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/cpframework/src/cppluginutility.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -27,7 +27,7 @@ */ void CpPluginUtility::addCpItemPrototype(HbDataForm *settingForm) { - if (settingForm != NULL) { + if (settingForm) { QListprototypeList = settingForm->itemPrototypes(); prototypeList.append(new CpDataFormViewItem()); settingForm->setItemPrototypes(prototypeList); diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/cpframework/src/cputility.cpp --- a/controlpanel/src/cpframework/src/cputility.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/cpframework/src/cputility.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -78,17 +78,6 @@ return dirs; } -QStringList CpUtility::applicationPluginDirectories() -{ - static QStringList dirs; - if (dirs.empty()) { - CPFW_LOG("ControlPanel application plugin derectories:"); -// dirs = directoriesFromAllDrives(CP_APPLICATION_PLUGIN_PATH); - } - return dirs; -} - - QStringList CpUtility::configFileDirectories() { static QStringList dirs; diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/cpframework/src/cputility.h --- a/controlpanel/src/cpframework/src/cputility.h Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/cpframework/src/cputility.h Thu Apr 01 03:28:45 2010 +0800 @@ -25,8 +25,6 @@ class CpUtility { public: - - /* get all physical drives of the devices */ @@ -38,11 +36,6 @@ static QStringList pluginDirectories(); /* - get all application plugin directories of the device - */ - static QStringList applicationPluginDirectories(); - - /* get all config directories of the device */ static QStringList configFileDirectories(); diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/logger/src/logger.cpp --- a/controlpanel/src/logger/src/logger.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/logger/src/logger.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -122,7 +122,7 @@ QString logStr; if (d_ptr->mLogDateTime) { - logStr += QDateTime::currentDateTime().toString(d_ptr->mDateTimeFormat) + " "; + logStr += QDateTime::currentDateTime().toString(d_ptr->mDateTimeFormat) + ' '; } if (d_ptr->mLogLoggerName) { diff -r 6263db170452 -r 8844afdb7529 controlpanel/src/logger/src/logoutputimpl.cpp --- a/controlpanel/src/logger/src/logoutputimpl.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/controlpanel/src/logger/src/logoutputimpl.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -138,11 +138,14 @@ } mLogFile = new QFile(mLogFilePath); - QFile::OpenMode mode = QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append; + QFile::OpenMode mode = QIODevice::WriteOnly | QIODevice::Text; if (mTruncateFile) { mode |= QIODevice::Truncate; } + else { + mode |= QIODevice::Append; + } if (!mLogFile->open(mode)) { diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/profiles_engine_api/inc/ProfileEng.hrh --- a/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEng.hrh Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEng.hrh Thu Apr 01 03:28:45 2010 +0800 @@ -62,7 +62,10 @@ EProfileSettingId3DEffect = 0x00000017, EProfileSettingId3DEcho = 0x00000018, EProfileSettingIdTactileFeedback = 0x00000019, - EProfileSettingIdAudioFeedback = 0x0000001A + EProfileSettingIdAudioFeedback = 0x0000001A, + EProfileSettingIdReminderTone = 0x0000001B, + EProfileSettingIdClockAlarmTone = 0x0000001C, + EProfileSettingIdAlertVibra = 0x0000001D }; #endif // __PROFILEENG_HRH__ diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineDomainCRKeys.h --- a/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineDomainCRKeys.h Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineDomainCRKeys.h Thu Apr 01 03:28:45 2010 +0800 @@ -56,6 +56,22 @@ const TUint32 KProEngDefaultImTone = 0x7F00000C; /** + * Default reminder tone for all profiles. String value. Read-only. + * + * Central Repository file of the key: KCRUidProfileEngine. + * + */ +const TUint32 KProEngDefaultReminderTone = 0x7F00001B; + +/** + * Default clock alarm tone for all profiles. String value. Read-only. + * + * Central Repository file of the key: KCRUidProfileEngine. + * + */ +const TUint32 KProEngDefaultClockAlarmTone = 0x7F00001C; + +/** * This integer indicates the maximum file size (kilo bytes) of ring tone * files that can be selected as voice call ringing tone. * diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineInternalCRKeys.h --- a/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineInternalCRKeys.h Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEngineInternalCRKeys.h Thu Apr 01 03:28:45 2010 +0800 @@ -83,6 +83,45 @@ */ const TUint32 KProEngActiveAudioFeedback = 0x7E00001A; +/** +* Absolute file path of ring tone of the currently active profile, string. +**/ +const TUint32 KProEngActiveRingTone = 0x7E00001B; + +/** +* Absolute file path of message tone of the currently active profile, string. +**/ +const TUint32 KProEngActiveMessageTone = 0x7E00001C; + +/** +* Absolute file path of reminder tone of the currently active profile, string. +**/ +const TUint32 KProEngActiveReminderTone = 0x7E00001D; + +/** +* Absolute file path of clock alarm tone of the currently active profile, string. +**/ +const TUint32 KProEngActiveClockAlarmTone = 0x7E00001E; + +/** +* Alert vibra setting of the currently active profile, string. +* +* Possible values (bit OR): +* +* enum TProfileAlertVibra + { + EProfileNoAlertVibra = 0x00000000, + EProfileRingAlertVibra = 0x00000001, + EProfileMessageAlertVibra = 0x00000002, + EProfileEmailAlertVibra = 0x00000004, + EProfileReminderAlarmVibra = 0x00000008, + EProfileClockAlarmVibra = 0x00000010, + EProfileInformationVibra = 0x00000020 + }; +* +**/ +const TUint32 KProEngActiveAlertVibra = 0x7E00001F; + #endif // PROFILEENGINEINTERNALCRKEYS_H diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/profiles_engine_api/inc/ProfileInternal.hrh --- a/gsprofilesrv_plat/profiles_engine_api/inc/ProfileInternal.hrh Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/profiles_engine_api/inc/ProfileInternal.hrh Thu Apr 01 03:28:45 2010 +0800 @@ -67,6 +67,17 @@ EProfile3DEchoUnderwater = 28 }; +enum TProfileAlertVibra + { + EProfileNoAlertVibra = 0x00000000, + EProfileRingAlertVibra = 0x00000001, + EProfileMessageAlertVibra = 0x00000002, + EProfileEmailAlertVibra = 0x00000004, + EProfileReminderAlarmVibra = 0x00000008, + EProfileClockAlarmVibra = 0x00000010, + EProfileInformationVibra = 0x00000020 + }; + #endif // PROFILEINTERNAL_HRH // End of File diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h --- a/gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h Thu Apr 01 03:28:45 2010 +0800 @@ -159,7 +159,7 @@ /** * See base class. */ - void HandleListBoxEventL( CEikListBox* aListBox, + IMPORT_C void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType ); private: // New diff -r 6263db170452 -r 8844afdb7529 gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h --- a/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Thu Apr 01 03:26:30 2010 +0800 +++ b/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Thu Apr 01 03:28:45 2010 +0800 @@ -142,6 +142,16 @@ */ const TUint32 KSettingsAPSettingsSupported = 0x00000003; + +/** +* Current airplane mode +* +* Possible values are: +* 0 = airplane mode (offline mode) Off +* 1 = airplane mode (offline mode) On +*/ +const TUint32 KSettingsAirplaneMode = 0x00000004; + /** * Terminal personalization settings CR UID */ @@ -675,370 +685,6 @@ */ const TUint32 KSettingsPowerSavingQuery = 0x00000001; -/** -* Slide Settings CR UID. -*/ -const TUid KCRUidSlideSettings = {0x20015159}; - -enum TSlideSetting - { - ESlideSettingOff = 0, - ESlideSettingOn - }; - -/********************************************************** - * User settings for slide handling - * - */ - -/** - * Used to control which behavior is chosen when closing the cover. - * Possible values are 0=Off, 1=On - */ -const TUint32 KSlideCloseCover = 0x00000001; - -const TUint32 KSlideOpenCoverUri = 0x00000002; - -const TUint32 KSlideOpenCoverCaption = 0x00000003; - -/** - * This setting defines whether keyguard is activated by closing the cover - * - * Possible values: - * 0: Closing cover does not activate keyguard. - * 1: Closing the cover activates keyguard. - * 2: User is asked "Do you want to activate keyguard?". - * 3: Automatic - keyguard returns to the state before opening the cover. - */ -const TUint32 KSlideKeyguard = 0x00000004; -enum TSlideSettingKeyguard - { - ESlideSettingsKeyguardActivatingOff = 0, - ESlideSettingsKeyguardActivatingOn, - ESlideSettingsKeyguardActivatingAskMe, - ESlideSettingsKeyguardActivatingAutomatic - }; - -/** - * Used to control if audio is routed when opening the slide. - * Possible values are 0=routing not changed, 1=routing changed - */ -const TUint32 KSlideAudioRouting = 0x00000005; - -/** - * User setting for Intelligent Slide - * Possible values are listed in TSlideSetting - */ -const TUint32 KSlideAutomaticAction = 0x00000010; - -/********************************************************** - * Configurability settings - * This group of settings is used to specify which slide behavior is enabled - * Different slide types need different items - * For example ITU-T slide need call handling with slide - * And full-Qwerty slide does not use call handling but requires audio routing with slide - */ - -/** - * Defines which localisation to use for slide settings - * Possible values - * 0: Slide - * 1: Cover - * 2: Flip - * 3: Fold - * 4: Swivel - * 5: reserved - */ -const TUint32 KSlideTerminology = 0x00000101; - -/** - * Slide Events to react to - * Depending on this value, different P/S keys in KPSUidHWRM are used for monitoring the slide state - * Possible values are - * 0: Grip - * 1: Flip - * 2: Twist - */ -const TUint32 KSlideShowEventType = 0x00000102; - -/** - * Perform call handling with slide - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowCallHandling = 0x00000110; - -/** - * Perform audio routing with slide - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowAudioRouting = 0x00000111; - -/** - * Perform keypad lock handling with slide - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowKeypadlock = 0x00000112; - -/** - * Application launch when slide open in idle - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowAppLaunch = 0x00000113; - -/** - * Go to idle with slide close - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowGoToIdle = 0x00000114; - -/** - * Device lock with slide - * Possible values - * 0: Disabled - * 1: Enabled - */ -const TUint32 KSlideShowDeviceLock = 0x00000115; - -/********************************************************** - * Intelligent Slide configurability settings - * The following items describe in which applications/views - * Intelligent slide feature is enabled - * - */ - -/** - * Messaging Main View - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingMainView = 0x00001001; - -/** - * Messaging Message List View - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingMessageListView = 0x00001002; - -/** - * Messaging One Row Message List View - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingOneRowMessageListView = 0x00001003; - -/** - * Messaging Text Message Viewer - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingTextMessageViewer = 0x00001004; - -/** - * Messaging Multimedia Message Viewer - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingMultimediaMessageViewer = 0x00001005; - -/** - * Messaging Uni Editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KMessagingUniEditor = 0x00001006; - -/** - * Email Viewer - * Possible values are listed in TSlideSetting - */ -const TUint32 KEmailViewer = 0x00001010; - -/** - * Email Editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KEmailEditor = 0x00001011; - -/** - * Browser Content view - * Possible values are listed in TSlideSetting - */ -const TUint32 KBrowserContentView = 0x00001020; - -/** - * Browser Bookmarks view - * Possible values are listed in TSlideSetting - */ -const TUint32 KBrowserBookmarksView = 0x00001021; - -/** - * Clock Main view - * Possible values are listed in TSlideSetting - */ -const TUint32 KClockMainView = 0x00001030; - -/** - * Clock Alarm editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KClockAlarmEditor = 0x00001031; - -/** - * Clock MultiAlarm view - * Possible values are listed in TSlideSetting - */ -const TUint32 KClockMultiAlarmView = 0x00001032; - -/** - * Clock World clock view - * Possible values are listed in TSlideSetting - */ -const TUint32 KClockWorldClockView = 0x00001033; - -/** - * Clock World clock view - * Possible values are listed in TSlideSetting - */ -const TUint32 KClockCountDownView = 0x00001034; - - -/** - * Notepad Editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KNotepadEditor = 0x00001040; - -/** - * Notepad List view - * Possible values are listed in TSlideSetting - */ -const TUint32 KNotepadListView = 0x00001041; - -/** - * Phone Incoming call - * Possible values are listed in TSlideSetting - */ -const TUint32 KPhoneIncomingCall = 0x00001050; - -/** - * File Manager Folder view - * Possible values are listed in TSlideSetting - */ -const TUint32 KFileManagerFolderView = 0x00001060; - -/** - * Calendar Main(Month/Week/Day/To-Do) view - * Possible values are listed in TSlideSetting - */ -const TUint32 KCalendarMainView = 0x00001070; - -/** - * Calendar Event(Meeting/Memo/Anniversary/To-Do note) view - * Possible values are listed in TSlideSetting - */ -const TUint32 KCalendarEventView = 0x00001071; - -/** - * Calendar Event(Meeting/Memo/Anniversary/To-Do note) editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KCalendarEventEditor = 0x00001072; - -/** - * Contacts Group view - * Possible values are listed in TSlideSetting - */ -const TUint32 KContactsGroupView = 0x00001080; - -/** - * Contacts Details view - * Possible values are listed in TSlideSetting - */ -const TUint32 KContactsDetailsView = 0x00001081; - -/** - * Contacts Editor - * Possible values are listed in TSlideSetting - */ -const TUint32 KContactsEditor = 0x00001082; - -/** - * Contacts Communication Launcher view - * Possible values are listed in TSlideSetting - */ -const TUint32 KContactsCommunicationLauncherView = 0x00001083; - - -/** - * Logs view - * Possible values are listed in TSlideSetting - */ -const TUint32 KLogsView = 0x00001090; - - -/** - * Modifier keys used for global shortcuts - * Possible values of scan codes are listed in e32keys.h - * For example EStdKeyLeftShift=0x12, EStdKeyLeftCtrl=0x16 - */ -const TUint32 KGlobalShortcutModifier1 = 0x00002001; -const TUint32 KGlobalShortcutModifier2 = 0x00002002; - -/** - * Action key scancode - * Possible values of scan codes are listed in e32keys.h - */ -const TUint32 KGlobalShortcutKey00 = 0x00002100; -const TUint32 KGlobalShortcutKey01 = 0x00002101; -const TUint32 KGlobalShortcutKey02 = 0x00002102; -const TUint32 KGlobalShortcutKey03 = 0x00002103; -const TUint32 KGlobalShortcutKey04 = 0x00002104; -const TUint32 KGlobalShortcutKey05 = 0x00002105; -const TUint32 KGlobalShortcutKey06 = 0x00002106; -const TUint32 KGlobalShortcutKey07 = 0x00002107; -const TUint32 KGlobalShortcutKey08 = 0x00002108; -const TUint32 KGlobalShortcutKey09 = 0x00002109; -const TUint32 KGlobalShortcutKey10 = 0x00002110; -const TUint32 KGlobalShortcutKey11 = 0x00002111; -const TUint32 KGlobalShortcutKey12 = 0x00002112; -const TUint32 KGlobalShortcutKey13 = 0x00002113; -const TUint32 KGlobalShortcutKey14 = 0x00002114; -const TUint32 KGlobalShortcutKey15 = 0x00002115; -const TUint32 KGlobalShortcutKey16 = 0x00002116; -const TUint32 KGlobalShortcutKey17 = 0x00002117; -const TUint32 KGlobalShortcutKey18 = 0x00002118; -const TUint32 KGlobalShortcutKey19 = 0x00002119; - -/** - * Application UID that should be brought to foreground/background - * when corresponding action key is pressed - */ -const TUint32 KGlobalShortcutApp00 = 0x00002200; -const TUint32 KGlobalShortcutApp01 = 0x00002201; -const TUint32 KGlobalShortcutApp02 = 0x00002202; -const TUint32 KGlobalShortcutApp03 = 0x00002203; -const TUint32 KGlobalShortcutApp04 = 0x00002204; -const TUint32 KGlobalShortcutApp05 = 0x00002205; -const TUint32 KGlobalShortcutApp06 = 0x00002206; -const TUint32 KGlobalShortcutApp07 = 0x00002207; -const TUint32 KGlobalShortcutApp08 = 0x00002208; -const TUint32 KGlobalShortcutApp09 = 0x00002209; -const TUint32 KGlobalShortcutApp10 = 0x00002210; -const TUint32 KGlobalShortcutApp11 = 0x00002211; -const TUint32 KGlobalShortcutApp12 = 0x00002212; -const TUint32 KGlobalShortcutApp13 = 0x00002213; -const TUint32 KGlobalShortcutApp14 = 0x00002214; -const TUint32 KGlobalShortcutApp15 = 0x00002215; -const TUint32 KGlobalShortcutApp16 = 0x00002216; -const TUint32 KGlobalShortcutApp17 = 0x00002217; -const TUint32 KGlobalShortcutApp18 = 0x00002218; -const TUint32 KGlobalShortcutApp19 = 0x00002219; - #endif // SETTINGSINTERNALCRKEYS_H // End of file \ No newline at end of file diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/GSApplication/bld.inf --- a/gssettingsuis/Gs/GSApplication/bld.inf Thu Apr 01 03:26:30 2010 +0800 +++ b/gssettingsuis/Gs/GSApplication/bld.inf Thu Apr 01 03:28:45 2010 +0800 @@ -27,7 +27,7 @@ ../rom/GSAppResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( GSAppResources.iby ) ../Data/backup_registration.xml z:/private/100058EC/backup_registration.xml ../rom/GsResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( GsResources.iby ) -loc/GSApp.loc MW_LAYER_LOC_EXPORT_PATH( GSApp.loc ) +loc/gsapp.loc MW_LAYER_LOC_EXPORT_PATH( gsapp.loc ) loc/SoftReject.loc MW_LAYER_LOC_EXPORT_PATH( SoftReject.loc ) PRJ_EXTENSIONS diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/GSApplication/loc/GSApp.loc --- a/gssettingsuis/Gs/GSApplication/loc/GSApp.loc Thu Apr 01 03:26:30 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* -* 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: -* Localization strings for GS Application -* -*/ - - -// LOCALISATION STRINGS - - -//d:Text in title pane -//d:Main view -//l:title_pane_t2/opt9 -// -#define qtn_set_title_settings "General settings" - -//d:Text in title pane -//d:Main view -//l:title_pane_t2/opt9 -// -#define qtn_cp_title_control_panel "Control Panel" - -//d:Command in Options list -//d:Opens the highlighted item -//l:list_single_pane_t1_cp2 -// -#define qtn_set_options_open "Open" - -//d:Application title for aif caption file -//d:Long string -//l:list_single_large_graphic_pane_t1 -// -#define qtn_apps_settings_list "General settings" - -//d:Application title for aif caption file -//d:Short string -//l:cell_app_pane_t1 -// -#define qtn_apps_settings_grid "Settings" - -//d:Application title for aif caption file -//d:Long string -//l:list_single_large_graphic_pane_t1 -// -#define qtn_apps_controlpanel_list "Control Panel" - -//d:Application title for aif caption file -//d:Short string -//l:cell_app_pane_t1 -// -#define qtn_apps_controlpanel_grid "Control Panel" - -//d:Text of a list item in Network setting list view's list -//d: Confirmation for Network mode selection operation. -//l: popup_note_window -//w: -//r: 3.1 -#define qtn_set_error_open_during_backuprestore "General Settings cannot be opened during backup/restore" - -//d:Text of a list item in Network setting list view's list -//d: Confirmation for Network mode selection operation. -//l: popup_note_window -//w: -//r: 5.0 -#define qtn_cp_error_open_during_backuprestore "Control Panel cannot be opened during backup/restore" - -// End of File - - diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/GSApplication/loc/gsapp.loc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gssettingsuis/Gs/GSApplication/loc/gsapp.loc Thu Apr 01 03:28:45 2010 +0800 @@ -0,0 +1,81 @@ +/* +* 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: +* Localization strings for GS Application +* +*/ + + +// LOCALISATION STRINGS + + +//d:Text in title pane +//d:Main view +//l:title_pane_t2/opt9 +// +#define qtn_set_title_settings "General settings" + +//d:Text in title pane +//d:Main view +//l:title_pane_t2/opt9 +// +#define qtn_cp_title_control_panel "Control Panel" + +//d:Command in Options list +//d:Opens the highlighted item +//l:list_single_pane_t1_cp2 +// +#define qtn_set_options_open "Open" + +//d:Application title for aif caption file +//d:Long string +//l:list_single_large_graphic_pane_t1 +// +#define qtn_apps_settings_list "General settings" + +//d:Application title for aif caption file +//d:Short string +//l:cell_app_pane_t1 +// +#define qtn_apps_settings_grid "Settings" + +//d:Application title for aif caption file +//d:Long string +//l:list_single_large_graphic_pane_t1 +// +#define qtn_apps_controlpanel_list "Control Panel" + +//d:Application title for aif caption file +//d:Short string +//l:cell_app_pane_t1 +// +#define qtn_apps_controlpanel_grid "Control Panel" + +//d:Text of a list item in Network setting list view's list +//d: Confirmation for Network mode selection operation. +//l: popup_note_window +//w: +//r: 3.1 +#define qtn_set_error_open_during_backuprestore "General Settings cannot be opened during backup/restore" + +//d:Text of a list item in Network setting list view's list +//d: Confirmation for Network mode selection operation. +//l: popup_note_window +//w: +//r: 5.0 +#define qtn_cp_error_open_during_backuprestore "Control Panel cannot be opened during backup/restore" + +// End of File + + diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/conf/s60settingsuis.confml Binary file gssettingsuis/Gs/conf/s60settingsuis.confml has changed diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/conf/s60settingsuis_101F877B.crml Binary file gssettingsuis/Gs/conf/s60settingsuis_101F877B.crml has changed diff -r 6263db170452 -r 8844afdb7529 gssettingsuis/Gs/gslauncher/src/GSLauncher.cpp --- a/gssettingsuis/Gs/gslauncher/src/GSLauncher.cpp Thu Apr 01 03:26:30 2010 +0800 +++ b/gssettingsuis/Gs/gslauncher/src/GSLauncher.cpp Thu Apr 01 03:28:45 2010 +0800 @@ -15,7 +15,7 @@ * */ -#include +#include // ======== MEMBER FUNCTIONS ======== diff -r 6263db170452 -r 8844afdb7529 layers.sysdef.xml --- a/layers.sysdef.xml Thu Apr 01 03:26:30 2010 +0800 +++ b/layers.sysdef.xml Thu Apr 01 03:28:45 2010 +0800 @@ -17,5 +17,11 @@ + + + + + + diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/conf/profilesengine.confml Binary file profilesservices/ProfileEngine/conf/profilesengine.confml has changed diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/conf/profilesengine_101F8798.crml Binary file profilesservices/ProfileEngine/conf/profilesengine_101F8798.crml has changed diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/group/ProfileEngine.mmp --- a/profilesservices/ProfileEngine/group/ProfileEngine.mmp Thu Apr 01 03:26:30 2010 +0800 +++ b/profilesservices/ProfileEngine/group/ProfileEngine.mmp Thu Apr 01 03:28:45 2010 +0800 @@ -61,7 +61,7 @@ USERINCLUDE . USERINCLUDE ../WrapperInc USERINCLUDE ../EngInc -APP_LAYER_SYSTEMINCLUDE + MW_LAYER_SYSTEMINCLUDE LIBRARY bafl.lib diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/group/ProfilesEngineExports.Inc --- a/profilesservices/ProfileEngine/group/ProfilesEngineExports.Inc Thu Apr 01 03:26:30 2010 +0800 +++ b/profilesservices/ProfileEngine/group/ProfilesEngineExports.Inc Thu Apr 01 03:28:45 2010 +0800 @@ -24,7 +24,7 @@ #ifndef PROFILESENGINEEXPORTS_INC #define PROFILESENGINEEXPORTS_INC - ../loc/Profile.loc MW_LAYER_LOC_EXPORT_PATH(Profile.loc) + ../loc/profile.loc MW_LAYER_LOC_EXPORT_PATH(profile.loc) // headers // for SDK diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/loc/Profile.loc --- a/profilesservices/ProfileEngine/loc/Profile.loc Thu Apr 01 03:26:30 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,195 +0,0 @@ -/* -* Copyright (c) 2002 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 a localisation file for Profiles Engine -* -*/ - - - -// LOCALISATION STRINGS - -//d: List of Profiles for user selection item #1 (in Profile Main dialog) -//l: navi_text_pane_t1 -#define qtn_mode_general "General" - -//d: List of Profiles for user selection item #2 -//l: navi_text_pane_t1 -#define qtn_mode_silent "Silent" - -//d: List of Profiles for user selection item #3 -//l: navi_text_pane_t1 -#define qtn_mode_meeting "Meeting" - -//d: List of Profiles for user selection item #4 -//l: navi_text_pane_t1 -#define qtn_mode_outdoor "Outdoor" - -//d: List of Profiles for user selection item #5 -//l: navi_text_pane_t1 -#define qtn_mode_pager "Pager" - -//d: List of Profiles for user selection item #6 -//l: navi_text_pane_t1 -#define qtn_mode_offline "Off-line" - -//d: List of Profiles for user selection item #7 -//l: navi_text_pane_t1 -//r: 2.8 -#define qtn_mode_drive "Drive" - -//d: List of Profiles for user selection item #n -//l: list_single_pane_t1_cp2 -#define qtn_profiles_new_profile "New profile" - -//d: Navi pane item #1 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_general "General" - -//d: Navi pane item #2 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_silent "Silent" - -//d: Navi pane item #3 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_meeting "Meeting" - -//d: Navi pane item #4 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_outdoor "Outdoor" - -//d: Navi pane item #5 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_pager "Pager" - -//d: Navi pane item #6 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_offline "Off-line" - -//d: Navi pane item #7 in Profile Personalization view -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_mode_drive "Drive" - -//d: Navi pane item in Profile Personalization view for user-created profile -//d: This string may be appended with 4-character string "(nn)", where nn is a -//d: number between 01 and 19, if there are more than 1 user-created profiles -//d: and user hasn't renamed them. -//l: tabs_3_long_active_pane_t1 -//r: 3.1 -#define qtn_navi_profiles_new_profile "New profile" - -//d: Navi pane item for Profile with ID 0 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_general "General" - -//d: Navi pane item for Profile with ID 1 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_silent "Silent" - -//d: Navi pane item for Profile with ID 2 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_meeting "Meeting" - -//d: Navi pane item for Profile with ID 3 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_outdoor "Outdoor" - -//d: Navi pane item for Profile with ID 4 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_pager "Pager" - -//d: Navi pane item for Profile with ID 5 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_offline "Off-line" - -//d: Navi pane item for Profile with ID 6 in Profiles Main View/Idle View -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_drive "Drive" - -//d: Navi pane item for user-created profiles in Profiles Main View/Idle View -//d: This string may be appended with 4-character string "(nn)", where nn is a -//d: number between 01 and 19, if there are more than 1 user-created profiles -//d: and user hasn't renamed them. -//l: navi_text_pane_t1 -//r: 3.2 -#define qtn_navi_mode_active_new_profile "New profile" - -//d: Title pane text for Profile with ID 0 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_general "General" - -//d: Title pane text for Profile with ID 1 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_silent "Silent" - -//d: Title pane text for Profile with ID 2 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_meeting "Meeting" - -//d: Title pane text for Profile with ID 3 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_outdoor "Outdoor" - -//d: Title pane text for Profile with ID 4 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_pager "Pager" - -//d: Title pane text for Profile with ID 5 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_offline "Off-line" - -//d: Title pane text for Profile with ID 6 in the setting pages opened from -//d: Personalisation view. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_drive "Drive" - -//d: Title pane text in the setting pages opened from Personalisation view. -//d: This string may be appended with 4-character string "(nn)", where nn is a -//d: number between 01 and 19, if there are more than 1 user-created profiles -//d: and user hasn't renamed them. -//l: title_pane_t2/opt9 -//r: 3.2 -#define qtn_mode_title_new_profile "New profile" - -//d: Confirmation note that is shown when a timed profile expires -//l: popup_note_window -#define qtn_profiles_confirm_timed_expired "Timed profile expired" - -// End of File diff -r 6263db170452 -r 8844afdb7529 profilesservices/ProfileEngine/loc/profile.loc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/profilesservices/ProfileEngine/loc/profile.loc Thu Apr 01 03:28:45 2010 +0800 @@ -0,0 +1,195 @@ +/* +* Copyright (c) 2002 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 a localisation file for Profiles Engine +* +*/ + + + +// LOCALISATION STRINGS + +//d: List of Profiles for user selection item #1 (in Profile Main dialog) +//l: navi_text_pane_t1 +#define qtn_mode_general "General" + +//d: List of Profiles for user selection item #2 +//l: navi_text_pane_t1 +#define qtn_mode_silent "Silent" + +//d: List of Profiles for user selection item #3 +//l: navi_text_pane_t1 +#define qtn_mode_meeting "Meeting" + +//d: List of Profiles for user selection item #4 +//l: navi_text_pane_t1 +#define qtn_mode_outdoor "Outdoor" + +//d: List of Profiles for user selection item #5 +//l: navi_text_pane_t1 +#define qtn_mode_pager "Pager" + +//d: List of Profiles for user selection item #6 +//l: navi_text_pane_t1 +#define qtn_mode_offline "Off-line" + +//d: List of Profiles for user selection item #7 +//l: navi_text_pane_t1 +//r: 2.8 +#define qtn_mode_drive "Drive" + +//d: List of Profiles for user selection item #n +//l: list_single_pane_t1_cp2 +#define qtn_profiles_new_profile "New profile" + +//d: Navi pane item #1 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_general "General" + +//d: Navi pane item #2 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_silent "Silent" + +//d: Navi pane item #3 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_meeting "Meeting" + +//d: Navi pane item #4 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_outdoor "Outdoor" + +//d: Navi pane item #5 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_pager "Pager" + +//d: Navi pane item #6 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_offline "Off-line" + +//d: Navi pane item #7 in Profile Personalization view +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_mode_drive "Drive" + +//d: Navi pane item in Profile Personalization view for user-created profile +//d: This string may be appended with 4-character string "(nn)", where nn is a +//d: number between 01 and 19, if there are more than 1 user-created profiles +//d: and user hasn't renamed them. +//l: tabs_3_long_active_pane_t1 +//r: 3.1 +#define qtn_navi_profiles_new_profile "New profile" + +//d: Navi pane item for Profile with ID 0 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_general "General" + +//d: Navi pane item for Profile with ID 1 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_silent "Silent" + +//d: Navi pane item for Profile with ID 2 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_meeting "Meeting" + +//d: Navi pane item for Profile with ID 3 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_outdoor "Outdoor" + +//d: Navi pane item for Profile with ID 4 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_pager "Pager" + +//d: Navi pane item for Profile with ID 5 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_offline "Off-line" + +//d: Navi pane item for Profile with ID 6 in Profiles Main View/Idle View +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_drive "Drive" + +//d: Navi pane item for user-created profiles in Profiles Main View/Idle View +//d: This string may be appended with 4-character string "(nn)", where nn is a +//d: number between 01 and 19, if there are more than 1 user-created profiles +//d: and user hasn't renamed them. +//l: navi_text_pane_t1 +//r: 3.2 +#define qtn_navi_mode_active_new_profile "New profile" + +//d: Title pane text for Profile with ID 0 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_general "General" + +//d: Title pane text for Profile with ID 1 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_silent "Silent" + +//d: Title pane text for Profile with ID 2 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_meeting "Meeting" + +//d: Title pane text for Profile with ID 3 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_outdoor "Outdoor" + +//d: Title pane text for Profile with ID 4 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_pager "Pager" + +//d: Title pane text for Profile with ID 5 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_offline "Off-line" + +//d: Title pane text for Profile with ID 6 in the setting pages opened from +//d: Personalisation view. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_drive "Drive" + +//d: Title pane text in the setting pages opened from Personalisation view. +//d: This string may be appended with 4-character string "(nn)", where nn is a +//d: number between 01 and 19, if there are more than 1 user-created profiles +//d: and user hasn't renamed them. +//l: title_pane_t2/opt9 +//r: 3.2 +#define qtn_mode_title_new_profile "New profile" + +//d: Confirmation note that is shown when a timed profile expires +//l: popup_note_window +#define qtn_profiles_confirm_timed_expired "Timed profile expired" + +// End of File