diff -r 7333d7932ef7 -r 8b7f4e561641 appinstaller/AppMngr2/src/appmngr2listview.cpp --- a/appinstaller/AppMngr2/src/appmngr2listview.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/appinstaller/AppMngr2/src/appmngr2listview.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -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" @@ -36,7 +36,6 @@ #include // CEikMenuPaneItem #include // CAknTitlePane #include // StringLoader -#include // CAknInfoPopupNoteController #include // Resource IDs const TUid KStatusPaneUid = { EEikStatusPaneUidTitle }; @@ -45,30 +44,29 @@ // ======== 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 ); delete iContainer; } - delete iInfoPopup; } // --------------------------------------------------------------------------- @@ -79,6 +77,8 @@ { if( iContainer ) { + FLOG( "CAppMngr2ListView::RefreshL( %d ) begin", aMoreRefreshesExpected ); + TBool selectedItemChanged = EFalse; iContainer->RefreshL( iMaintainFocus, selectedItemChanged, aMoreRefreshesExpected ); if( selectedItemChanged ) @@ -87,14 +87,8 @@ StopDisplayingMenuBar(); iMaintainFocus = EFalse; } - - // Close progress note used in application startup - if( iInfoPopup && !aMoreRefreshesExpected ) - { - iInfoPopup->HideInfoPopupNote(); - delete iInfoPopup; - iInfoPopup = NULL; - } + + FLOG( "CAppMngr2ListView::RefreshL() end" ); } } @@ -105,7 +99,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 +127,7 @@ } SetDefaultMiddleSoftkeyCommandL(); } - + FLOG_PERF_STATIC_END( UpdateMiddleSoftkeyCommandL ) } @@ -165,7 +159,7 @@ void CAppMngr2ListView::HandleCommandL( TInt aCommand ) { FLOG( "CAppMngr2ListView::HandleCommandL( %d )", aCommand ); - + switch( aCommand ) { case EAknSoftkeyBack: @@ -201,12 +195,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 +213,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(); @@ -233,16 +227,7 @@ } UpdateMiddleSoftkeyCommandL(); - if( iInfoPopup == NULL ) - { - iInfoPopup = CAknInfoPopupNoteController::NewL(); - iInfoPopup->SetTimePopupInView( 0 ); - iInfoPopup->HideWhenAppFaded( EFalse ); - HBufC* noteText = StringLoader::LoadLC( R_QTN_AM_SCANNING_MEMORY ); - iInfoPopup->SetTextL( *noteText ); - CleanupStack::PopAndDestroy( noteText ); - iInfoPopup->ShowInfoPopupNote(); - } + // Note Infopopup is removed and replaced with wait dialog. } // --------------------------------------------------------------------------- @@ -252,18 +237,13 @@ void CAppMngr2ListView::DoDeactivate() { FLOG( "CAppMngr2ListView::DoDeactivate, id 0x%08x", Id().iUid ); - + if( iContainer ) { AppUi()->RemoveFromViewStack( *this, iContainer ); delete iContainer; iContainer = NULL; } - if( iInfoPopup ) - { - delete iInfoPopup; - iInfoPopup = NULL; - } } // --------------------------------------------------------------------------- @@ -285,12 +265,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 +287,7 @@ CleanupStack::PopAndDestroy( &menuItems ); } - + FLOG_PERF_STATIC_END( AddDynamicMenuItemsL ) } } @@ -328,7 +308,7 @@ iMiddleSoftkeyCommandId ); } HBufC* middleSoftkeyLabel = StringLoader::LoadLC( aResourceId ); - cba->AddCommandToStackL( CEikButtonGroupContainer::EMiddleSoftkeyPosition, + cba->AddCommandToStackL( CEikButtonGroupContainer::EMiddleSoftkeyPosition, aCommandId, *middleSoftkeyLabel ); CleanupStack::PopAndDestroy( middleSoftkeyLabel ); iMiddleSoftkeyCommandId = aCommandId;