MCL/sf/mw/homescreensrv: comparison idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp

equal deleted inserted replaced

-:c2817bb2a55c
+:cb506ec2d869
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 - 2010 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".
 */
 #include <eikenv.h>
 #include <itemmap.h>
 #include <mhomescreensettingsif.h>
 #include <aistrcnv.h>
 #include <StringLoader.h>
 #include <uri16.h>
 #include <mcspluginsettingsres.rsg>
+#include <mcsmenuitem.h>
-#include "mcspluginsettings.h"
 #include "mcspluginsettingsmodel.h"
+#include "mcspluginsettingsapplist.h"
+#include "mcspluginsettingsbkmlist.h"
 #include "mcspluginsettingscontainer.h"
-#include "debug.h"
-#include <mcsmenuitem.h>
 /**
 * Line format for the settings list box
 */
 _LIT(KSettingListboxLineFormat, " \t%S\t\t%S");
 _LIT8( KProperNameLocked, "locked" );
 _LIT8( KProperValueFolder, "folder" );
 _LIT8( KProperValueSuite, "suite" );
 _LIT8( KProperValueBookmark, "bookmark" );
 _LIT8( KProperValueAppl, "application" );
+_LIT8( KProperValueMailbox, "mailbox" );
+_LIT( KMenuTypeMailbox, "menu:mailbox" );
 using namespace HSPluginSettingsIf;
+// ======== LOCAL FUNCTIONS ========
+// ----------------------------------------------------------------------------
+// CleanupResetAndDestroy()
+// ----------------------------------------------------------------------------
+//
+template<class T>
+static void CleanupResetAndDestroy( TAny* aObj )
+{
+if( aObj )
+{
+static_cast<T*>( aObj )->ResetAndDestroy();
+}
+}
+// ----------------------------------------------------------------------------
+// CleanupResetAndDestroyPushL
+// ----------------------------------------------------------------------------
+//
+template<class T>
+static void CleanupResetAndDestroyPushL(T& aArray)
+{
+CleanupStack::PushL( TCleanupItem( &CleanupResetAndDestroy<T>, &aArray ) );
+}
+// ======== MEMBER FUNCTIONS ========
 // -----------------------------------------------------------------------------
 // Creates a formatted listbox line.
 // -----------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // Second phase construction
 // ---------------------------------------------------------------------------
 //
 void CMCSPluginSettingsModel::ConstructL()
 {
 CHomescreenSettings::InitializeL( KAppUid );
 iPluginSettings = CHomescreenSettings::Instance();
 if( iPluginSettings == NULL )
 {
 User::Leave( KErrUnknown );
 }
+}
-iAppList = CMCSPluginSettingsAppList::NewL();
-iAppList->StartL();
-iBkmList = CMCSPluginSettingsBkmList::NewL();
-}
 // ---------------------------------------------------------------------------
 // Gets the latest settings from HSPS and updates
 // ---------------------------------------------------------------------------
 //
-void CMCSPluginSettingsModel::UpdateSettingsL( const TDesC8& aPluginId )
+void CMCSPluginSettingsModel::UpdateSettingsL()
 {
-if( !iPlugin.Activated() )
+iSettings.Reset();
+if( !iPluginId )
 {
 return;
 }
-if( iPluginId )
+if (iContainer)
 {
-delete iPluginId;
+iContainer->CloseChangeDialog();
-iPluginId = NULL;
+}
-}
-iPluginId = aPluginId.AllocL();
-iSettings.Reset();
 RPointerArray<CItemMap> settingItems;
-CleanupClosePushL( settingItems );
+CleanupResetAndDestroyPushL( settingItems );
 iPluginSettings->GetSettingsL( *iPluginId, settingItems );
-TInt count = settingItems.Count();
+for ( TInt i = 0; i < settingItems.Count(); i++ )
-for ( TInt i = 0; i < count; i++ )
 {
 CItemMap* itemMap = settingItems[i];
 RPointerArray<HSPluginSettingsIf::CPropertyMap> properties;
 properties = itemMap->Properties();
 TSettingItem item = ItemL( properties );
 iSettings.AppendL( item );
 }
