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

equal deleted inserted replaced

-:3ec52facab4d
+:8192e5b5c935
 */
 // INCLUDE FILES
 #include <time.h>
 #include <cstdlib>
-#include <qtcore>
+#include <QtCore>
 #include <hbinstance.h>
 #include <hbapplication.h>
 #include <hbaction.h>
 #include <hbtoolbar.h>
 #include "mpcollectionview.h"
 #include "mpcollectiondocumentloader.h"
 #include "mpcollectioncontainerfactory.h"
 #include "mpcollectioncontainer.h"
 #include "mpcollectiondatamodel.h"
-#include "mpengine.h"
+#include "mpenginefactory.h"
 #include "mpmpxcollectiondata.h"
 #include "mpnowplayingwidget.h"
 #include "mpcommondefs.h"
 #include "mptrace.h"
 #include "mpsnapshotwidget.h"
 mCollectionContainer( 0 ),
 mCollectionDataModel( 0 ),
 mActivated( false ),
 mNowPlayingBanner( 0 ),
 mBannerAttached( false ),
-mNavigationQuit( 0 ),
+mSoftKeyQuit( 0 ),
-mNavigationBack( 0 ),
+mSoftKeyBack( 0 ),
 mDocumentLoader( 0 ),
 mMainContainer( 0 ),
 mMainToolBar( 0 ),
 mPlaylistToolBar( 0 ),
 mSnapshot( 0 ),
 */
 MpCollectionView::~MpCollectionView()
 {
 TX_ENTRY
 delete mSnapshot;
-delete mNavigationQuit;
+delete mSoftKeyQuit;
-delete mNavigationBack;
+delete mSoftKeyBack;
 HbToolBar *toolBar = takeToolBar();
 if ( mMainToolBar != toolBar && mPlaylistToolBar != toolBar ) {
 delete toolBar;
 }
 }
 if ( mPlaylistToolBar ) {
 mPlaylistToolBar->deleteLater();
 }
-delete mCollectionDataModel;
 delete mCollectionContainer;
 delete mContainerFactory;
+delete mCollectionDataModel;
 delete mDocumentLoader;
 delete mMpTranslator;
 delete mCommonTranslator;
 TX_EXIT
 }
 }
 mWindow = mainWindow();
 // Create softkey actions
-mNavigationQuit = new HbAction( Hb::QuitNaviAction, this );
+mSoftKeyQuit = new HbAction( Hb::QuitNaviAction, this );
-connect( mNavigationQuit, SIGNAL( triggered() ), this, SLOT( back() ) );
+connect( mSoftKeyQuit, SIGNAL( triggered() ), this, SLOT( back() ) );
-mNavigationBack = new HbAction( Hb::BackNaviAction, this );
+mSoftKeyBack = new HbAction( Hb::BackNaviAction, this );
-connect( mNavigationBack, SIGNAL( triggered() ), this, SLOT( back() ) );
+connect( mSoftKeyBack, SIGNAL( triggered() ), this, SLOT( back() ) );
-mMpEngine = MpEngine::instance();
+mMpEngine = MpEngineFactory::sharedEngine();
-connect( mMpEngine,
+connect( mMpEngine, SIGNAL( collectionPlaylistOpened() ),
-SIGNAL( collectionPlaylistOpened() ),
+this, SLOT( startPlaybackView() ) );
-this,
+connect( mMpEngine, SIGNAL( playlistSaved( bool ) ),
-SLOT( startPlaybackView() ) );
+this, SLOT( playlistSaved( bool ) ) );
-connect( mMpEngine,
+connect( mMpEngine, SIGNAL( songsDeleted( bool ) ),
-SIGNAL( playlistSaved( bool ) ),
+this, SLOT( songsDeleted( bool ) ) );
-this,
+connect( mMpEngine, SIGNAL( playlistsRenamed( bool ) ),
-SLOT( playlistSaved( bool ) ) );
+this, SLOT( playlistsRenamed( bool ) ) );
-connect( mMpEngine,
+connect( mMpEngine, SIGNAL( isolatedCollectionOpened( MpMpxCollectionData* ) ),
-SIGNAL( songsDeleted( bool ) ),
+this, SLOT( handleIsolatedCollectionOpened( MpMpxCollectionData* ) ) );
-this,
-SLOT( songsDeleted( bool ) ) );
-connect( mMpEngine,
-SIGNAL( playlistsRenamed( bool ) ),
-this,
-SLOT( playlistsRenamed( bool ) ) );
-connect( mMpEngine,
-SIGNAL( isolatedCollectionOpened( MpMpxCollectionData* ) ),
-this,
-SLOT( handleIsolatedCollectionOpened( MpMpxCollectionData* ) ) );
 mCollectionData = mMpEngine->collectionData();
 qRegisterMetaType<TCollectionContext>("TCollectionContext");
 connect( mCollectionData, SIGNAL( contextChanged( TCollectionContext ) ),
 this, SLOT( setContext( TCollectionContext ) ), Qt::QueuedConnection );
 // from playback preview. Disable the banner from updating.
 mNowPlayingBanner->setEnabled( false );
 }
 else {
 connect( mNowPlayingBanner, SIGNAL( clicked() ), this, SLOT( startPlaybackView() ) );
-connect( mNowPlayingBanner, SIGNAL( playbackAttachmentChanged( bool ) ), this, SLOT( attachNowPlayingBanner( bool ) ) );
+connect( mNowPlayingBanner, SIGNAL( playbackAttachmentChanged( bool ) ),
+this, SLOT( attachNowPlayingBanner( bool ) ) );
 }
 widget = mDocumentLoader->findWidget( QString( "mainContainer" ) );
 mMainContainer = qobject_cast<HbWidget*>( widget );
 }
 TX_EXIT
 }
 /*!
-Slot to be called when 'Genres' action is triggered from the toolbar.
-*/
-void MpCollectionView::openGenres()
-{
-TX_ENTRY
-if ( mCollectionContext != ECollectionContextGenres ) {
-mMpEngine->openCollection( ECollectionContextGenres );
-}
-TX_EXIT
-}
-/*!
 Slot to be called when 'Find' action is triggered from the toolbar.
 */
 void MpCollectionView::find()
 {
 // Todo
 bool doOpen = true;
 if ( mViewMode == MpCommon::FetchView ) {
 QString songUri;
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
-case ECollectionContextArtistSongs:
+case ECollectionContextArtistAllSongs:
-case ECollectionContextAlbumSongs:
 case ECollectionContextPlaylistSongs:
-case ECollectionContextGenreSongs:
 doOpen = false;
 songUri = mCollectionData->itemData( index, MpMpxCollectionData::Uri );
 emit songSelected( songUri );
 break;
+case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextAlbumsTBone:
+doOpen = false;
+songUri = mCollectionData->albumSongData( index, MpMpxCollectionData::Uri );
+emit songSelected( songUri );
+break;
 default:
 break;
 }
 }
