--- a/gsprofilesrv_plat/settings_plugin_api/inc/GSPluginInterface.h Wed Sep 15 12:30:49 2010 +0300
+++ b/gsprofilesrv_plat/settings_plugin_api/inc/GSPluginInterface.h Wed Oct 13 14:51:53 2010 +0300
@@ -20,7 +20,7 @@
#define GSPLUGININTERFACE_H
// System includes
-#include <gsframeworkrsc.rsg> // For default icons
+#include <GSFrameworkRsc.rsg> // For default icons
#include <gsfwicon.mbg>
#include <aknview.h>
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/inc/SettingsPluginApiTest.h Wed Sep 15 12:30:49 2010 +0300
+++ b/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/inc/SettingsPluginApiTest.h Wed Oct 13 14:51:53 2010 +0300
@@ -24,7 +24,7 @@
#include <TestScripterInternal.h>
#include <StifTestModule.h>
#include <TestclassAssert.h>
-#include <AknServerApp.h>
+#include <aknserverapp.h>
#include <GSPluginInterface.h>
#include "TestGSPlugin.h"
--- a/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Wed Sep 15 12:30:49 2010 +0300
+++ b/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Wed Oct 13 14:51:53 2010 +0300
@@ -309,15 +309,6 @@
const TUint32 KSettingsOpticalJoystickStatus = 0x00000019;
/**
-* To save active / deactive Handwriting input methods when you click editor
-* Integer value.
-* Default value: 1
-* 0 = Simple HWR will not be opened when user click editor.
-* 1 = Simple HWR will be opened when user click editor.
-*/
-const TUint32 KSettingsSimpleHWR = 0x0000001A;
-
-/**
* Telephony settings CR UID.
*/
const TUid KCRUidTelephonySettings = {0x101F877E};
--- a/gssettingsuis/Gs/GSCallPlugin/inc/GSCallPluginContainer.h Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSCallPlugin/inc/GSCallPluginContainer.h Wed Oct 13 14:51:53 2010 +0300
@@ -28,7 +28,7 @@
#include <ConeResLoader.h>
#include <StringLoader.h>
#include <bautils.h>
-#include <softreject.rsg>
+#include <SoftReject.rsg>
#include <gsbasecontainer.h>
#include <gssettingid.h>
--- a/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Wed Oct 13 14:51:53 2010 +0300
@@ -353,9 +353,8 @@
//
//----------------------------------------------------
//
-RESOURCE SLIDER_WITH_FEEDBACK_STYLE r_ambient_light_sensor_slider
+RESOURCE SLIDER r_ambient_light_sensor_slider
{
- feedbackstyle = EAknSliderFbDynamic;
layout = EAknSettingsItemSliderLayoutWithGraphics;
minvalue = 1;
maxvalue = 5;
@@ -391,9 +390,8 @@
//
//----------------------------------------------------
//
-RESOURCE SLIDER_WITH_FEEDBACK_STYLE r_setting_screen_saver_slider
+RESOURCE SLIDER r_setting_screen_saver_slider
{
- feedbackstyle = EAknSliderFbDynamic;
layout = EAknSettingsItemSliderLayout;
minvalue = 1;
maxvalue = 30;
@@ -431,9 +429,8 @@
//
//----------------------------------------------------
//
-RESOURCE SLIDER_WITH_FEEDBACK_STYLE r_setting_backlight_slider
+RESOURCE SLIDER r_setting_backlight_slider
{
- feedbackstyle = EAknSliderFbDynamic;
layout = EAknSettingsItemSliderLayout;
minvalue = 5;
maxvalue = 60;
--- a/gssettingsuis/Gs/GSNetworkPlugin/Data/GsNetworkPluginRsc.rss Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Data/GsNetworkPluginRsc.rss Wed Oct 13 14:51:53 2010 +0300
@@ -483,12 +483,6 @@
{
iconId = EMbmGsnetworkpluginQgn_prop_network_2g;
maskId = EMbmGsnetworkpluginQgn_prop_network_2g_mask;
- },
- // forbidden operator icon
- AKN_ICON
- {
- iconId = EMbmGsnetworkpluginQgn_prop_nfc_sess_closed;
- maskId = EMbmGsnetworkpluginQgn_prop_nfc_sess_closed_mask;
}
};
}
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -75,10 +75,7 @@
_LIT( KGSNetWCDMAIcon, "0\t" );
_LIT( KGSNetGSMIcon, "1\t" );
_LIT( KEmptyStr, "" );
-/* Implementation of forbidden operator icon begins */
-_LIT( KGSNetNoIcon, "\t");
-_LIT( KGSNetForbiddenIcon, "2\t" );
-/* Implementation of forbidden operator icon ends */
+
// Warning disabled as this constant is used inside __ASSERT_DEBUG
#pragma diag_suppress 177
_LIT( KGSNetworkPluginAssertName, "CGSNetworkPlugin" );
@@ -315,30 +312,23 @@
TBool showGraphicalList =
Container()->NetPluginModel()->GraphicalNetworkListSupportedL();
__GSLOGSTRING1("[GS] NetworkListL: showGraphicalList: %d", showGraphicalList);
-
+
//if no net items were found, do not show list
if ( iNetworkArray->Count() > 0 )
{
- /** Implementation of forbidden operator icon begins */
- // check if forbidden operator icon is supported
- TBool forbiddenOperator =
- FeatureManager::FeatureSupported( KFeatureIdFfTdScdmaForbiddenoperatoricondisplay );
- /** Implementation of forbidden operator icon ends */
while ( !iApprovedNetwork )
{
AknPopupListEmpty<CEikFormattedCellListBox>* list;
- /** Implementation of forbidden operator icon begins */
- if (forbiddenOperator || showGraphicalList
- && FeatureManager::FeatureSupported(KFeatureIdProtocolWcdma))
+ if ( showGraphicalList &&
+ FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma ) )
{
- list = new (ELeave) CAknSingleGraphicPopupMenuStyleListBox;
+ list = new ( ELeave ) CAknSingleGraphicPopupMenuStyleListBox;
}
else
{
- list = new (ELeave) CAknSinglePopupMenuStyleListBox;
+ list = new ( ELeave ) CAknSinglePopupMenuStyleListBox;
}
- /** Implementation of forbidden operator icon ends */
-
+
CleanupStack::PushL( list );
if ( iNetworkPopupList )
{
@@ -399,20 +389,8 @@
__GSLOGSTRING1("[GS] NetworkListL: Network Longname: %S", insertString);
}
- /** Implementation of forbidden operator icon begins */
//set icon for network
- if ( forbiddenOperator )
- {
- if ( info.iStatus == MPsetNetworkSelect::ENetStatForbidden )
- {
- insertString->Des().Insert( 0, KGSNetForbiddenIcon );
- }
- else
- {
- insertString->Des().Insert( 0, KGSNetNoIcon );
- }
- }
- else if ( showGraphicalList )
+ if ( showGraphicalList )
{
if ( FeatureManager::FeatureSupported(
KFeatureIdProtocolWcdma ) )
@@ -428,7 +406,6 @@
}
}
}
- /** Implementation of forbidden operator icon ends */
items->AppendL( *insertString );
CleanupStack::PopAndDestroy();
}
@@ -450,8 +427,7 @@
// Setup graphic items list for dual mode nw selection listbox
// based on the local variation
- /** Implementation of forbidden operator icon begins */
- if ( forbiddenOperator || showGraphicalList )
+ if ( showGraphicalList )
{
CAknIconArray* iconList = new (ELeave) CAknIconArray( 10 );
CleanupStack::PushL( iconList );
@@ -459,7 +435,7 @@
list->ItemDrawer()->ColumnData()->SetIconArray( iconList );
CleanupStack::Pop( iconList ); //listbox model now owns this
}
- /** Implementation of forbidden operator icon ends */
+
TInt res = 0;
if( items->Count() )
{
--- a/gssettingsuis/Gs/GSNetworkPlugin/bld.inf Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/bld.inf Wed Oct 13 14:51:53 2010 +0300
@@ -42,8 +42,7 @@
OPTION HEADERFILE gsnetworkplugin.mbg
OPTION SOURCES \
-c8,8 qgn_prop_set_network_sub -c8,8 qgn_prop_set_network_sub_offline -c8,8 qgn_prop_set_network_tab4 \
- -c8,1 qgn_prop_network_3g -c8,1 qgn_prop_network_2g \
- -c8,8 qgn_prop_nfc_sess_closed
+ -c8,1 qgn_prop_network_3g -c8,1 qgn_prop_network_2g
END
--- a/gssettingsuis/Gs/GSPDataAccessPointPlugin/src/GSPDataAccessPointPlugin.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSPDataAccessPointPlugin/src/GSPDataAccessPointPlugin.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -207,11 +207,11 @@
if ( iModel->GetDialupAPNameL( ptrBuffer ) != KErrNone
|| ptrBuffer.Length() == 0 )
{
- CleanupStack::PopAndDestroy( name );
- dynamicText = iEikonEnv->AllocReadResourceLC( R_DIALUP_AP_NAME_NONE );
+ dynamicText = iEikonEnv->AllocReadResourceL( R_DIALUP_AP_NAME_NONE );
}
- aValue.Copy( *dynamicText );
- CleanupStack::PopAndDestroy( dynamicText );
+ TPtr bufPtr( dynamicText->Des() );
+ aValue.Copy( *dynamicText );
+ CleanupStack::PopAndDestroy( name );
}
Binary file gssettingsuis/Gs/conf/s60settingsuis.confml has changed
Binary file gssettingsuis/Gs/conf/s60settingsuis_101F877C.crml has changed
Binary file gssettingsuis/Gs/conf/s60settingsuis_2002120B.crml has changed
Binary file gssettingsuis/Gs/help/data/xhtml.zip has changed
--- a/gssettingsuis/Gs/help/inc/cp.hlp.hrh Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/help/inc/cp.hlp.hrh Wed Oct 13 14:51:53 2010 +0300
@@ -126,5 +126,4 @@
_LIT(KPREDINPUT_HLP_SHORTCUT, "PREDINPUT_HLP_SHORTCUT"); //
_LIT(KPREDINPUT_HLP_INPUT, "PREDINPUT_HLP_INPUT"); //
_LIT(KPREDINPUT_HLP_INPUT_SETTINGS, "PREDINPUT_HLP_INPUT_SETTINGS"); //
-_LIT(KPREDINPUT_HLP_VIRT_ITI_SETT, "PREDINPUT_HLP_VIRT_ITI_SETT"); //
#endif
\ No newline at end of file
--- a/profilesservices/FileList/Src/CFLDDRMImplementation.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/FileList/Src/CFLDDRMImplementation.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -26,7 +26,7 @@
// EXTERNAL INCLUDES
#include <DRMCommon.h>
#include <DRMHelper.h>
-#include <filelist.rsg>
+#include <FileList.rsg>
#include <MProfilesLocalFeatures.h>
#include <MProfileUtilitySingleton.h>
--- a/profilesservices/MediaFileList/Inc/mediafiledialog.h Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Inc/mediafiledialog.h Wed Oct 13 14:51:53 2010 +0300
@@ -307,12 +307,7 @@
void ShowDetailsPopupL();
void GetPopupText( CMediaFileData* aData, TDes& aText );
TBool MatchFound( const TDesC& aAttribute, const TDesC& aText );
-
- /**
- * Filters the invalid files from media file handler.
- * @return None.
- */
- void FilterInvalidFiles();
+
private:
static void Panic( TInt aReason );
--- a/profilesservices/MediaFileList/Inc/mediafilehandler.h Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Inc/mediafilehandler.h Wed Oct 13 14:51:53 2010 +0300
@@ -228,13 +228,6 @@
void GetAttribute( TInt aIndex, TInt aAttr, TDes& aValue, TInt aQueryId );
CMediaFileData* ReadMediaFileDataL( TInt aId );
void CancelQuery();
-
- /**
- * Remove an item from list of search reuslt
- * @param aIndex Search list's index.
- * @return None.
- */
- void Remove( TInt aIndex );
public:
TInt ItemIndex( const TDesC& aItemText, TInt aIndex );
@@ -496,13 +489,6 @@
void SetSearchId( TInt aId );
TInt SearchId();
- /**
- * Remove an item from the list of search results.
- * @param aIndex List's index.
- * @return None.
- */
- void Remove( TInt aIndex );
-
public:
TInt ItemIndex( TInt aId );
TInt ItemIndex( const TDesC& aText );
--- a/profilesservices/MediaFileList/Inc/mediafileprotection.h Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Inc/mediafileprotection.h Wed Oct 13 14:51:53 2010 +0300
@@ -92,13 +92,6 @@
TBool IsFileValid( const TDesC& aFileName, TIntention aIntention );
TBool IsVideoValidL( const TDesC& aFileName, TIntention aIntention );
TBool IsVideoValid( const TDesC& aFileName, TIntention aIntention );
-
- /**
- * Check if the DRM protect file is expired or have no rights to use.
- * @param aFileName Full path and filename.
- * @return ETrue if the file is DRM expired or have rights to use.
- */
- TBool IsFlieDRMExpired( const TDesC& aFileName );
void SetAttrL( TInt aAttr, TInt aValue );
void SetAttrL( TInt aAttr, const TDesC& aValue );
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -2178,38 +2178,6 @@
iListBox->MakeVisible( ETrue );
}
-// ----------------------------------------------------------------------------
-// CMediaFileDialog::FilterInvalidFiles
-//
-// Filters the invalid files from media file handler
-// invalid files = rights expired DRM Protected files and no right files
-// ----------------------------------------------------------------------------
-//
-void CMediaFileDialog::FilterInvalidFiles()
- {
- TInt count = iMediaFileHandler->ResultCount();
-
- for ( TInt idx = 0; idx < count; )
- {
- // check the validity
- GetSelectedItemFileName( idx, iBuf );
- if ( iProtectionHandler->IsFlieDRMExpired( iBuf ) )
- {
- // remove the item from handler in case of invalid file
- iMediaFileHandler->Remove( idx );
-
- // if an item was removed from handler, the idx will not
- // be changed and the count will be decreased one. after
- // recalculate the count, the next item will be checked in next loop.
- count = iMediaFileHandler->ResultCount();
- }
- else
- {
- // just increase the idx in case of valid file
- idx++;
- }
- }
- }
// ----------------------------------------------------------------------------
// CMediaFileDialog::DoUpdateListBoxL
@@ -2219,8 +2187,6 @@
//
void CMediaFileDialog::DoUpdateListBoxL( TBool aRestFindBox )
{
- // filter the invalid files to avoid showing in the list box
- FilterInvalidFiles();
iState->SetUnknownFolderPosition( iMediaFileHandler->ResultCount() );
// check current item index in case media file database has changed
@@ -3122,38 +3088,61 @@
TListBoxEvent aEventType )
{
TInt current = iState->CurrentFolder();
- if ( aEventType == EEventPenDownOnItem)
- {
- iListBox->View()->ItemDrawer()->SetFlags( CListItemDrawer::EPressedDownState );
- return;
- }
- if ( aEventType == EEventItemClicked )
+ switch ( aEventType )
{
- iIsDoubleClicked = EFalse;
- if ( current != KErrNotFound )
+ case EEventPenDownOnItem:
{
- HandleOKL( EAttrOpen ); // open folder item
+ iListBox->View()->ItemDrawer()->SetFlags( CListItemDrawer::EPressedDownState );
+ break;
}
- return;
- }
+
+ case EEventItemClicked:
+ {
+ iIsDoubleClicked = EFalse;
- if ( aEventType == EEventItemDoubleClicked || aEventType == EEventEnterKeyPressed )
- {
- iIsDoubleClicked = ETrue;
- TBool closeDialog = HandleOKL( EAttrDoubleClicked );
-
- if ( closeDialog )
+ if ( current != KErrNotFound )
+ {
+ HandleOKL( EAttrOpen ); // open folder item
+ }
+ break;
+ }
+
+ case EEventItemDoubleClicked:
+ case EEventEnterKeyPressed:
{
- // close after short delay (dialog cannot be closed from this function)
- CloseDialogWithDelayL();
- }
+ iIsDoubleClicked = ETrue;
+ TBool closeDialog = HandleOKL( EAttrDoubleClicked );
+
+ if ( closeDialog )
+ {
+ // close after short delay (dialog cannot be closed from this function)
+ CloseDialogWithDelayL();
+ }
+ break;
+ }
+
+ case EEventItemDraggingActioned:
+ {
+ UpdateCbaL( KErrNone );
+ DrawNow();
+ break;
+ }
+
+ case EEventFlickStarted:
+ case EEventPanningStarted:
+ {
+ //cancel preview if Kinetic scrolling is started
+ if ( iCaller )
+ {
+ iCaller->Cancel();
+ }
+ break;
+ }
+
+ default:
+ break;
}
- if ( aEventType == EEventItemDraggingActioned )
- {
- UpdateCbaL( KErrNone );
- DrawNow();
- }
}
--- a/profilesservices/MediaFileList/Src/mediafilehandler.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafilehandler.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -1536,20 +1536,6 @@
return iSearchList->Count();
}
-// -----------------------------------------------------------------------------
-// CMediaFileHandler::Remove
-// Remove an item from list of search reuslt
-// -----------------------------------------------------------------------------
-//
-void CMediaFileHandler::Remove( TInt aIndex )
- {
- if( aIndex >= ResultCount() )
- {
- // Invalid index
- return;
- }
- iSearchList->Remove( aIndex );
- }
// -----------------------------------------------------------------------------
// CMediaFileHandler::UnknownArtistCount
@@ -2954,15 +2940,6 @@
return iSearchId;
}
-// -----------------------------------------------------------------------------
-// CSearchList::Remove
-// Remove an item from the list of search results
-// -----------------------------------------------------------------------------
-//
-void CSearchList::Remove( TInt aIndex )
- {
- iList.Remove( aIndex );
- }
// -----------------------------------------------------------------------------
// CSearchList::TakeResultL
--- a/profilesservices/MediaFileList/Src/mediafileprotection.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/MediaFileList/Src/mediafileprotection.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -234,28 +234,6 @@
// -----------------------------------------------------------------------------
-// CMFProtectionHandler::IsFlieDRMExpired
-//
-// Check if the DRM protect file is expired or have no rights.
-// -----------------------------------------------------------------------------
-//
-TBool CMFProtectionHandler::IsFlieDRMExpired( const TDesC& aFileName )
- {
- // Check whether the file can be set as automated content or not
- TBool canSetAutomated = EFalse;
- TInt canSetAutomatedErr = iDRMHelper->CanSetAutomated( aFileName, canSetAutomated );
-
- // Check if rights expried or no rights to use
- if ( canSetAutomatedErr == DRMCommon::ERightsExpired ||
- canSetAutomatedErr == DRMCommon::ENoRights )
- {
- return ETrue;
- }
- return EFalse;
- }
-
-
-// -----------------------------------------------------------------------------
// CMFProtectionHandler::IsFileValidL
//
// Function is copy from CFLDDRMImplementation.cpp.
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/ProfileScheduleEvent.rss Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/ProfileScheduleEvent.rss Wed Oct 13 14:51:53 2010 +0300
@@ -23,7 +23,7 @@
// INCLUDES
#include <eikon.rh>
-#include <Profile.loc>
+#include <profile.loc>
// CONSTANTS
// MACROS
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Wed Oct 13 14:51:53 2010 +0300
@@ -27,7 +27,7 @@
#include "CProEngProfileImpl.h"
#include "CProEngToneHandler.h"
#include "CProEngProfileNameArrayImpl.h"
-#include <proengwrapper.rsg>
+#include <ProEngWrapper.rsg>
#include <ConeResLoader.h>
#include <startupdomainpskeys.h>
#include <StringLoader.h>
--- a/profilesservices/ProfileEngine/group/ProfileEng.rss Wed Sep 15 12:30:49 2010 +0300
+++ b/profilesservices/ProfileEngine/group/ProfileEng.rss Wed Oct 13 14:51:53 2010 +0300
@@ -27,7 +27,7 @@
#include "Profile.hrh"
#include <ProfileEng.rh>
#include <ProfileEng.hrh>
-#include <Profile.loc>
+#include <profile.loc>
// CONSTANTS
// MACROS