FCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgimp.cpp

equal deleted inserted replaced

-:bdd9da0d70fe
+:1f1dad4af8f8
 delete iNewName;
 delete iBottomIndex;
 delete iCurrentCba;
 delete iIncrementalOpenUtil;
 delete iCachedSelectionIndex;
-delete iCurrentSelectedIndex;
 FeatureManager::UnInitializeLib();
 delete iOperatorMusicStoreName ;
 if ( iOperatorMusicStoreURI )
 {
 delete iOperatorMusicStoreURI;
 CRepository* repository = CRepository::NewL( KCRUidMPXMPFeatures );
 repository->Get( KMPXMPLocalVariation, flags );
 delete repository;
 iGoToMusicShopOptionHidden =
 !static_cast<TBool>( flags & KMPXEnableGoToMusicShopOption );
-iUsingNokiaService =
+iUsingNokiaService = flags & KMPXEnableFindInMusicShopOption ? ETrue : EFalse;
-static_cast<TBool>( flags & KMPXEnableFindInMusicShopOption );
 MPX_DEBUG2( "CMPXCollectionViewHgImp::ConstructL(): iUsingNokiaService: %d", iUsingNokiaService );
 iDisablePodcasting = flags&KMPXDisablePodcastingOption ? ETrue : EFalse;
 #ifdef _DEBUG
 iExitOptionHidden = EFalse;
 KMShopCategoryName,
 RProperty::ELargeText,
 KMPlayerRemoteReadPolicy,
 KMPlayerRemoteWritePolicy );
 }
+// Check if Music Store dll is in ROM
+iMusicStoreAppInstalled = IsMusicAppInstalledL( TUid::Uid( iMusicStoreUID ) );
+iUsingNokiaService&=iMusicStoreAppInstalled;
 iCachedSelectionIndex = new ( ELeave )CArrayFixFlat<TInt>( KMPXArrayGranularity );
 iIncrementalOpenUtil = CMPXCollectionOpenUtility::NewL( this );
 #ifdef BACKSTEPPING_INCLUDED
 // Initialize the Back Stepping Service Utility with the MPX Music Player
 if ( !iIsWaitNoteCanceled )
 {
 iIsDeleting = ETrue;
 iCollectionUiHelper->DeleteL( *path, this );
-iFirstIndexOnScreen = iContainer->FirstIndexOnScreen();
 }
 else if( iContainer )
 {
 // delete was canceled before it even began, clear marked items
 iContainer->ClearLbxSelection();
 iCurrentHighlightedIndex = KErrNotFound;
 }
 else if ( ( aIndex > 0 )
 && ( aIndex < iContainer->CurrentListItemCount() ) )
 {
-				iContainer->SetLbxCurrentItemIndexAndDraw( aIndex );
+// No need to do anything here
 }
 else
 {
 iContainer->SetLbxCurrentItemIndexAndDraw( 0 );
 }
 UpdateListBoxL( aEntries, KMusicMenuPodcastMenuItemIndex, aComplete );
 ( void ) aIndex;
 }
 else
 {
-TInt topIndex = aIndex;
+UpdateListBoxL( aEntries, aIndex, aComplete );
-if ( iFirstIndexOnScreen > 0 )
-{
-topIndex = iFirstIndexOnScreen;
-if ( aComplete )
-{
-iFirstIndexOnScreen = 0;
-}
-}
-UpdateListBoxL( aEntries, topIndex, aComplete );
 }
 #else
 UpdateListBoxL( aEntries, aIndex, aComplete );
 #endif // __ENABLE_PODCAST_IN_MUSIC_MENU
 if ( iContainer )
 LaunchMusicShopL();
 break;
 }
 case EMPXCmdGoToNokiaMusicShop:
 {
-LaunchMusicShopL();
+LaunchOviMusicShopL();
 break;
 }
 case EMPXCmdGoToOperatorMusicShop:
 {
 if(iMusicStoreWebPage)
 						aMenuPane->SetItemDimmed( EMPXCmdSend, EFalse );
 						}
 					}
 				}
