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

equal deleted inserted replaced

-:a0afa279b8fe
+:eb79a7c355bf
 #include <hbaction.h>
 #include <hbtoolbar.h>
 #include <hbmenu.h>
 #include <hbmessagebox.h>
 #include <hblabel.h>
-#include <QTranslator>
-#include <QLocale>
 #include <hblistview.h>
 #include <hbscrollbar.h>
 #include "mpcollectionview.h"
 #include "mpcollectiondocumentloader.h"
 #include "mpcollectionlistcontainer.h"
 #include "mpcollectionpopuphandler.h"
 const char*MUSIC_COLLECTION_DOCML = ":/docml/musiccollection.docml";
-const char*EFFECT_SELECT = ":/effects/select.fxml";
-const char*EFFECT_SELECT_END = ":/effects/select_end.fxml";
+const char*CONTAINER_EFFECT_GROUP = "mpcontainer";
+const char*SHOW_EFFECT = "show";
+const char*HIDE_EFFECT = "hide";
+const char*SHOW_BACK_EFFECT = "show_back";
+const char*HIDE_BACK_EFFECT = "hide_back";
+const char*SHOW_EFFECT_RESOURCE_NAME = "view_show_normal";
+const char*HIDE_EFFECT_RESOURCE_NAME = "view_hide_normal";
+const char*SHOW_BACK_EFFECT_RESOURCE_NAME = "view_show_back";
+const char*HIDE_BACK_EFFECT_RESOURCE_NAME = "view_hide_back";
+const char*EFFECT_TARGET_SNAPSHOT = "snapshot";
+const char*EFFECT_TARGET_CONTAINER = "container";
 const int KMainToolBarAll = 0;
 const int KMainToolBarArtists = 1;
 const int KMainToolBarAlbums = 2;
 const int KMainToolBarPlaylists = 3;
 mDocumentLoader( 0 ),
 mMainContainer( 0 ),
 mMainToolBar( 0 ),
 mPlaylistToolBar( 0 ),
 mSnapshot( 0 ),
-mMpTranslator( 0 ),
-mCommonTranslator( 0 ),
 mActivationWaiting( false ),
 mMpPopupHandler( 0 ),
 mUsbBlocked( false )
 {
 TX_LOG
 delete mCollectionContainer;
 delete mContainerFactory;
 delete mCollectionDataModel;
 delete mDocumentLoader;
-delete mMpTranslator;
-delete mCommonTranslator;
 TX_EXIT
 }
 /*!
 Initializes the collection view. Allocates all resources needed by the view.
 */
 void MpCollectionView::initializeView()
 {
 TX_ENTRY
-//Load musicplayer and common translators
-QString lang = QLocale::system().name();
-QString path = QString( "z:/resource/qt/translations/" );
-bool translatorLoaded = false;
-mMpTranslator = new QTranslator( this );
-translatorLoaded = mMpTranslator->load( path + "musicplayer_" + lang );
-TX_LOG_ARGS( "Loading translator ok=" << translatorLoaded );
-if ( translatorLoaded ) {
-qApp->installTranslator( mMpTranslator );
-}
-mCommonTranslator = new QTranslator( this );
-translatorLoaded = mCommonTranslator->load( path + "common_" + lang );
-TX_LOG_ARGS( "Loading common translator ok=" << translatorLoaded );
-if ( translatorLoaded ) {
-qApp->installTranslator( mCommonTranslator );
-}
 mWindow = mainWindow();
 // Create softkey actions
 mSoftKeyQuit = new HbAction( Hb::QuitNaviAction, this );
 widget = mDocumentLoader->findWidget( QString( "mainContainer" ) );
 mMainContainer = qobject_cast<HbWidget*>( widget );
 setWidget( mMainContainer );
-HbEffect::add( QString( "container" ),
+HbEffect::add(
-QString( ":/effects/slide_out_to_left.fxml" ),
+QStringList() << CONTAINER_EFFECT_GROUP << CONTAINER_EFFECT_GROUP << CONTAINER_EFFECT_GROUP << CONTAINER_EFFECT_GROUP,
-QString( "slide_out_to_left" ) );
+QStringList() << SHOW_EFFECT_RESOURCE_NAME <<  HIDE_EFFECT_RESOURCE_NAME << SHOW_BACK_EFFECT_RESOURCE_NAME << HIDE_BACK_EFFECT_RESOURCE_NAME,
+QStringList() << SHOW_EFFECT << HIDE_EFFECT << SHOW_BACK_EFFECT << HIDE_BACK_EFFECT);
-HbEffect::add( QString( "container" ),
-QString( ":/effects/slide_out_to_right.fxml" ),
-QString( "slide_out_to_right" ) );
-HbEffect::add( QString( "container" ),
-QString( ":/effects/slide_out_to_top.fxml" ),
-QString( "slide_out_to_top" ) );
-HbEffect::add( QString( "container" ),
-QString( ":/effects/slide_in_to_right_and_fade_in.fxml" ),
-QString( "slide_in_to_right_and_fade_in" ) );
-HbEffect::add( QString( "container" ),
-QString( ":/effects/slide_in_to_left_and_fade_in.fxml" ),
-QString( "slide_in_to_left_and_fade_in" ) );
-HbEffect::add( QString( "container" ),
-QString( ":/effects/slide_in_to_top_and_fade_in.fxml" ),
-QString( "slide_in_to_top_and_fade_in" ) );
 }
 else {
 TX_LOG_ARGS( "Error: invalid xml file." );
 Q_ASSERT_X( ok, "MpCollectionView::initializeView", "invalid xml file" );
 }
 this, SLOT( handleLibraryUpdated() ) );
 mUsbBlocked = mMpEngine->verifyUsbBlocking();
 if ( MpSettingsManager::firstStartup() ) {
 mActivationWaiting = true;
-mMpEngine->refreshLibrary();
+mMpEngine->refreshLibrary( true );
 }
 TX_EXIT
 }
 */
 void MpCollectionView::deactivateView()
 {
 TX_ENTRY
 mActivated = false;
-cancelOngoingOperation();
+closeActiveDialog( true );
 setNavigationAction( 0 );
 TX_EXIT
 }
 mCollectionContext = context;
 // Reset softkey and the menu
 if ( mActivated ) {
 setSoftkey();
 }