-CleanupStack::Pop( &settingItems );
-settingItems.ResetAndDestroy();
+CleanupStack::PopAndDestroy(); // settingItems
-}
+if (iContainer)
-// ---------------------------------------------------------------------------
+{
-// Gets the latest settings from HSPS and updates
+iContainer->ResetCurrentListL(0);
-// ---------------------------------------------------------------------------
+}
-//
-void CMCSPluginSettingsModel::UpdateSettingModelL( const TDesC8& aPluginId )
-{
-if( iPluginId )
-{
-delete iPluginId;
-iPluginId = NULL;
-}
-iPluginId = aPluginId.AllocL();
-iSettings.Reset();
-RPointerArray<CItemMap> settingItems;
-CleanupClosePushL( settingItems );
-iPluginSettings->GetSettingsL( *iPluginId, settingItems );
-TInt count = settingItems.Count();
-for ( TInt i = 0; i < count; i++ )
-{
-CItemMap* itemMap = settingItems[i];
-RPointerArray<HSPluginSettingsIf::CPropertyMap> properties;
-properties = itemMap->Properties();
-TSettingItem item = ItemL( properties );
-iSettings.AppendL( item );
-}
-CleanupStack::Pop( &settingItems );
-settingItems.ResetAndDestroy();
 }
 // ---------------------------------------------------------------------------
 // Tries to find menuitem which matches given HSPS entry
 // ---------------------------------------------------------------------------
 RPointerArray<HSPluginSettingsIf::CPropertyMap>& aProperties )
 {
 TSettingItem setting = { KErrNotFound, EApplication , EFalse };
 TSettingType type = SettingTypeL( aProperties );
-if ( type == EApplication )
+if ( type == EApplication || type == EMailbox )
 {
 setting = iAppList->FindItemL( aProperties );
 }
 else if ( type == EBookmark )
 {
 }
 }
 return EFalse;
 }
 // ---------------------------------------------------------------------------
 // Saves menuitem to HSPS to the given shortcut index
 // ---------------------------------------------------------------------------
 //
 {
 if( !iPluginId )
 {
 return;
 }
 RPointerArray<CItemMap> settingItems;
-CleanupClosePushL( settingItems );
+CleanupResetAndDestroyPushL( settingItems );
 iPluginSettings->GetSettingsL( *iPluginId, settingItems );
 if ( aIndex >= 0 && aIndex < settingItems.Count() )
 {
 TBool exists( EFalse );
 CItemMap* itemMap = settingItems[ aIndex ];
 RPointerArray<HSPluginSettingsIf::CPropertyMap> properties;
 properties = itemMap->Properties();
+const TInt KGranularity = 6;
+CDesC8Array* propertiesList = new ( ELeave ) CDesC8ArrayFlat( KGranularity );
+CleanupStack::PushL( propertiesList );
+propertiesList->AppendL( KProperNameType );
+propertiesList->AppendL( KProperNameParam );
+propertiesList->AppendL( KProperNameUid );
+propertiesList->AppendL( KProperNameView );
+// skip KProperNameLocked property, attribute may be missing. results into
+		// leave with -1 when saving settings
+// add missing properties
+for ( TInt i=0; i<propertiesList->Count(); i++ )
+{
+TBool found( EFalse );
+const TPtrC8 namePtr = propertiesList->MdcaPoint( i );
+for ( TInt j=0; j<properties.Count() && !found; j++ )
+{
+found = ( (namePtr == properties[ j ]->Name() ) ? ETrue : EFalse );
+}
+if ( !found )
+{
+CPropertyMap* property = CPropertyMap::NewLC();
+property->SetNameL( namePtr );
+property->SetValueL( KNullDesC8 );
+itemMap->AddPropertyMapL( property );
+CleanupStack::Pop( property );
+// get updated list
+properties = itemMap->Properties();
+}
+}
+CleanupStack::PopAndDestroy( propertiesList );
 for ( TInt i = 0; i < properties.Count(); i++ )
 {
 if ( properties[ i ]->Name() == KProperNameType )
 {
 TPtrC type = aMenuItem.Type();
 }
 else if ( type == KMenuTypeSuite )
 {
 properties[ i ]->SetValueL( KProperValueSuite );
 }
+else if( type == KMenuTypeMailbox )
+{
+properties[ i ]->SetValueL( KProperValueMailbox );
+}
 else
 {
 properties[ i ]->SetValueL( KProperValueAppl );
 }
 }
 else if ( properties[ i ]->Name() == KProperNameUid )
 {
 TPtrC uid = aMenuItem.GetAttributeL( KMenuAttrUid, exists );
-if ( exists )
+if ( exists && uid.Length() > 0 )
 {
 HBufC8* uid8( NULL );
 uid8 = AiUtility::CopyToBufferL( uid8, uid );
 CleanupStack::PushL( uid8 );
 properties[ i ]->SetValueL( *uid8 );
 }
 }
 else if ( properties[ i ]->Name() == KProperNameView )
 {
 TPtrC view = aMenuItem.GetAttributeL( KMenuAttrView, exists );
-if( exists )
+if( exists && view.Length() > 0 )
 {
 HBufC8* view8( NULL );
 view8 = AiUtility::CopyToBufferL( view8, view );
 CleanupStack::PushL( view8 );
 properties[i]->SetValueL( *view8 );
 if ( type == KMenuTypeFolder )
 {
 isFolder = ETrue;
 }
-if ( exists || isFolder )
+if ( (exists && param.Length() > 0) || (isFolder) )
 {
 // the folder id is stored
 // in param attribute in HSPS
 if ( isFolder )
 {
 }
 }
 else if ( properties[ i ]->Name() == KProperNameLocked )
 {
 TPtrC locked = aMenuItem.GetAttributeL( KMenuAttrLocked, exists );
-if ( exists )
+if ( exists && locked.Length() > 0 )
 {
 HBufC8* locked8( NULL );
 locked8 = AiUtility::CopyToBufferL( locked8, locked );
 CleanupStack::PushL( locked8 );
 properties[ i ]->SetValueL( *locked8 );
 properties[i]->SetValueL( KNullDesC8 );
 }
 }
 }
 }
 // ETrue tells that modified settings are stored also to plugin reference
-iPluginSettings->SetSettingsL( *iPluginId, settingItems, ETrue );
+User::LeaveIfError( iPluginSettings->SetSettingsL( *iPluginId, settingItems, ETrue ) );
-CleanupStack::Pop( &settingItems );
+CleanupStack::PopAndDestroy(); // settingItems
-settingItems.ResetAndDestroy();
 }
 // ---------------------------------------------------------------------------
 // Updates settings container.
 // ---------------------------------------------------------------------------
 //
-void CMCSPluginSettingsModel::UpdateSettingsContainerL( const TDesC8& aPluginId )
+void CMCSPluginSettingsModel::SetPluginIdL( const TDesC8& aPluginId )
 {
-if (iContainer)
+delete iPluginId;
-{
+iPluginId = NULL;
-if (iContainer->IsChangeDialogShowing())
+iPluginId = aPluginId.AllocL();
-{
+}
-iContainer->CloseChangeDialog();
-}
-}
-UpdateSettingsL( aPluginId );
-if (iContainer)
-{
-iContainer->ResetCurrentListL(0);
-}
-}
 // ---------------------------------------------------------------------------
 // From MDesCArray
 // Returns the number of descriptor elements in a descriptor array.
 // ---------------------------------------------------------------------------
 // From MDesCArray
 // Indexes into a descriptor array.
 // ---------------------------------------------------------------------------
 //
 TPtrC CMCSPluginSettingsModel::MdcaPoint( TInt aIndex ) const
 {
 if (aIndex < 0 || aIndex >= iSettings.Count())
 {
 TPtrC ret(KNullDesC);
 return ret;
 }
+TPtrC line( KNullDesC );
 if ( iSettings[aIndex].type == EApplication )
 {
 // first, we need to check if the item is missing
-// (application unistaled or mmc card removed)
+// (application uninstalled or mmc card removed)
 // If it is, we return "Undefined" application name instead
 if ( iSettings[ aIndex ].id == KErrNotFound )
 {
-const TDesC& caption = iAppList->iUndefinedText->Des();
+const TDesC& caption = iAppList->UndefinedText();
-TPtrC line;
 TRAP_IGNORE( line.Set( ListBoxLineL( caption, aIndex ) ) )
-return line;
 }
 else
 {
 const TDesC& caption = iAppList->MdcaPoint( iSettings[ aIndex ].id );
-TPtrC line;
 TRAP_IGNORE( line.Set( ListBoxLineL( caption, aIndex ) ) )
-return line;
 }
 }
 else
 {
 const TDesC& caption = iBkmList->MdcaPoint( iSettings[aIndex].id );
-TPtrC line;
 TRAP_IGNORE( line.Set( ListBoxLineL( caption, aIndex ) ) )
-return line;
+}
-}
-}
+return line;
+}
 // ---------------------------------------------------------------------------
 // Returns a setting ID for the given index.
 // ---------------------------------------------------------------------------
 //
 //
 TBool CMCSPluginSettingsModel::ReplaceItemL( const TInt& aSettingIndex,
 TInt aId,
 TSettingType aType )
 {
+TBool replaced( EFalse );
 if (aSettingIndex >= 0 && aSettingIndex < iSettings.Count())
 {
-TSettingItem oldItem = iSettings[ aSettingIndex ];
+CMenuItem* item( NULL );
-iSettings[ aSettingIndex ].id = aId;
-iSettings[ aSettingIndex ].type = aType;
 if ( aType == EApplication )
 {
-CMenuItem& item = iAppList->ItemL( aId );
+item = iAppList->ItemL( aId );
-SaveSettingsL( aSettingIndex, item );
 }
 else
 {
-CMenuItem& item = iBkmList->ItemL( aId );
+item = iBkmList->ItemL( aId );
-SaveSettingsL( aSettingIndex, item );
 }
-// Old setting type is bookmark. Remove bookmark item from MCS
+if ( item )
-// if it was created in runtime.
+{
-if ( oldItem.type == EBookmark )
+SaveSettingsL( aSettingIndex, *item );
-{
+iSettings[ aSettingIndex ].id = aId;
-iBkmList->RemoveMenuItemL( oldItem.id );
+iSettings[ aSettingIndex ].type = aType;
-}
+replaced = ETrue;
+}
-// Old setting type is application.
+}
-// Remove app item from MCS if it was created in runtime (mailbox).
+return replaced;
-if ( oldItem.type == EApplication )
-{
-iAppList->RemoveMenuItemL( oldItem.id );
-}
-return ETrue;
-}
-return EFalse;
 }
 // ---------------------------------------------------------------------------
 // Sets a container
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Updates application list
 // ---------------------------------------------------------------------------
 //
-void CMCSPluginSettingsModel::UpdateAppListL()
+void CMCSPluginSettingsModel::UpdateAppListL( TBool aUpdateSettings )
 {
+if( !iAppList )
+{
+iAppList = CMCSPluginSettingsAppList::NewL();
+}
 iAppList->StartL();
-}
+if ( aUpdateSettings )
+{
+UpdateSettingsL();
+}
+}
 // ---------------------------------------------------------------------------
 // Updates bookmark list
 // ---------------------------------------------------------------------------
 //
-void CMCSPluginSettingsModel::UpdateBkmListL()
+void CMCSPluginSettingsModel::UpdateBkmListL( TBool aUpdateSettings )
 {
 delete iBkmList;
 iBkmList = NULL;
 iBkmList = CMCSPluginSettingsBkmList::NewL();
-}
+if ( aUpdateSettings )
+{
+UpdateSettingsL();
+}
+}
 // End of File.

branch	RCL_3
changeset 17	cb506ec2d869
parent 16	b276298d5729
child 19	edd621764147