-				//If Operator Music store exist, show the cascade menu with Nokia and Operator music store.
+			DisplayMusicShopOptions(aMenuPane);
-				if ( iOperatorMusicStore )
-				    {
-				    aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
-				    }
-				else
-				    {
-				    aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
-				    }
 			break;
 			}
 		case R_MPX_COLLECTION_VIEW_MENU_2:
 {
 			    if( trackCount < 1 )
 			        {
 			        aMenuPane->SetItemDimmed( EMPXCmdPlayItem, ETrue );
 			        }
 			    }
-			if ( iOperatorMusicStore )
+			DisplayMusicShopOptions(aMenuPane);
-			    {
-			    aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
-			    }
-			else
-			    {
-			    aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
-			    }
 			break;
 			}
 		case R_MPX_COLLECTION_VIEW_MENU_2:
 {
 {
 aMenuPane->SetItemDimmed( EMPXCmdAddToPlaylist, EFalse );
 }
 }
-if ( iOperatorMusicStore )
+DisplayMusicShopOptions(aMenuPane);
-{
-aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
-}
-else
-{
-aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
-}
 			break;
 			}
 		case R_MPX_COLLECTION_VIEW_MENU_2:
 {
 					aMenuPane->SetItemDimmed( EMPXCmdAddToPlaylist, EFalse );
 					aMenuPane->SetItemDimmed( EMPXCmdSend, SendOptionVisibilityL() );
 					aMenuPane->SetItemDimmed( EMPXCmdDelete, EFalse );
 					}
 				}
-			if ( iOperatorMusicStore )
+			DisplayMusicShopOptions(aMenuPane);
-			    {
-			    aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
-			    }
-			else
-			    {
-			    aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
-			    }
 			break;
 			}
 		case R_MPX_COLLECTION_VIEW_MENU_2:
 {
 void CMPXCollectionViewHgImp::DynInitMenuPaneL(
 TInt aResourceId,
 CEikMenuPane* aMenuPane )
 {
 MPX_FUNC( "CMPXCollectionViewHgImp::DynInitMenuPaneL" );
-if ( iContainer->IsTBoneView() )
-{
-	    //makesure mediawall is not flicking before handling long tap
-	    TInt currentIndex( iContainer->CurrentLbxItemIndex() );
-	    MPX_DEBUG2( "CMPXCollectionViewHgImp::DynInitMenuPaneL currentIndex = %d", currentIndex );
-	    if (currentIndex == KErrNotFound)
-	        {
-	        MPX_DEBUG1( "DynInitMenuPaneL NOT handling stylus popup menu when flicking");
-	        DimAllOptions(aResourceId, aMenuPane);
-	        return;
-	        }
-}
 CMPXCollectionViewListBoxArray* array =
 static_cast<CMPXCollectionViewListBoxArray*>(
 iContainer->ListBoxArray() );
 	const CMPXMedia& containerMedia = array->ContainerMedia();
 // -----------------------------------------------------------------------------
 //
 void CMPXCollectionViewHgImp::LaunchMusicShopL()
 {
 MPX_FUNC( "CMPXCollectionViewHgImp::LaunchMusicShopL" );
+if (iOperatorMusicStore && !iMusicStoreAppInstalled) //Launch Operator Store
-if ( iMusicStoreUID != 0)
+{
-{
+if (iMusicStoreWebPage)
-TApaTaskList taskList( iCoeEnv->WsSession() );
+{
-TApaTask task = taskList.FindApp( TUid::Uid(iMusicStoreUID) );
+LaunchOperatorURLMusicShopL();
+}
-if ( task.Exists() )
+else
 {
-GfxTransEffect::BeginFullScreen(
+if (iOperatorMusicStoreType)
-AknTransEffect::EApplicationStart,
+{
-TRect(),
+LaunchOperatorJavaMusicShopL(iOperatorMusicStoreUID);
-AknTransEffect::EParameterType,
+}
-AknTransEffect::GfxTransParam( TUid::Uid(iMusicStoreUID),
+else
-AknTransEffect::TParameter::EActivateExplicitContinue ));
+{
-task.BringToForeground();
+LaunchOperatorNativeMusicShopL();
 }
-else
+}
-{
+}
-RApaLsSession session;
+else //Launch Ovi Music Store
-if ( KErrNone == session.Connect() )
+{
-{
+LaunchOviMusicShopL();
-CleanupClosePushL( session );
-TThreadId threadId;
-session.CreateDocument( KNullDesC, TUid::Uid(iMusicStoreUID), threadId );
-CleanupStack::PopAndDestroy(&session);
-}
-}
 }
 }
 // -----------------------------------------------------------------------------
 aMenuPane->SetItemDimmed( EMPXCmdRename, ETrue );
 aMenuPane->SetItemDimmed( EMPXCmdAlbumArt, ETrue );
 aMenuPane->SetItemDimmed( EMPXCmdFindInMusicShop, ETrue );
 aMenuPane->SetItemDimmed( EMPXCmdSongDetails, ETrue );
 aMenuPane->SetItemDimmed( EMPXCmdPlaylistDetails, ETrue );
-			aMenuPane->SetItemDimmed( EMPXCmdUseAsCascade, ETrue );
 break;
 }
 case R_AVKON_MENUPANE_MARKABLE_LIST:
 {
 aMenuPane->SetItemDimmed(EAknCmdEditListMenu, ETrue);
 break;
 }
 }
 }
