FCL/sf/app/musicplayer: comparison mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp

equal deleted inserted replaced

-:8192e5b5c935
+:c163ef0b758d
 mActivated( false ),
 mNowPlayingBanner( 0 ),
 mBannerAttached( false ),
 mSoftKeyQuit( 0 ),
 mSoftKeyBack( 0 ),
+mShuffleAction( 0 ),
+mShuffleEnabled( false ),
 mDocumentLoader( 0 ),
 mMainContainer( 0 ),
 mMainToolBar( 0 ),
 mPlaylistToolBar( 0 ),
 mSnapshot( 0 ),
 if ( mViewMode == MpCommon::FetchView ) {
 // Banner is not needed since playback is stopped when returning
 // from playback preview. Disable the banner from updating.
 mNowPlayingBanner->setEnabled( false );
+attachNowPlayingBanner( false );
 }
 else {
 connect( mNowPlayingBanner, SIGNAL( clicked() ), this, SLOT( startPlaybackView() ) );
 connect( mNowPlayingBanner, SIGNAL( playbackAttachmentChanged( bool ) ),
 this, SLOT( attachNowPlayingBanner( bool ) ) );
+attachNowPlayingBanner( mNowPlayingBanner->isBannerAttached() );
 }
 widget = mDocumentLoader->findWidget( QString( "mainContainer" ) );
 mMainContainer = qobject_cast<HbWidget*>( widget );
 }
 mActivated = true;
 TX_ENTRY_ARGS( "mCollectionContext=" << mCollectionContext );
 if ( mCollectionContext == ECollectionContextUnknown ) {
 // Open 'All Songs' by default
-mMpEngine->openCollection( ECollectionContextAllSongs );
+if ( mCollectionData->context() == ECollectionContextAllSongs ){
+setContext( ECollectionContextAllSongs );
+}
+else {
+mMpEngine->openCollection( ECollectionContextAllSongs );
+}
 }
 else {
 // This true when returning from other views, e.g. playback view
 setSoftkey();
 }
 if ( mCollectionContext != ECollectionContextAllSongs ) {
 // Open 'All Songs' by default
 mMpEngine->openCollection( ECollectionContextAllSongs );
 }
-if ( mBannerAttached ) {
-setBannerVisibility( false );
-}
 TX_EXIT
 }
 /*!
 Returns view activation status.
 {
 TX_ENTRY_ARGS( "context=" << context );
 if ( mActivated ) {
 startContainerTransition( mCollectionContext, context );
 }
 mCollectionContext = context;
+// Reset softkey and the menu
+if ( mActivated ) {
+setSoftkey();
+}
+updateToolBar();
+updateMenu();
 mCollectionContainer = mContainerFactory->createContainer( context );
 mCollectionContainer->setViewMode( mViewMode );
 mCollectionDataModel->refreshModel();
 mCollectionContainer->setDataModel( mCollectionDataModel );
-// Reset softkey and the menu
-if ( mActivated ) {
-setSoftkey();
-}
-updateToolBar();
-updateMenu();
 TX_EXIT
 }
 /*!
 Slot to be called when 'All Songs' action is triggered from the toolbar.
 void MpCollectionView::shufflePlayAll()
 {
 mMpEngine->setShuffle( true );
 MpSettingsManager::setShuffle( true );
 int index = generateShuffleIndex();
-openIndex( index );
+switch ( mCollectionContext ) {
-}
+case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextAlbumsTBone:
+playAlbumSongs( mCollectionData->currentAlbumIndex(), index );
+break;
+default:
+openIndex( index );
+break;
+}
+}
 /*!
 Slot to be called when 'Refresh Library' is clicked by the user from the menu.
 */
 void MpCollectionView::refreshLibrary()
 cancelOngoingOperation();
 //Update cache, even if collection is in background.
 //Library refreshing could be triggered at any point due USB/MMC events.
 mMpEngine->reopenCollection();
