diff -r aba6b8104af3 -r 51c0f5edf5ef appinstaller/AppMngr2/src/appmngr2listview.cpp --- a/appinstaller/AppMngr2/src/appmngr2listview.cpp Tue Feb 02 00:20:15 2010 +0200 +++ b/appinstaller/AppMngr2/src/appmngr2listview.cpp Fri Feb 19 22:57:02 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -45,24 +45,24 @@ // ======== MEMBER FUNCTIONS ======== // --------------------------------------------------------------------------- -// CAppMngr2ListView::ConstructL() +// CAppMngr2ListView::ConstructL() // --------------------------------------------------------------------------- // void CAppMngr2ListView::ConstructL( TInt aResourceId ) { FLOG( "CAppMngr2ListView::ConstructL( 0x%08x )", aResourceId ); - + BaseConstructL( aResourceId ); } // --------------------------------------------------------------------------- -// CAppMngr2ListView::~CAppMngr2ListView() +// CAppMngr2ListView::~CAppMngr2ListView() // --------------------------------------------------------------------------- // CAppMngr2ListView::~CAppMngr2ListView() { FLOG( "CAppMngr2ListView::~CAppMngr2ListView" ); - + if( iContainer ) { AppUi()->RemoveFromViewStack( *this, iContainer ); @@ -79,6 +79,8 @@ { if( iContainer ) { + FLOG( "CAppMngr2ListView::RefreshL( %d ) begin", aMoreRefreshesExpected ); + TBool selectedItemChanged = EFalse; iContainer->RefreshL( iMaintainFocus, selectedItemChanged, aMoreRefreshesExpected ); if( selectedItemChanged ) @@ -95,6 +97,8 @@ delete iInfoPopup; iInfoPopup = NULL; } + + FLOG( "CAppMngr2ListView::RefreshL() end" ); } } @@ -105,7 +109,7 @@ void CAppMngr2ListView::UpdateMiddleSoftkeyCommandL() { FLOG_PERF_STATIC_BEGIN( UpdateMiddleSoftkeyCommandL ); - + if( iContainer && !iContainer->IsListEmpty() ) { // add item-specific MSK if the current item has one @@ -133,7 +137,7 @@ } SetDefaultMiddleSoftkeyCommandL(); } - + FLOG_PERF_STATIC_END( UpdateMiddleSoftkeyCommandL ) } @@ -165,7 +169,7 @@ void CAppMngr2ListView::HandleCommandL( TInt aCommand ) { FLOG( "CAppMngr2ListView::HandleCommandL( %d )", aCommand ); - + switch( aCommand ) { case EAknSoftkeyBack: @@ -201,12 +205,12 @@ if( aResourceId == R_APPMNGR2_INSTALLED_MENU || aResourceId == R_APPMNGR2_PACKAGES_MENU ) { - if( !FeatureManager::FeatureSupported( KFeatureIdHelp ) ) + if( !FeatureManager::FeatureSupported( KFeatureIdHelp ) ) { aMenuPane->SetItemDimmed( EAknCmdHelp, ETrue ); } - // Keep the currently selected item focused in forthcoming list refreshes. + // Keep the currently selected item focused in forthcoming list refreshes. iMaintainFocus = ETrue; } } @@ -219,11 +223,11 @@ TUid /*aCustomMessageId*/, const TDesC8& /*aCustomMessage*/ ) { FLOG( "CAppMngr2ListView::DoActivateL, id 0x%08x", Id().iUid ); - + CAknTitlePane* titlePane = NULL; titlePane = static_cast( StatusPane()->ControlL( KStatusPaneUid ) ); SetTitleL( *titlePane ); - + if( iContainer == NULL ) { iContainer = CreateContainerL(); @@ -252,7 +256,7 @@ void CAppMngr2ListView::DoDeactivate() { FLOG( "CAppMngr2ListView::DoDeactivate, id 0x%08x", Id().iUid ); - + if( iContainer ) { AppUi()->RemoveFromViewStack( *this, iContainer ); @@ -285,12 +289,12 @@ if( aMenuPane ) { FLOG_PERF_STATIC_BEGIN( AddDynamicMenuItemsL ); - + TInt position = 0; if( aMenuPane->MenuItemExists( EAppMngr2PlaceForPluginSpecificCmds, position ) ) { aMenuPane->DeleteMenuItem( EAppMngr2PlaceForPluginSpecificCmds ); - + RPointerArray menuItems; CleanupResetAndDestroyPushL( menuItems ); @@ -307,7 +311,7 @@ CleanupStack::PopAndDestroy( &menuItems ); } - + FLOG_PERF_STATIC_END( AddDynamicMenuItemsL ) } } @@ -328,7 +332,7 @@ iMiddleSoftkeyCommandId ); } HBufC* middleSoftkeyLabel = StringLoader::LoadLC( aResourceId ); - cba->AddCommandToStackL( CEikButtonGroupContainer::EMiddleSoftkeyPosition, + cba->AddCommandToStackL( CEikButtonGroupContainer::EMiddleSoftkeyPosition, aCommandId, *middleSoftkeyLabel ); CleanupStack::PopAndDestroy( middleSoftkeyLabel ); iMiddleSoftkeyCommandId = aCommandId;