+// -----------------------------------------------------------------------------
+// CMPXCollectionViewHgImp::IsMusicAppInstalledL
+// -----------------------------------------------------------------------------
+//
+TBool CMPXCollectionViewHgImp::IsMusicAppInstalledL( const TUid& aAppUid )
+{
+MPX_FUNC( "CMPXCollectionViewHgImp::IsMusicAppInstalledL" );
+TBool response = EFalse;
+RApaLsSession apaSession;
+CleanupClosePushL( apaSession );
+User::LeaveIfError( apaSession.Connect() );
+apaSession.GetAllApps();
+TApaAppInfo appInfo;
+TInt err = apaSession.GetAppInfo( appInfo, aAppUid );
+CleanupStack::PopAndDestroy( &apaSession );
+if ( !err )
+{
+// app was found
+response = ETrue;
+}
+MPX_DEBUG2( "CMPXCollectionViewHgImp::IsMusicAppInstalledL response = %d", response );
+return response;
+}
+// -----------------------------------------------------------------------------
+// CMPXCollectionViewHgImp::DisplayMusicShopOptions
+// -----------------------------------------------------------------------------
+//
+void CMPXCollectionViewHgImp::DisplayMusicShopOptions(CEikMenuPane* aMenuPane)
+{
+if (iOperatorMusicStore && iMusicStoreAppInstalled)
+{
+aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
+aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, EFalse); //Show the cascade menu with Ovi and operator store
+}
+else if ((iOperatorMusicStore && !iMusicStoreAppInstalled)
+|| (!iOperatorMusicStore && iMusicStoreAppInstalled))
+{
+aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
+aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, EFalse); //Show "Go to Music Store"
+}
+else
+{
+aMenuPane->SetItemDimmed(EMPXCmdGoToMultipleMusicShop, ETrue);
+aMenuPane->SetItemDimmed(EMPXCmdGoToMusicShop, ETrue);
+}
+}
+// -----------------------------------------------------------------------------
+// CMPXCollectionViewHgImp::LaunchOviMusicShopL
+// Launch Ovi music shop application
+// -----------------------------------------------------------------------------
+//
+void CMPXCollectionViewHgImp::LaunchOviMusicShopL()
+{
+MPX_FUNC( "CMPXCollectionViewHgImp::LaunchOviMusicShopL" );
+if (iMusicStoreUID != 0)
+{
+TApaTaskList taskList(iCoeEnv->WsSession());
+TApaTask task = taskList.FindApp(TUid::Uid(iMusicStoreUID));
+if (task.Exists())
+{
+GfxTransEffect::BeginFullScreen(
+AknTransEffect::EApplicationStart,
+TRect(),
+AknTransEffect::EParameterType,
+		AknTransEffect::GfxTransParam( TUid::Uid(iMusicStoreUID),
+AknTransEffect::TParameter::EActivateExplicitContinue));
+task.BringToForeground();
+}
+else
+{
+RApaLsSession session;
+if (KErrNone == session.Connect())
+{
+CleanupClosePushL(session);
+TThreadId threadId;
+session.CreateDocument(KNullDesC, TUid::Uid(iMusicStoreUID),
+threadId);
+CleanupStack::PopAndDestroy(&session);
+}
+}
+}
+}
 //  End of File

branch	RCL_3
changeset 66	1f1dad4af8f8
parent 56	2cbbefa9af78