--- a/gssettingsuis/Gs/GSAdminPlugin/data/GSAdminPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAdminPlugin/data/GSAdminPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <avkon.mbg>
#include <avkon.rsg>
#include <eikcore.rsg>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <uikon.rh>
// CONSTANTS
--- a/gssettingsuis/Gs/GSAdminPlugin/src/GSAdminPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAdminPlugin/src/GSAdminPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -20,7 +20,7 @@
#include "GSAdminPlugin.h"
#include "GsLogger.h"
-#include <GSAdminPluginRsc.rsg>
+#include <gsadminpluginrsc.rsg>
#include <gsadminplugin.mbg>
// Includes from GS framework:
--- a/gssettingsuis/Gs/GSApplication/Data/GSApp_reg.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSApplication/Data/GSApp_reg.rss Tue May 25 13:00:04 2010 +0300
@@ -17,7 +17,7 @@
#include <appinfo.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <data_caging_paths_strings.hrh>
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -24,7 +24,7 @@
#include "GSMainContainer.h"
#include "gsplugininterface.h"
#include "GsLogger.h"
-#include <GSApp.rsg> // Resources for mainview
+#include <gsapp.rsg> // Resources for mainview
#include <aknlists.h>
#include <calslbs.h>
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Tue May 25 13:00:04 2010 +0300
@@ -23,7 +23,7 @@
#include "gsplugininterface.h"
#include "GSDocument.h"
#include "GSUi.h"
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <gsfwviewuids.h>
#include <aknlists.h>
--- a/gssettingsuis/Gs/GSApplication/Src/GSUi.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSApplication/Src/GSUi.cpp Tue May 25 13:00:04 2010 +0300
@@ -30,7 +30,7 @@
#include <AknsConstants.h> // For determining skin change
#include <barsread.h>
#include <StringLoader.h>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <eikenv.h>
#include <ConeResLoader.h>
#include <apgcli.h>
--- a/gssettingsuis/Gs/GSAppsPlugin/data/GSAppsPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAppsPlugin/data/GSAppsPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSAppsPlugin/src/GSAppsPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAppsPlugin/src/GSAppsPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <aknViewAppUi.h>
#include <ConeResLoader.h>
-#include <GSAppsPluginRsc.rsg>
+#include <gsappspluginrsc.rsg>
#include <gsfwviewuids.h>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
--- a/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -36,7 +36,7 @@
#include <BTSapDomainPSKeys.h>
#include <e32property.h>
#include <gsautokeyguardplugin.mbg>
-#include <GSAutoKeyguardPluginRsc.rsg>
+#include <gsautokeyguardpluginrsc.rsg>
#include <gsprivatepluginproviderids.h>
#include <gsmainview.h>
#include <gsbasecontainer.h>
--- a/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPluginAutoKeyguardSettingPage.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPluginAutoKeyguardSettingPage.cpp Tue May 25 13:00:04 2010 +0300
@@ -18,7 +18,7 @@
*/
#include <eikmenub.h>
-#include <GSAutoKeyguardPluginRsc.rsg>
+#include <gsautokeyguardpluginrsc.rsg>
#include <e32base.h>
#include <AknQueryDialog.h>
#include "GSAutoKeyguardPluginAutoKeyguardTimeQuery.h"
--- a/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSAutoKeyguardPlugin/Src/GSAutoKeyguardPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <featmgr.h>
#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
-#include <GSAutoKeyguardPluginRsc.rsg>
+#include <gsautokeyguardpluginrsc.rsg>
#include <gslistbox.h>
#include <AknsConstants.h>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Data/GSCallBarringPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Data/GSCallBarringPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <gs.loc>
#include <gscommon.hrh>
#include <gscommon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <appinfo.rh>
#include <avkon.loc>
#include <avkon.mbg>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -41,7 +41,7 @@
#include <aknViewAppUi.h>
#include <gscommon.hrh>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include <gscallbarringplugin.mbg>
#include <gsfwviewuids.h>
#include <gsprivatepluginproviderids.h>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include <aknlists.h>
#include <StringLoader.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include <csxhelp/cp.hlp.hrh>
#include <featmgr.h>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include <aknlists.h>
#include <StringLoader.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include "LocalViewIds.h"
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringView.cpp Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <hlplch.h> // For HlpLauncher
#include <e32base.h>
#include <featmgr.h>
-#include <GSCallBarringPluginRsc.rsg> //for resource IDs
+#include <gscallbarringpluginrsc.rsg> //for resource IDs
#include <exterror.h> //for extended error codes
#include <StringLoader.h> //for StringLoader
#include <PsetContainer.h> //for CPsetContainer
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSInternetBarringContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSInternetBarringContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <aknlists.h>
#include <StringLoader.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include <generalsettingsvariant.hrh>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSInternetBarringView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSInternetBarringView.cpp Tue May 25 13:00:04 2010 +0300
@@ -26,7 +26,7 @@
#include <e32base.h>
#include <featmgr.h>
-#include <GSCallBarringPluginRsc.rsg> //for resource IDs
+#include <gscallbarringpluginrsc.rsg> //for resource IDs
#include <gscommon.hrh>
#include <StringLoader.h> //for StringLoader
#include <aknradiobuttonsettingpage.h>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSLocalBaseView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSLocalBaseView.cpp Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <bldvariant.hrh>
#include <featmgr.h>
#include <gsbasecontainer.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
// CONSTANTS
#ifdef _DEBUG
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSMainBarringContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSMainBarringContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <aknlists.h>
#include <StringLoader.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include "GSMainBarringContainer.h"
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSMainBarringView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSMainBarringView.cpp Tue May 25 13:00:04 2010 +0300
@@ -20,7 +20,7 @@
#include <e32base.h>
#include <featmgr.h>
#include <StringLoader.h>
-#include <GSCallBarringPluginRsc.rsg>
+#include <gscallbarringpluginrsc.rsg>
#include "CallBarringPlugin.hrh" //for enumerations (e.g.TGSBarringSetting)
#include "GSMainBarringView.h" //for CGSSettListMainBarringView
#include "GSMainBarringContainer.h" //for CGSBaseContainer
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Data/GSCallDivertPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Data/GSCallDivertPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <gs.loc>
#include <gscommon.hrh>
#include <gscommon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <appinfo.rh>
#include <avkon.loc>
#include <avkon.mbg>
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "CallDivertPlugin.hrh"
#include <aknlists.h>
-#include <GSCallDivertPluginRsc.rsg>
+#include <gscalldivertpluginrsc.rsg>
#include <gslistbox.h>
#include <csxhelp/cp.hlp.hrh> // for help context of Divert
#include <gsfwviewuids.h> // for KUidGS
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <coeaui.h>
#include <hlplch.h> // For HlpLauncher
#include <aknViewAppUi.h>
-#include <GSCallDivertPluginRsc.rsg>
+#include <gscalldivertpluginrsc.rsg>
#include <gscalldivertplugin.mbg>
#include <StringLoader.h>
#include <featmgr.h>
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSCallDivertPluginContainer.h"
#include <aknlists.h>
-#include <GSCallDivertPluginRsc.rsg>
+#include <gscalldivertpluginrsc.rsg>
#include <featmgr.h>
#include <csxhelp/cp.hlp.hrh> // for help context of Divert
#include <gsfwviewuids.h> // for KUidGS
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertView.cpp Tue May 25 13:00:04 2010 +0300
@@ -41,7 +41,7 @@
#include <featmgr.h>
#include <gscommon.hrh>
#include <gsfwviewuids.h> // for restricted call forward
-#include <GSCallDivertPluginRsc.rsg>
+#include <gscalldivertpluginrsc.rsg>
#include <MPbk2ContactNameFormatter.h>
#include <MVPbkContactFieldData.h>
#include <MVPbkContactFieldTextData.h>
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSLocalBaseView.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSLocalBaseView.cpp Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <AknUtils.h>
#include <bldvariant.hrh>
#include <gsbasecontainer.h>
-#include <GSTelPluginRsc.rsg>
+#include <gstelpluginrsc.rsg>
//Disabling warning caused by KGSDoActivateError constant
#pragma diag_suppress 177
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSRestrictedDivertContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSRestrictedDivertContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "CallDivertPlugin.hrh"
#include <aknlists.h>
-#include <GSCallDivertPluginRsc.rsg>
+#include <gscalldivertpluginrsc.rsg>
#include <featmgr.h>
#include <csxhelp/cp.hlp.hrh> // for help context of Divert
#include <gslistbox.h>
--- a/gssettingsuis/Gs/GSCallPlugin/data/GSCallPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallPlugin/data/GSCallPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <gs.loc>
#include <gscommon.hrh>
#include <gscommon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <appinfo.rh>
#include <avkon.loc>
#include <avkon.mbg>
--- a/gssettingsuis/Gs/GSCallPlugin/src/GSCallPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallPlugin/src/GSCallPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -45,7 +45,7 @@
#include <secuisecurityhandler.h> //for PIN2 query
#include <secui.h> //for TSecUi
#include <secuisecuritysettings.h> //for CSecuritySettings
-#include <GSCallPluginRsc.rsg> //for resource IDs
+#include <gscallpluginrsc.rsg> //for resource IDs
#include <gscallplugin.mbg>
#include <gsfwviewuids.h>
#include <gslistbox.h> //for CGSListBoxItemTextArray
--- a/gssettingsuis/Gs/GSCallPlugin/src/GSCallPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSCallPlugin/src/GSCallPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <PsetCli.h> //for CPsetCli
#include <PsetSAObserver.h> //for CPsetSAObserver
#include <PsetCSP.h> //for CSP features
-#include <GSCallPluginRsc.rsg> //for resource IDs
+#include <gscallpluginrsc.rsg> //for resource IDs
#include <csxhelp/cp.hlp.hrh>
#include <featmgr.h>
#include <bldvariant.hrh>
--- a/gssettingsuis/Gs/GSConPlugin/data/GSConPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSConPlugin/data/GSConPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -30,7 +30,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSConPlugin/src/GSConPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSConPlugin/src/GSConPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsconplugin.mbg> // Icons
-#include <GSConPluginRsc.rsg>
+#include <gsconpluginrsc.rsg>
#include <gsfwviewuids.h>
#include <gsmainview.h>
#include <gsplugininterface.h>
--- a/gssettingsuis/Gs/GSDataCallPlugin/Data/GsDataCallPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDataCallPlugin/Data/GsDataCallPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -36,7 +36,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSDataCallPlugin/Src/GSDataCallPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDataCallPlugin/Src/GSDataCallPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -22,7 +22,7 @@
#include "GSDataCallPluginContainer.h"
#include "GsDataCallPlugin.hrh"
#include <gsdatacallplugin.mbg> // Icons
-#include <GsDataCallPluginRsc.rsg>
+#include <gsdatacallpluginrsc.rsg>
#include <gsfwviewuids.h>
#include <gsprivatepluginproviderids.h>
--- a/gssettingsuis/Gs/GSDataCallPlugin/Src/GSDataCallPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDataCallPlugin/Src/GSDataCallPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -22,7 +22,7 @@
#include "GsDataCallPlugin.hrh"
#include <bldvariant.hrh>
-#include <GsDataCallPluginRsc.rsg>
+#include <gsdatacallpluginrsc.rsg>
#include <aknlists.h>
#include <StringLoader.h>
#include <AknUtils.h>
--- a/gssettingsuis/Gs/GSDeviceManagementPlugin/data/GSDeviceManagementPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDeviceManagementPlugin/data/GSDeviceManagementPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSDeviceManagementPlugin/src/GSDeviceManagementPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDeviceManagementPlugin/src/GSDeviceManagementPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <gsdevicemanagementplugin.mbg> // Icons
-#include <GSDeviceManagementPluginRsc.rsg>
+#include <gsdevicemanagementpluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <csxhelp/cp.hlp.hrh>
--- a/gssettingsuis/Gs/GSDiagnosticsPlugin/data/GSDiagnosticsPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDiagnosticsPlugin/data/GSDiagnosticsPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSDiagnosticsPlugin/src/GSDiagnosticsPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDiagnosticsPlugin/src/GSDiagnosticsPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -20,7 +20,7 @@
#include "GSDiagnosticsPlugin.h"
#include <GSParentPlugin.h>
#include <GSCommon.hrh>
-#include <GSDiagnosticsPluginRsc.rsg> // GUI Resource
+#include <gsdiagnosticspluginrsc.rsg> // GUI Resource
#include <GSPrivatePluginProviderIds.h>
#include <GSFWViewUIDs.h>
#include "GSLogger.h"
--- a/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -37,7 +37,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <drmcommon.loc>
@@ -399,7 +399,8 @@
valuetype = EAknSliderValueBareFigure;
minlabel = qtn_sanim_time_out_slider_min_value;
maxlabel = qtn_sanim_time_out_slider_max_value;
- valuelabel = qtn_sanim_time_out_slider_cur_value;
+ valuelabel = qtn_sanim_time_out_slider_cur_value;
+ singular_valuelabel = qtn_sanim_time_out_slider_cur_value_singular;
}
//----------------------------------------------------
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -49,7 +49,7 @@
#include <MGFetch.h> // Image selection
#include <DRMCommon.h>
-#include <GsDisplayPluginRsc.rsg>
+#include <gsdisplaypluginrsc.rsg>
#include <gsprivatepluginproviderids.h>
#include <gsmainview.h>
#include <gsbasecontainer.h>
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -33,7 +33,7 @@
#include <AknUtils.h>
#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h> // for KUidGS
-#include <GsDisplayPluginRsc.rsg>
+#include <gsdisplaypluginrsc.rsg>
#include <gslistbox.h>
#include <AknsConstants.h> //for determining skin change
#include <AknDef.hrh>
--- a/gssettingsuis/Gs/GSDisplayPlugin/loc/GsDisplPlugin.loc Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/loc/GsDisplPlugin.loc Tue May 25 13:00:04 2010 +0300
@@ -129,6 +129,15 @@
//
#define qtn_sanim_time_out_slider_cur_value "%U minutes"
+//d:The singular text in setting list item's current value field
+//d:Screen saver time-out setting item
+//d:Current value
+//l:list_set_graphic_pane_t1
+//w:
+//r:5.2
+//
+#define qtn_sanim_time_out_slider_cur_value_singular "%U minute"
+
//d:Text in slider control
//d:Screen saver time-out setting page
--- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -20,7 +20,7 @@
#include <gsparentplugin.h>
#include <gsplugininterface.h>
#include "GsLogger.h"
-#include <GSParentPluginRsc.rsg>
+#include <gsparentpluginrsc.rsg>
#include <gsfwviewuids.h>
#include "GSBaseDocument.h"
#include <mgswatchdog.h>
@@ -859,7 +859,11 @@
//
void CGSParentContainer::RestoreListBoxPositionL( const CGSParentPlugin::TListBoxPosition& aPosition, TBool aScreenModeChanged )
{
- if ( aPosition.iCurrentItemIndex >= 0 )
+ if( iListBox->View()->BottomItemIndex()>= aPosition.iCurrentItemIndex )
+
+ {
+
+ if ( aPosition.iCurrentItemIndex >= 0 )
{
iListBox->SetCurrentItemIndex( aPosition.iCurrentItemIndex );
}
@@ -874,5 +878,6 @@
iListBox->View()->SetItemOffsetInPixels( aPosition.iItemOffsetInPixels );
iListBox->View()->SetTopItemIndex( aPosition.iTopItemIndex );
}
+ }
}
//End of File
--- a/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -23,7 +23,7 @@
#include <gsplugininterface.h>
#include "GsLogger.h"
#include <gscommon.hrh>
-#include <GSParentPluginRsc.rsg>
+#include <gsparentpluginrsc.rsg>
#include <gsfwviewuids.h>
#include <avkon.rsg>
--- a/gssettingsuis/Gs/GSGenPlugin/data/GSGenPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSGenPlugin/data/GSGenPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSGenPlugin/src/GSGenPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSGenPlugin/src/GSGenPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <gsgenplugin.mbg> // Icons
-#include <GSGenPluginRsc.rsg>
+#include <gsgenpluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <csxhelp/cp.hlp.hrh>
--- a/gssettingsuis/Gs/GSInstallationsPlugin/data/GSInstallationsPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSInstallationsPlugin/data/GSInstallationsPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSInstallationsPlugin/src/GSInstallationsPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSInstallationsPlugin/src/GSInstallationsPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <GSInstallationsPlugin.mbg> // Icons
-#include <GSInstallationsPluginRsc.rsg>
+#include <gsinstallationspluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <csxhelp/cp.hlp.hrh>
--- a/gssettingsuis/Gs/GSNetworkPlugin/Data/GsNetworkPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Data/GsNetworkPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <gs.loc>
#include <gscommon.hrh>
#include <gscommon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <appinfo.rh>
#include <avkon.loc>
#include <avkon.mbg>
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -50,7 +50,7 @@
#include <e32property.h>
#include <PSVariables.h>
-#include <GsNetworkPluginRsc.rsg> //for resource IDs
+#include <gsnetworkpluginrsc.rsg> //for resource IDs
#include <gsfwviewuids.h>
#include <gslistbox.h> //for CGSListBoxItemTextArray
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
#include <aknnotewrappers.h> //for AknErrorNote
#include <aknappui.h> //for iAvkonAppUi
#include <StringLoader.h> //for StringLoader
-#include <GsNetworkPluginRsc.rsg> //for resource IDs
+#include <gsnetworkpluginrsc.rsg> //for resource IDs
#include <PsetContainer.h> //for CPsetContainer
#include <PsetNetwork.h> //for CPsetNetwork
#include <gslistbox.h> //for listbox classes
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginModel.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginModel.cpp Tue May 25 13:00:04 2010 +0300
@@ -39,7 +39,7 @@
#include <PsetContainer.h>
#include <PsetSAObserver.h> //ongoing call check
#include "GSNetworkDebugHelper.h"
-#include <GsNetworkPluginRsc.rsg> //for resource IDs
+#include <gsnetworkpluginrsc.rsg> //for resource IDs
#include <mmtsy_names.h>
//CONSTANTS
// default value for autolock period
--- a/gssettingsuis/Gs/GSOpticalJoystickPlugin/Data/GSOpticalJoystickPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSOpticalJoystickPlugin/Data/GSOpticalJoystickPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -35,7 +35,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSOpticalJoystickPlugin/Src/GSOpticalJoystickPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSOpticalJoystickPlugin/Src/GSOpticalJoystickPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -22,7 +22,7 @@
#include "GSOpticalJoystickPlugin.hrh"
#include "GsLogger.h"
#include <gsopticaljoystickplugin.mbg> // Icons
-#include <GSOpticalJoystickPluginRsc.rsg>
+#include <gsopticaljoystickpluginrsc.rsg>
#include <gsfwviewuids.h>
#include <gsprivatepluginproviderids.h>
--- a/gssettingsuis/Gs/GSOpticalJoystickPlugin/Src/GSOpticalJoystickPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSOpticalJoystickPlugin/Src/GSOpticalJoystickPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSOpticalJoystickPlugin.hrh"
#include "GsLogger.h"
#include <bldvariant.hrh>
-#include <GSOpticalJoystickPluginRsc.rsg>
+#include <gsopticaljoystickpluginrsc.rsg>
#include <centralrepository.h>
#include <aknlists.h>
#include <StringLoader.h>
--- a/gssettingsuis/Gs/GSPDataAccessPointPlugin/data/GSPDataAccessPointPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataAccessPointPlugin/data/GSPDataAccessPointPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPDataAccessPointPlugin/src/GSPDataAccessPointPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataAccessPointPlugin/src/GSPDataAccessPointPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSPDataAccessPointModel.h"
#include <gsparentplugin.h>
#include <gscommon.hrh>
-#include <GSPDataAccessPointPluginRsc.rsg> // GUI Resource
+#include <gspdataaccesspointpluginrsc.rsg> // GUI Resource
#include <gsprivatepluginproviderids.h>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSPDataConnectionPlugin/data/GSPDataConnectionPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataConnectionPlugin/data/GSPDataConnectionPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPDataConnectionPlugin/src/GSPDataConnectionPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataConnectionPlugin/src/GSPDataConnectionPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSPDataConnectionModel.h"
#include <gsparentplugin.h>
#include <gscommon.hrh>
-#include <GSPDataConnectionPluginRsc.rsg> // GUI Resource
+#include <gspdataconnectionpluginrsc.rsg> // GUI Resource
#include <gsprivatepluginproviderids.h>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSPDataHSDPAPlugin/data/GSPDataHSDPAPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataHSDPAPlugin/data/GSPDataHSDPAPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPDataHSDPAPlugin/src/GSPDataHSDPAPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataHSDPAPlugin/src/GSPDataHSDPAPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSPDataHSDPAModel.h"
#include <gsparentplugin.h>
#include <gscommon.hrh>
-#include <GSPDataHSDPAPluginRsc.rsg> // GUI Resource
+#include <gspdatahsdpapluginrsc.rsg> // GUI Resource
#include <gsprivatepluginproviderids.h>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSPDataPlugin/Data/GSPDataPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataPlugin/Data/GSPDataPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPDataPlugin/Src/GSPDataPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataPlugin/Src/GSPDataPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <gspdataplugin.mbg> // Icons
-#include <GSPDataPluginRsc.rsg>
+#include <gspdatapluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <conset.hlp.hrh>
--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Data/GSPowerSavingQueryPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Data/GSPowerSavingQueryPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -23,7 +23,7 @@
#include "GSPowerSavingQueryPlugin.hrh"
#include "GsLogger.h"
#include <GSPowerSavingQueryPlugin.mbg> // icons
-#include <GSPowerSavingQueryPluginRsc.rsg>
+#include <gspowersavingquerypluginrsc.rsg>
#include <gsfwviewuids.h>
#include <gsprivatepluginproviderids.h>
#include <aknradiobuttonsettingpage.h>
--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPluginContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPluginContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GSPowerSavingQueryPluginModel.h"
#include "GSPowerSavingQueryPlugin.hrh"
#include "GsLogger.h"
-#include <GSPowerSavingQueryPluginRsc.rsg>
+#include <gspowersavingquerypluginrsc.rsg>
#include <aknlists.h>
#include <StringLoader.h>
#include <AknUtils.h>
--- a/gssettingsuis/Gs/GSPrslnPlugin/data/GSPrslnPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPrslnPlugin/data/GSPrslnPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <avkon.mbg>
#include <avkon.rsg>
#include <eikcore.rsg>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <uikon.rh>
// CONSTANTS
--- a/gssettingsuis/Gs/GSPrslnPlugin/src/GSPrslnPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSPrslnPlugin/src/GSPrslnPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -20,7 +20,7 @@
#include "GSPrslnPlugin.h"
#include "GSLogger.h"
-#include <GSPrslnPluginRsc.rsg>
+#include <gsprslnpluginrsc.rsg>
#include <GSPrslnPlugin.mbg>
// Includes from GS framework:
--- a/gssettingsuis/Gs/GSSecurityPlugin/Data/GSSecurityPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSSecurityPlugin/Data/GSSecurityPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <avkon.rsg>
#include <eikcore.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSSecurityPlugin/Src/GSSecurityPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSSecurityPlugin/Src/GSSecurityPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -30,7 +30,7 @@
#include <gsprivatepluginproviderids.h>
// Plugin includes:
-#include <GSSecurityPluginRsc.rsg>
+#include <gssecuritypluginrsc.rsg>
#include <gssecplugin.mbg>
#include <csxhelp/cp.hlp.hrh>
#include <featmgr.h>
--- a/gssettingsuis/Gs/GSSynchronisationPlugin/data/GSSynchronisationPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSSynchronisationPlugin/data/GSSynchronisationPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -29,7 +29,7 @@
#include <eikcore.rsg>
#include <eikon.rsg>
#include <uikon.rh>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
// CONSTANTS
--- a/gssettingsuis/Gs/GSSynchronisationPlugin/src/GSSynchronisationPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSSynchronisationPlugin/src/GSSynchronisationPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <gssynchronisationplugin.mbg> // Icons
-#include <GSSynchronisationPluginRsc.rsg>
+#include <gssynchronisationpluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <gstabhelper.h>
--- a/gssettingsuis/Gs/GSTelPlugin/Data/GSTelPluginRsc.rss Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSTelPlugin/Data/GSTelPluginRsc.rss Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
#include <avkon.mbg>
#include <avkon.rsg>
#include <eikcore.rsg>
-#include <GSApp.rsg>
+#include <gsapp.rsg>
#include <uikon.rh>
// CONSTANTS
--- a/gssettingsuis/Gs/GSTelPlugin/Src/GSTelPlugin.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/GSTelPlugin/Src/GSTelPlugin.cpp Tue May 25 13:00:04 2010 +0300
@@ -21,7 +21,7 @@
#include "GsLogger.h"
#include <gsfwviewuids.h>
#include <gstelplugin.mbg> // Icons
-#include <GSTelPluginRsc.rsg>
+#include <gstelpluginrsc.rsg>
#include <gsmainview.h>
#include <gsprivatepluginproviderids.h>
#include <csxhelp/cp.hlp.hrh>
--- a/gssettingsuis/Gs/tsrc/public/basic/GSListBox/T_GSListBox.cpp Tue May 11 16:28:56 2010 +0300
+++ b/gssettingsuis/Gs/tsrc/public/basic/GSListBox/T_GSListBox.cpp Tue May 25 13:00:04 2010 +0300
@@ -26,7 +26,7 @@
#include <barsread.h> //TResourceReader
#include <coemain.h>
#include <AknRadioButtonSettingPage.h>
-#include <GsNetworkPluginRsc.rsg> //for resource IDs
+#include <gsnetworkpluginrsc.rsg> //for resource IDs
// INTERNAL INCLUDES
--- a/profilesservices/FileList/Src/CFLDDRMImplementationCommon.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDDRMImplementationCommon.cpp Tue May 25 13:00:04 2010 +0300
@@ -27,7 +27,7 @@
// EXTERNAL INCLUDES
#include <aknnotewrappers.h>
#include <StringLoader.h>
-#include <FileList.rsg>
+#include <filelist.rsg>
#include <MProfilesLocalFeatures.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/FileList/Src/CFLDFileListContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDFileListContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -37,7 +37,7 @@
// EXTERNAL INCLUDES
#include <ConeResLoader.h>
#include <StringLoader.h>
-#include <FileList.rsg>
+#include <filelist.rsg>
#include <featmgr.h>
#include <pathinfo.h>
#include <centralrepository.h>
@@ -304,6 +304,7 @@
}
}
+ popup->ListBox()->DisableSingleClick(ETrue);
TBool result = popup->ExecuteLD();
// Note, CAknPopupList must NOT be popped out
// before ExecuteLD (like dialogs do) but after.
--- a/profilesservices/FileList/Src/CFLDFileListModel.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDFileListModel.cpp Tue May 25 13:00:04 2010 +0300
@@ -48,7 +48,7 @@
#include <coemain.h> // CCoeEnv
#include <pathinfo.h>
#include <data_caging_path_literals.hrh> // For KDC_RESOURCE_FILES_DIR
-#include <FileList.rsg> // For R_FLD_WAIT_NOTE
+#include <filelist.rsg> // For R_FLD_WAIT_NOTE
#include <bautils.h> // For BaflUtils
#include <apgcli.h> // For RApaLsSession
#include <aknnotewrappers.h>
--- a/profilesservices/FileList/Src/CFLDPlayerBase.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDPlayerBase.cpp Tue May 25 13:00:04 2010 +0300
@@ -28,7 +28,7 @@
// EXTERNAL INCLUDES
#include <aknnotewrappers.h> // CAknErrorNote
#include <StringLoader.h>
-#include <FileList.rsg>
+#include <filelist.rsg>
#include <centralrepository.h>
#include <hwrmvibrasdkcrkeys.h>
#include <e32property.h>
--- a/profilesservices/FileList/Src/CFLDSoftKeyChanger.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDSoftKeyChanger.cpp Tue May 25 13:00:04 2010 +0300
@@ -25,7 +25,7 @@
#include <f32file.h> // For TParsePtrC
#include <StringLoader.h>
#include <eikbtgpc.h> // For CEikButtonGroupContainer
-#include <FileList.rsg> // For R_FLD_SOFTKEYS_PREVIEW_CANCEL
+#include <filelist.rsg> // For R_FLD_SOFTKEYS_PREVIEW_CANCEL
#include <avkon.rsg> // For R_AVKON_SOFTKEYS_SELECT_CANCEL
#include <avkon.hrh> // For EAknSoftkeySelect
--- a/profilesservices/FileList/tsrc/public/basic/src/T_CFLDFileListContainer.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/FileList/tsrc/public/basic/src/T_CFLDFileListContainer.cpp Tue May 25 13:00:04 2010 +0300
@@ -24,7 +24,7 @@
#include <TEUnitAssertionInfo.h>
#include <CEUnitAllocTestCaseDecorator.h>
#include <coemain.h>
-#include <FLDTest.rsg>
+#include <fldtest.rsg>
#include "FLDTestConst.h"
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp Tue May 25 13:00:04 2010 +0300
@@ -52,6 +52,7 @@
#include <mediafilelist.rsg>
#include <mediafilelist.mbg>
#include <data_caging_path_literals.hrh> // KDC_APP_RESOURCE_DIR
+#include <touchfeedback.h> // For MTouchFeedback
@@ -1360,6 +1361,15 @@
if ( folderId != KErrNotFound && aAttr != EAttrSelect )
{
+ // Request vibra feedback when open the folder.
+ MTouchFeedback* feedback = MTouchFeedback::Instance();
+ if ( feedback )
+ {
+ TTouchLogicalFeedback logicalType = ETouchFeedbackList;
+ TTouchFeedbackType type = ETouchFeedbackVibra;
+ feedback->InstantFeedback( this, logicalType, type, TPointerEvent() );
+ }
+
iBuf = KNullDesC;
// selected list item is folder
if ( !isPersistent )
--- a/profilesservices/MediaFileList/group/MediaFileList.mmp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/MediaFileList/group/MediaFileList.mmp Tue May 25 13:00:04 2010 +0300
@@ -95,6 +95,7 @@
LIBRARY servicehandler.lib // CAiwGenericParamList
LIBRARY browserlauncher.lib // CBrowserLauncher
LIBRARY CommonUI.lib // CDocumentHandler
+LIBRARY touchfeedback.lib // MTouchFeedback
DEBUGLIBRARY flogger.lib
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Tue May 25 13:00:04 2010 +0300
@@ -26,7 +26,7 @@
#include <DRMCommon.h>
#include <sysutil.h>
-#include <ProfileEng.rsg>
+#include <profileeng.rsg>
#include <TProfileToneSettings.h>
#include <MProfileTones.h>
#include "CProfilesNamesArrayImpl.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Tue May 25 13:00:04 2010 +0300
@@ -26,7 +26,7 @@
#include <sysutil.h>
#include <accessoriescrkeys.h>
-#include <ProfileEng.rsg>
+#include <profileeng.rsg>
#include <TProfileToneSettings.h>
#include <MProfileTones.h>
#include "CProfilesNamesArrayImpl.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Tue May 25 13:00:04 2010 +0300
@@ -23,7 +23,7 @@
#include <centralrepository.h>
#include <bautils.h>
#include <barsc.h>
-#include <ProfileEng.rsg>
+#include <profileeng.rsg>
#include <ProfileEng.hrh>
#include <ProfileEngineConstants.h>
#include "ProfileEnginePrivateCRKeys.h"
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Tue May 25 13:00:04 2010 +0300
@@ -32,7 +32,7 @@
#include <aknSDData.h>
#include <featmgr.h>
-#include <ProfileScheduleEvent.rsg>
+#include <profilescheduleevent.rsg>
#include "ProfileEnginePrivateCRKeys.h"
#include <ProfileEngineConstants.h>
#include "ProfilesDebug.h"
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Tue May 25 13:00:04 2010 +0300
@@ -27,20 +27,7 @@
#include "CProEngProfileImpl.h"
#include "CProEngToneHandler.h"
#include "CProEngProfileNameArrayImpl.h"
-#include <ProEngWrapper.rsg>
-#include <ConeResLoader.h>
-#include <startupdomainpskeys.h>
-#include <StringLoader.h>
-#include <AknQueryDialog.h>
-#include <aknnotewrappers.h>
-#include <barsc.h> // RResourceFile
-#include <bautils.h> // BaflUtils
-namespace
- {
- // The filename of the resource file
- _LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" );
- }
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
@@ -60,8 +47,6 @@
{
iProfileEngine = CreateProfileEngineExtendedL();
iToneHandler = CProEngToneHandler::NewL();
- iFs = new ( ELeave ) RFs;
- User::LeaveIfError( iFs->Connect() );
}
// -----------------------------------------------------------------------------
@@ -140,8 +125,6 @@
iProfileEngine->Release();
}
delete iToneHandler;
- iFs->Close();
- delete iFs;
}
// -----------------------------------------------------------------------------
@@ -205,45 +188,10 @@
// CProEngEngineImpl::SetActiveProfileL
// -----------------------------------------------------------------------------
//
-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;
- User::LeaveIfError( simStatus.Attach(KPSUidStartup, KPSSimStatus ) );
- User::LeaveIfError( simStatus.Get( simCStatus ) );
- simStatus.Close();
-
- TParse* fp = new ( ELeave ) TParse();
- fp->Set( KProEngResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL );
- TFileName localizedFileName( fp->FullName() );
- delete fp;
-
- BaflUtils::NearestLanguageFile( *iFs, localizedFileName );
- RConeResourceLoader resourceLoader( *CCoeEnv::Static() );
- TRAP_IGNORE( resourceLoader.OpenL( localizedFileName ) );
-
- if ( simCStatus == ESimNotPresent )
- {
- // SIM card does not exist.
- HBufC* infoNoteText = StringLoader::LoadLC(
- R_PROFILE_TEXT_INSERT_SIM );
- CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
- note->ExecuteLD( *infoNoteText );
- CleanupStack::PopAndDestroy( infoNoteText );
- resourceLoader.Close();
- return;
- }
- resourceLoader.Close();
- }
-
- iProfileEngine->SetActiveProfileL(aId);
- }
+void CProEngEngineImpl::SetActiveProfileL( TInt aId )
+ {
+ iProfileEngine->SetActiveProfileL( aId );
+ }
// -----------------------------------------------------------------------------
// CProEngEngineImpl::ProfileLC
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.h Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.h Tue May 25 13:00:04 2010 +0300
@@ -174,8 +174,6 @@
// Own: tone handler for DRM checkups etc.
CProEngToneHandler* iToneHandler;
- // File server session
- RFs* iFs;
};
#endif // CPROENGENGINEIMPL_H
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandlerDrmFull.cpp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandlerDrmFull.cpp Tue May 25 13:00:04 2010 +0300
@@ -22,7 +22,7 @@
#include <DRMHelper.h>
#include <DRMCommon.h>
-#include <ProEngWrapper.rsg>
+#include <proengwrapper.rsg>
#include <caf/caf.h>
--- a/profilesservices/ProfileEngine/WrapperSrc/ProEngWrapper.rss Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/ProEngWrapper.rss Tue May 25 13:00:04 2010 +0300
@@ -24,9 +24,6 @@
// INCLUDES
#include <eikon.rh>
#include <drmcommon.loc>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.loc>
// CONSTANTS
// MACROS
@@ -50,12 +47,4 @@
//
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
--- a/profilesservices/ProfileEngine/group/ProfileEngine.mmp Tue May 11 16:28:56 2010 +0300
+++ b/profilesservices/ProfileEngine/group/ProfileEngine.mmp Tue May 25 13:00:04 2010 +0300
@@ -75,11 +75,7 @@
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