-if ( doOpen ) {
+// TODO: "showingPopup()" used as workaround for HbListView multiple events: longPress and activated.
-// TODO: "if" used as workaround for HbListView multiple events: longPress and activated.
+//       Remove once HbListView get fixed (wk16)
-//       Remove once HbListView get fixed (wk14 or 16)
+if ( doOpen && !mMpPopupHandler->showingPopup() ) {
-if ( !mMpPopupHandler->showingPopup() ) {
+if ( mCollectionContext == ECollectionContextArtistAlbums ) {
+if ( (mCollectionData->count() > 1) && (index == 0) ) {
+mMpEngine->openCollectionItem( index );
+}
+else {
+// Artist-Album view going into T-bone. We don't actually open the
+// collection. Just fake an open.
+mCollectionData->setContext( ECollectionContextArtistAlbumsTBone );
+}
+}
+else if ( mCollectionContext == ECollectionContextAlbums ) {
+// Album view going into T-bone. We don't actually open the
+// collection. Just fake an open.
+mCollectionData->setContext( ECollectionContextAlbumsTBone );
+}
+else {
+// Real open. Forward it to the engine.
 mMpEngine->openCollectionItem( index );
 }
+}
+TX_EXIT
+}
+/*!
+Slot to be called when an album is centered in T-Bone view and we need to
+find the songs beloging to album with \a index.
+*/
+void MpCollectionView::findAlbumSongs( int index )
+{
+TX_ENTRY_ARGS( "index=" << index );
+mMpEngine->findAlbumSongs(index);
+TX_EXIT
+}
+/*!
+Slot to be called when a song is selected in T-Bone view and we need to
+play album with \a albumIndex starting with the songs with \a songIndex.
+*/
+void MpCollectionView::playAlbumSongs( int albumIndex, int songIndex )
+{
+TX_ENTRY_ARGS( "albumIndex=" << albumIndex << "songIndex=" << songIndex );
+// TODO: "showingPopup()" used as workaround for HbListView multiple events: longPress and activated.
+//       Remove once HbListView get fixed (wk16)
+if ( !mMpPopupHandler->showingPopup() ) {
+mMpEngine->playAlbumSongs(albumIndex, songIndex);
 }
 TX_EXIT
 }
 /*!
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
 case ECollectionContextArtists:
 case ECollectionContextAlbums:
 case ECollectionContextPlaylists:
-case ECollectionContextGenres:
 // Exit from these levels.
 doExit = true;
 break;
-case ECollectionContextAlbumSongs:
 case ECollectionContextArtistAlbums:
-case ECollectionContextArtistSongs:
+case ECollectionContextArtistAllSongs:
 case ECollectionContextPlaylistSongs:
-case ECollectionContextGenreSongs:
 mMpEngine->back();
+break;
+case ECollectionContextArtistAlbumsTBone:
+if ( mCollectionData->count() > 1 ) {
+// Going from T-Bone to Artist-Album view; Need to fake back.
+mCollectionData->setContext(ECollectionContextArtistAlbums);
+}
+else {
+// There only 1 album under this artist. Return to artist view.
+mMpEngine->back();
+}
+break;
+case ECollectionContextAlbumsTBone:
+// Going from T-Bone to Album view; Need to fake back.
+mCollectionData->setContext(ECollectionContextAlbums);
 break;
 default:
 doExit = true;
 break;
 }
 // Send an empty string to indicate that user has cancelled
 // the fetch operation
 emit songSelected( "" );
 }
 else {
-emit command( MpCommon::Exit );
+emit command( MpCommon::SendToBackground );
 }
 }
 TX_EXIT
 }
 /*!
 Slot to be called when 'Add to playlist' is clicked by the user from the menu.
 */
 void MpCollectionView::addToPlaylist()
 {
-mMpPopupHandler->openAddSongsToPlaylist( mCollectionDataModel );
+switch ( mCollectionContext ) {
+case ECollectionContextArtistAlbumsTBone:
+case ECollectionContextAlbumsTBone:
+mMpPopupHandler->openAddSongsToPlaylistFromTBone();
+break;
+default:
+mMpPopupHandler->openAddSongsToPlaylist( mCollectionDataModel );
+break;
+}
 }
 /*!
 Slot to be called when 'Delete' is clicked by the user from the menu.
 */
 /*!
 Slot to be called when 'Add to playlist' operation has completed.
 */
 void MpCollectionView::playlistSaved( bool success )
 {
-if ( success &&
+if ( success
-( ECollectionContextPlaylists == mCollectionContext ||
+&& ( ECollectionContextPlaylists == mCollectionContext
-ECollectionContextPlaylistSongs == mCollectionContext ) ) {
+|| ECollectionContextPlaylistSongs == mCollectionContext ) ) {
 mMpEngine->reopenCollection();
 }
 }
 /*!
 /*!
 Slot to be called to arrange songs in a playlist.
 */
 void MpCollectionView::arrangeSongs( )
 {
-mMpPopupHandler->openArrangeSongs( mCollectionData );
+mMpPopupHandler->openArrangeSongs();
 }
 /*!
 Slot to be called when an item is long pressed by the user.
 */
 // Playlists
 action = createToolBarAction( actionsGroup, "qtg_mono_playlist" );
 connect( action, SIGNAL( triggered( bool ) ), this, SLOT( openPlaylists() ) );
 mMainToolBar->addAction( action );
-// Genres
-action = createToolBarAction( actionsGroup, "qtg_mono_search" );
-connect( action, SIGNAL( triggered( bool ) ), this, SLOT( find() ) );
-mMainToolBar->addAction( action );
 if ( mViewMode != MpCommon::FetchView ) {
 // Music Store
 action = createToolBarAction(actionsGroup, "qtg_mono_ovistore" );
 connect( action, SIGNAL( triggered( bool ) ), this, SLOT( openMusicStore() ) );
 mMainToolBar->addAction( action );
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
 action = qobject_cast<HbAction*>( mMainToolBar->actions()[KMainToolBarAll] );
 break;
 case ECollectionContextArtists:
-case ECollectionContextArtistAlbums:
 action = qobject_cast<HbAction*>( mMainToolBar->actions()[KMainToolBarArtists] );
 break;
 case ECollectionContextAlbums:
-case ECollectionContextAlbumSongs:
 action = qobject_cast<HbAction*>( mMainToolBar->actions()[KMainToolBarAlbums] );
 break;
 case ECollectionContextPlaylists:
-case ECollectionContextPlaylistSongs:
 action = qobject_cast<HbAction*>( mMainToolBar->actions()[KMainToolBarPlaylists] );
 break;
 }
 if ( action ) {
 action->setChecked( true );
 menuAction->setDisabled( true );
 }
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 break;
 case ECollectionContextAlbums:
-//connect( myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) ), SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
-// Todo: View as coverflow
 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 ECollectionContextArtistSongs:
+case ECollectionContextArtistAlbumsTBone:
-case ECollectionContextAlbumSongs:
+case ECollectionContextArtistAllSongs:
-menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
+case ECollectionContextAlbumsTBone:
+menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) );
 if ( !mUsbBlocked ) {
 connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
 }
 else {
 menuAction->setDisabled( true );
 break;
 }
 }
 else if ( mViewMode == MpCommon::FetchView ) {
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
-menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
+case ECollectionContextArtists:
-if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-}
-else {
-menuAction->setDisabled( true );
-}
-break;
 case ECollectionContextAlbums:
-//connect( myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) ), SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) );
-// Todo: View as coverflow
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
 if ( !mUsbBlocked ) {
 connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
 }
 else {
 takeToolBar();
 setToolBar( new HbToolBar );
 }
 break;
 case ECollectionContextArtistAlbums:
-case ECollectionContextArtistSongs:
+case ECollectionContextArtistAlbumsTBone:
-case ECollectionContextAlbumSongs:
+case ECollectionContextArtistAllSongs:
-case ECollectionContextGenreSongs:
+case ECollectionContextAlbumsTBone:
 if ( !toolBar()->actions().empty() ) {
 takeToolBar();
 setToolBar( new HbToolBar );
 }
 break;
 void MpCollectionView::setSoftkey()
 {
 if ( mViewMode == MpCommon::FetchView ) {
 // 'Back' is used in all views in fetch mode because we must
 // appear as an embedded application.
-setNavigationAction( mNavigationBack );
+setNavigationAction( mSoftKeyBack );
 }
 else {
 switch ( mCollectionContext ) {
 case ECollectionContextAllSongs:
 case ECollectionContextArtists:
 case ECollectionContextAlbums:
 case ECollectionContextPlaylists:
-case ECollectionContextGenres:
+setNavigationAction( mSoftKeyQuit );
-setNavigationAction( mNavigationQuit );
 break;
 default:
-setNavigationAction( mNavigationBack );
+setNavigationAction( mSoftKeyBack );
 break;
 }
 }
 }
 }
 mSnapshot->capture( mWindow, mMainContainer );
 mWindow->scene()->addItem( mSnapshot );