+// Close any possible popup already launched with previous context
+closeActiveDialog();
 updateToolBar();
 updateMenu();
 mCollectionContainer = mContainerFactory->createContainer( context );
 mCollectionContainer->setViewMode( mViewMode );
 break;
 default:
 break;
 }
 }
-// TODO: "showingPopup()" used as workaround for HbListView multiple events: longPress and activated.
-//       Remove once HbListView get fixed (wk16)
+if ( doOpen ) {
-if ( doOpen && !mMpPopupHandler->showingPopup() ) {
 if ( mCollectionContext == ECollectionContextArtistAlbums ) {
 if ( (mCollectionData->count() > 1) && (index == 0) ) {
 mMpEngine->openCollectionItem( index );
 }
 else {
 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.
+mMpEngine->playAlbumSongs(albumIndex, songIndex);
-//       Remove once HbListView get fixed (wk16)
-if ( !mMpPopupHandler->showingPopup() ) {
-mMpEngine->playAlbumSongs(albumIndex, songIndex);
-}
 TX_EXIT
 }
 /*!
 Slot to be called when back/quit softkey is pressed.
 /*!
 Slot for container transition end.
 */
 void MpCollectionView::containerTransitionComplete( const HbEffect::EffectStatus &status )
 {
-if ( status.userData == "snapshot_effect" ) {
+if ( status.userData == EFFECT_TARGET_SNAPSHOT ) {
 qobject_cast<QGraphicsView *>( mWindow )->scene()->removeItem( mSnapshot );
 mSnapshot->deleteLater();
 mSnapshot = 0;
 }
 }
 break;
 }
 }
 /*!
-Slot to be called when 'Refresh Library' is clicked by the user from the menu.
-*/
-void MpCollectionView::refreshLibrary()
-{
-mMpEngine->refreshLibrary();
-}
-/*!
 Slot to be called when 'Add to playlist' is clicked by the user from the menu.
 */
 void MpCollectionView::addToPlaylist()
 {
 switch ( mCollectionContext ) {
 void MpCollectionView::handleUsbBlocked( bool blocked )
 {
 TX_ENTRY_ARGS( "blocked=" << blocked );
 mUsbBlocked = blocked;
-cancelOngoingOperation();
+closeActiveDialog();
 updateMenu();
 if ( mCollectionContext == ECollectionContextPlaylistSongs ) {
 updateToolBar();
 }
 Slot to be called when library is going to be updated.
 */
 void MpCollectionView::handleLibraryAboutToUpdate()
 {
 TX_ENTRY
-cancelOngoingOperation();
+closeActiveDialog();
 TX_EXIT
 }
 /*!
 Slot to be called when refreshing completes or library has been updated.
 if ( mActivationWaiting ) {
 mActivationWaiting = false;
 activateView();
 }
 else {
-cancelOngoingOperation();
+closeActiveDialog();
 //Update cache, even if collection is in background.
 //Library refreshing could be triggered at any point due USB/MMC events.
 mMpEngine->reopenCollection();
 }
 else {
 menuAction->setDisabled( true );
 }
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
 if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
+connect( menuAction, SIGNAL( triggered() ), mMpEngine, SLOT( refreshLibrary() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 break;
 case ECollectionContextArtists:
 case ECollectionContextAlbums:
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
 if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
+connect( menuAction, SIGNAL( triggered() ), mMpEngine, SLOT( refreshLibrary() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
 connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) );
 case ECollectionContextAllSongs:
 case ECollectionContextArtists:
 case ECollectionContextAlbums:
 menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) );
 if ( !mUsbBlocked ) {
-connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
+connect( menuAction, SIGNAL( triggered() ), mMpEngine, SLOT( refreshLibrary() ) );
 }
 else {
 menuAction->setDisabled( true );
 }
 break;
 }
 mSnapshot->capture( mWindow, mMainContainer );
 mWindow->scene()->addItem( mSnapshot );
-if ( ( contextFrom == ECollectionContextAlbums && contextTo == ECollectionContextAlbumsTBone ) ||
+if( ( contextFrom == ECollectionContextAlbumsTBone && contextTo == ECollectionContextAlbums ) ||
-( contextFrom == ECollectionContextArtists && contextTo == ECollectionContextArtistAlbums ) ||
-( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistAlbumsTBone ) ||
-( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistAllSongs ) ||
-( contextFrom == ECollectionContextPlaylists && contextTo == ECollectionContextPlaylistSongs ) ) {
-HbEffect::start( mSnapshot,
-QString( "container" ),
-QString( "slide_out_to_left" ),
-this,
-"containerTransitionComplete",
-QString( "snapshot_effect") );
-HbEffect::start( mMainContainer,
-QString( "container" ),
-QString( "slide_in_to_left_and_fade_in" ),
-this,
-"containerTransitionComplete",
-QString( "mainContainer_effect") );
-}
-else if( ( contextFrom == ECollectionContextAlbumsTBone && contextTo == ECollectionContextAlbums ) ||
 ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtists ) ||
 ( contextFrom == ECollectionContextArtistAlbumsTBone && contextTo == ECollectionContextArtistAlbums ) ||
+( contextFrom == ECollectionContextArtistAlbumsTBone && contextTo == ECollectionContextArtists ) ||
 ( contextFrom == ECollectionContextArtistAllSongs && contextTo == ECollectionContextArtistAlbums ) ||
 ( contextFrom == ECollectionContextPlaylistSongs && contextTo == ECollectionContextPlaylists ) ) {
 HbEffect::start( mSnapshot,
-QString( "container" ),
+QString( CONTAINER_EFFECT_GROUP ),
-QString( "slide_out_to_right" ),
+QString( HIDE_BACK_EFFECT ),
 this,
 "containerTransitionComplete",
-QString( "snapshot_effect") );
+QString( EFFECT_TARGET_SNAPSHOT) );
 HbEffect::start( mMainContainer,
-QString( "container" ),
+QString( CONTAINER_EFFECT_GROUP ),
-QString( "slide_in_to_right_and_fade_in" ),
+QString( SHOW_BACK_EFFECT ),
 this,
 "containerTransitionComplete",
-QString( "mainContainer_effect") );
+QString( EFFECT_TARGET_CONTAINER) );
 }
 else {
 HbEffect::start( mSnapshot,
-QString( "container" ),
+QString( CONTAINER_EFFECT_GROUP ),
-QString( "slide_out_to_top" ),
+QString( HIDE_EFFECT ),
 this,
 "containerTransitionComplete",
-QString( "snapshot_effect") );
+QString( EFFECT_TARGET_SNAPSHOT) );
 HbEffect::start( mMainContainer,
-QString( "container" ),
+QString( CONTAINER_EFFECT_GROUP ),
-QString( "slide_in_to_top_and_fade_in" ),
+QString( SHOW_EFFECT ),
 this,
 "containerTransitionComplete",
-QString( "mainContainer_effect") );
+QString( EFFECT_TARGET_CONTAINER ) );
 }
 }
 /*!
 \internal
 Closes any active dialog or menu.
 */
-void MpCollectionView::cancelOngoingOperation()
+void MpCollectionView::closeActiveDialog( bool onlyContextMenu )
 {
-if ( mActivated ) {
+mMpPopupHandler->cancelOngoingPopup( onlyContextMenu );
-mMpPopupHandler->cancelOngoingPopup();
+menu()->close();
-menu()->close();
+}
-}
-}

changeset 37	eb79a7c355bf
parent 36	a0afa279b8fe
child 38	b93f525c9244