+}
+TX_EXIT
+}
+/*!
+Slot to be called when shuffle action status changes. This is called by the
+containers. Shuffle is only enabled when there is more than 1 song and the
+it can change when songs are deleted or when new songs are found during refresh.
+*/
+void MpCollectionView::setShuffleAction( bool enabled )
+{
+TX_ENTRY
+mShuffleEnabled = enabled;
+if ( mShuffleAction ) {
+mShuffleAction->setEnabled(enabled);
 }
 TX_EXIT
 }
 /*!
 {
 TX_ENTRY
 HbMenu *myMenu = new HbMenu();
 HbAction *menuAction;
 if ( mViewMode == MpCommon::DefaultView ) {
-bool items = mCollectionData->count() != 0;
+int count = mCollectionData->count();
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
-menuAction = myMenu->addAction( hbTrId( "txt_mus_dblist_shuffle" ) );
+mShuffleAction = myMenu->addAction( hbTrId( "txt_mus_opt_shuffle" ) );
-if ( items ){
+connect( mShuffleAction, SIGNAL( triggered() ), this, SLOT( shufflePlayAll() ) );
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( shufflePlayAll() ) );
+if ( count <= 1 ) {
+mShuffleAction->setDisabled( true );
+}
+menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
+if ( count && !mUsbBlocked ) {
+connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
+menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
-menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
+if ( !mUsbBlocked ) {
-if ( items && !mUsbBlocked ) {
+connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
-menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
-if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-}
-else {
-menuAction->setDisabled( true );
-}
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 break;
 case ECollectionContextArtists:
-menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
-if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-}
-else {
-menuAction->setDisabled( true );
-}
-connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
-break;
 case ECollectionContextAlbums:
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
 if ( !mUsbBlocked ) {
 connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
 }
 menuAction->setDisabled( true );
 }
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 break;
 case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextAlbumsTBone:
+mShuffleAction = myMenu->addAction( hbTrId( "txt_mus_opt_shuffle" ) );
+connect( mShuffleAction, SIGNAL( triggered() ), this, SLOT( shufflePlayAll() ) );
+if ( !mShuffleEnabled ) {
+mShuffleAction->setDisabled( true );
+}
+menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
+if ( !mUsbBlocked ) {
+connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
+}
+else {
+menuAction->setDisabled( true );
+}
+break;
 case ECollectionContextArtistAllSongs:
-case ECollectionContextAlbumsTBone:
+mShuffleAction = myMenu->addAction( hbTrId( "txt_mus_opt_shuffle" ) );
+connect( mShuffleAction, SIGNAL( triggered() ), this, SLOT( shufflePlayAll() ) );
+if ( count <= 1 ) {
+mShuffleAction->setDisabled( true );
+}
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
 if ( !mUsbBlocked ) {
 connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 break;
 case ECollectionContextPlaylistSongs:
-if ( !mCollectionData->isAutoPlaylist() ){
+mShuffleAction = myMenu->addAction( hbTrId( "txt_mus_opt_shuffle" ) );
+connect( mShuffleAction, SIGNAL( triggered() ), this, SLOT( shufflePlayAll() ) );
+if ( count <= 1 ) {
+mShuffleAction->setDisabled( true );
+}
+if ( !mCollectionData->isAutoPlaylist() ) {
 menuAction = myMenu->addAction( hbTrId( "txt_common_menu_rename_item" ) );
 if ( !mUsbBlocked ) {
 connect( menuAction, SIGNAL( triggered() ), this, SLOT( renameCurrentPlaylistContainer() ) );
 }
 else {
 Generates a random index for shuffle all.
 */
 int MpCollectionView::generateShuffleIndex()
 {
 int low = 0;
-int high = mCollectionData->count();
+int high = 0;
+switch ( mCollectionContext ) {
+case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextAlbumsTBone:
+high = mCollectionData->albumSongsCount();
+break;
+default:
+high = mCollectionData->count();
+break;
+}
 time_t seconds;
 time( &seconds );
 srand( ( unsigned int ) seconds );

changeset 32	c163ef0b758d
parent 29	8192e5b5c935
child 37	eb79a7c355bf