-if ( ( contextFrom == ECollectionContextAlbums && contextTo == ECollectionContextAlbumSongs ) ||
+if ( ( contextFrom == ECollectionContextAlbums && contextTo == ECollectionContextAlbumsTBone ) ||
 ( contextFrom == ECollectionContextArtists && contextTo == ECollectionContextArtistAlbums ) ||
-( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextAlbumSongs ) ||
+( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistAlbumsTBone ) ||
-( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistSongs ) ||
+( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistAllSongs ) ||
-( contextFrom == ECollectionContextPlaylists && contextTo == ECollectionContextPlaylistSongs ) ||
+( contextFrom == ECollectionContextPlaylists && contextTo == ECollectionContextPlaylistSongs ) ) {
-( contextFrom == ECollectionContextGenres && contextTo == ECollectionContextGenreSongs ) ) {
 HbEffect::start( mSnapshot,
 QString( "container" ),
 QString( "slide_out_to_left" ),
 this,
 "containerTransitionComplete",
 QString( "slide_in_to_left_and_fade_in" ),
 this,
 "containerTransitionComplete",
 QString( "mainContainer_effect") );
 }
-else if( ( contextFrom == ECollectionContextAlbumSongs && contextTo == ECollectionContextAlbums ) ||
+else if( ( contextFrom == ECollectionContextAlbumsTBone && contextTo == ECollectionContextAlbums ) ||
 ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtists ) ||
-( contextFrom == ECollectionContextAlbumSongs && contextTo == ECollectionContextArtistAlbums ) ||
+( contextFrom == ECollectionContextArtistAlbumsTBone && contextTo == ECollectionContextArtistAlbums ) ||
-( contextFrom == ECollectionContextArtistSongs && contextTo == ECollectionContextArtistAlbums ) ||
+( contextFrom == ECollectionContextArtistAllSongs && contextTo == ECollectionContextArtistAlbums ) ||
-( contextFrom == ECollectionContextPlaylistSongs && contextTo == ECollectionContextPlaylists ) ||
+( contextFrom == ECollectionContextPlaylistSongs && contextTo == ECollectionContextPlaylists ) ) {
-( contextFrom == ECollectionContextGenreSongs && contextTo == ECollectionContextGenres ) ) {
 HbEffect::start( mSnapshot,
 QString( "container" ),
 QString( "slide_out_to_right" ),
 this,
 "containerTransitionComplete",
 QString( "slide_in_to_top_and_fade_in" ),
 this,
 "containerTransitionComplete",
 QString( "mainContainer_effect") );
 }
 }
 /*!
 \internal
 Closes any active dialog or menu.

changeset 29	8192e5b5c935
parent 25	3ec52facab4d
child 32	c163ef0b758d