diff -r 2dac0fdba72b -r 191387a8b767 photosgallery/controllers/fetcher/src/glxfetchercontainer.cpp --- a/photosgallery/controllers/fetcher/src/glxfetchercontainer.cpp Wed Apr 14 15:57:24 2010 +0300 +++ b/photosgallery/controllers/fetcher/src/glxfetchercontainer.cpp Tue Apr 27 16:37:53 2010 +0300 @@ -159,8 +159,6 @@ CreateGridMediaListObserverL(); - CreateEmptyDisplayL( iFilterType ); - // If multiple image selection is allowed, then set marking flag on grid widget. if(iMultiSelectionEnabled) { @@ -172,29 +170,6 @@ } } // --------------------------------------------------------------------------- -// CreateEmptyDisplayL -// Displays the empty string if no items in grid with respect to item selected. -// --------------------------------------------------------------------------- -// -void CGlxFetcherContainer::CreateEmptyDisplayL( TGlxFilterItemType aFilterType ) - { - TRACER("CGlxFetcherContainer::CreateEmptyDisplayL"); - if (aFilterType == EGlxFilterImage) - { - HBufC* emptyText = - StringLoader::LoadLC(R_FETCHER_EMPTY_VIEW_TEXT_IMAGE); - iHgGrid->SetEmptyTextL(*emptyText); - CleanupStack::PopAndDestroy(emptyText); - } - else if (aFilterType == EGlxFilterVideo) - { - HBufC* emptyText = - StringLoader::LoadLC(R_FETCHER_EMPTY_VIEW_TEXT_VIDEO); - iHgGrid->SetEmptyTextL(*emptyText); - CleanupStack::PopAndDestroy(emptyText); - } - } -// --------------------------------------------------------------------------- // CreateMediaListL() // Creates a collection path // Create a filter as requested filtertype @@ -238,14 +213,6 @@ iThumbnailContext->SetDefaultSpec( iUiUtility->GetGridIconSize().iWidth, iUiUtility->GetGridIconSize().iHeight ); - CGlxDefaultAttributeContext* attrContext = CGlxDefaultAttributeContext::NewL(); - CleanupStack::PushL(attrContext); - attrContext->AddAttributeL(KMPXMediaGeneralCount); - attrContext->SetRangeOffsets(KItemsPerPage, KItemsPerPage); - iMediaList->AddContextL(attrContext, KGlxFetchContextPriorityGridViewVisibleThumbnail); - User::LeaveIfError(GlxAttributeRetriever::RetrieveL(*attrContext,*iMediaList,EFalse)); - iMediaList->RemoveContext(attrContext); - CleanupStack::PopAndDestroy( attrContext ); iMediaList->AddContextL(iThumbnailContext, KGlxFetchContextPriorityNormal ); if (!iHgGrid) @@ -276,6 +243,8 @@ CleanupStack::Pop(bitmap); } + // Set the grid to use different layout for landscape mode in fetcher + //iHgGrid->SetToolbarVisibility(EFalse); iHgGrid->SetSelectedIndex(iMediaList->FocusIndex()); // Setting to MopParent to update background skin iHgGrid->SetMopParent(this); @@ -297,7 +266,8 @@ // void CGlxFetcherContainer::CreateGridMediaListObserverL() { - iGlxGridMLObserver = CGlxGridViewMLObserver::NewL(*iMediaList , iHgGrid); + iGlxGridMLObserver = CGlxGridViewMLObserver::NewL(*iMediaList, iHgGrid, + iFilterType); } // ---------------------------------------------------------------------------