FCL/sf/app/musicplayer: comparison app/src/mpmainwindow.cpp

equal deleted inserted replaced

-:eb79a7c355bf
+:b93f525c9244
 #include "mpenginefactory.h"
 #include "mpsettingsmanager.h"
 #include "mpglobalpopuphandler.h"
 #include "mptrace.h"
+const QString MUSIC_MAIN_VIEW = "MusicMainView";
+const QString MUSIC_NOW_PLAYING_VIEW = "MusicNowPlayingView";
 /*!
 \class MpMainWindow
 \brief The MpMainWindow class provides Main Window functionalities.
 MpMainWindow handles activation of views
 mDetailsViewPlugin(0),
 mMediaWallViewPlugin(0),
 mCurrentViewPlugin(0),
 mVerticalViewType( CollectionView ),
 mMusicServices(0),
-mPopupHandler(0)
+mPopupHandler(0),
+mUserExit( false ),
+mActivityManager(0)
 {
 TX_LOG
 }
 /*!
 TX_LOG_ARGS("connection error: " << err);
 XQServiceUtil::toBackground( false );
 }
 if ( !mMusicServices ) {
+HbApplication* app = qobject_cast<HbApplication*>(qApp);
+QVariantHash params = app->activateParams();
 MpEngineFactory::createSharedEngine();
 mPopupHandler = new MpGlobalPopupHandler( this );
+if( app->activateReason() == Hb::ActivationReasonActivity ) {
+// Restoring an activity, not a fresh startup or a service
+// Activities from Task switcher only have one parameter
+if( params.count() == 1 ) {
+loadActivity( app->activateData() );
+}
+}
 if ( orientation() == Qt::Vertical ) {
 // If first startup ignore shuffleAll and send to collection view to refresh library
 if ( mode == MusicMainView  || MpSettingsManager::firstStartup() ) {
-loadView(CollectionView);
+loadView( CollectionView );
-activateView(CollectionView);
+activateView( CollectionView );
-loadView(MediaWallView);
+loadView( MediaWallView );
 loadView( PlaybackView );
-} else if (mode == MusicNowPlayingViewShuffleAll ) {
+} else if ( mode == MusicNowPlayingView ) {
-MpEngineFactory::sharedEngine()->shuffleAll();
+if( params.contains( "shuffle" ) ) {
+if( !params.value( "shuffle" ).toString().compare( "yes" ) ) {
+MpEngineFactory::sharedEngine()->shuffleAll();
+}
+}
 loadView( PlaybackView );
-activateView(PlaybackView);
+activateView( PlaybackView );
-loadView(CollectionView);
+loadView( CollectionView );
-loadView(MediaWallView);
+loadView( MediaWallView );
 }
 }
 else {
 // If first startup ignore shuffleAll and send to refresh library
-if( mode == MusicNowPlayingViewShuffleAll && !MpSettingsManager::firstStartup() ) {
+if( mode == MusicNowPlayingView && !MpSettingsManager::firstStartup() ) {
-MpEngineFactory::sharedEngine()->shuffleAll();
+if( params.contains( "shuffle" ) ) {
+if( !params.value( "shuffle" ).toString().compare( "yes" ) ) {
+MpEngineFactory::sharedEngine()->shuffleAll();
+}
+}
 mVerticalViewType = PlaybackView;
 }
-loadView(MediaWallView);
+loadView( MediaWallView );
-activateView(MediaWallView);
+activateView( MediaWallView );
-loadView(CollectionView);
+loadView( CollectionView );
 loadView( PlaybackView );
 }
 connect(this, SIGNAL( orientationChanged( Qt::Orientation ) ), SLOT( switchView( Qt::Orientation ) ) );
 connect( MpEngineFactory::sharedEngine(), SIGNAL( libraryUpdated() ), SLOT( handleLibraryUpdated() ) );
 MpEngineFactory::sharedEngine()->checkForSystemEvents();
-//Register to application manager to wait for activities
+//Register to application manager to wait for activities and clear previous activities on the task switcher
-HbApplication* app = qobject_cast<HbApplication*>(qApp);
+mActivityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-app->activityManager()->waitActivity();
+mActivityManager->waitActivity();
+mActivityManager->removeActivity( MUSIC_MAIN_VIEW );
+mActivityManager->removeActivity( MUSIC_NOW_PLAYING_VIEW );
 connect( app, SIGNAL( activate() ), this , SLOT( handleActivity() ) );
+connect( app, SIGNAL( aboutToQuit() ), this, SLOT( saveActivity() ) );
+emit applicationReady();
 }
 else {
 setOrientation(Qt::Vertical, true);//This sould prevent media wall activation.
 }
 switch ( commandCode ) {
 case MpCommon::Exit:
 if ( mCurrentViewPlugin ) {
 disconnectView();
 }
+mUserExit = true;
 qApp->quit();
 break;
 case MpCommon::SendToBackground:
 lower();
 break;
 HbMainWindow::keyPressEvent (event);
 break;
 }
 }
+/*!
+Slot to initialize the view that corresponds to the requested service
+*/
 void MpMainWindow::initializeServiceView( TUid hostUid )
 {
 switch (mMusicServices->currentService()) {
 case MusicServices::EUriFetcher:
 }
 default:
 Q_ASSERT_X(false, "MpMainWindow::initializeServiceView", "undefined service");
 break;
 }
+emit applicationReady();
+}
+/*!
+Slot to handle activity switching once the stand alone instance is running and registered
+in the activity manager to wait for activities.
+Only running activity supported at the moment is "MusicNowPlayingView"
+*/
+void MpMainWindow::handleActivity()
+{
+TX_ENTRY
+HbApplication* app = qobject_cast<HbApplication*>(qApp);
+QString activityId = app->activateId();
+if( !activityId.compare( MUSIC_NOW_PLAYING_VIEW ) ) {
+if ( orientation() == Qt::Vertical ) {
+if( mVerticalViewType != PlaybackView ) {
+activateView( PlaybackView );
+}
+}
+}
+mActivityManager->waitActivity();
+TX_EXIT
+}
+/*!
+Slot to save activity upon exiting application
+*/
+void MpMainWindow::saveActivity()
+{
+TX_ENTRY
+QString activity = ( mVerticalViewType == CollectionView ) ? MUSIC_MAIN_VIEW : MUSIC_NOW_PLAYING_VIEW;
+//Get data from engine
+QByteArray serializedRestorePath;
+if ( mUserExit ) {
+//Internal exit will always return to the main view
+activity = MUSIC_MAIN_VIEW;
+}
+else {
+//Only saved data if exited via task switcher or GOOM
+MpEngineFactory::sharedEngine()->saveActivityData( serializedRestorePath );
+}
+QVariantHash activityParameters;
+activityParameters.insert( "screenshot", QPixmap::grabWidget( this, this->rect() ) );
+QVariantHash activityData;
+activityData.insert( "restorePath", serializedRestorePath );
+bool ok = mActivityManager->addActivity( activity , activityData, activityParameters );
+if ( !ok ){
+TX_LOG_ARGS( "Error: Add Failed; should never get here." );
+}
+TX_EXIT
+}
+/*!
+Slot to handle a failed path restoration. Switch to collection view if not already there.
+*/
+void MpMainWindow::handleRestorePathFailed()
+{
+TX_ENTRY
+if ( orientation() == Qt::Vertical ) {
+if( mVerticalViewType != CollectionView ) {
+activateView( CollectionView );
+}
+}
+TX_EXIT
 }
 /*!
 loads a view if type \a  type, return the view plugin, if view is already loaded it will not reload the view.
 */
 Q_ASSERT( plugin ? *plugin : 0 );
 return plugin ? *plugin : 0;
 }
 /*!
-Slot to handle activity switching once the stand alone instance is running and registered
+Load activity called via task switcher
-in the activity manager to wait for activities.
+Restore view and playback path if applicable
-Only running activity supported at the moment is "MusicNowPlayingView"
+*/
-*/
+void MpMainWindow::loadActivity( QVariant data )
-void MpMainWindow::handleActivity()
+{
-{
+TX_ENTRY
-HbApplication* app = qobject_cast<HbApplication*>(qApp);
+QVariantHash activityData = data.toHash();
-QString activityId = app->activateId();
+QByteArray serializedRestorePath = activityData.value( "restorePath" ).toByteArray();
+MpEngineFactory::sharedEngine()->loadActivityData( serializedRestorePath );
-if( !activityId.compare( "MusicNowPlayingView&launchtype=standalone" ) ) {
+TX_EXIT
-if ( orientation() == Qt::Vertical ) {
+}
-if( mVerticalViewType != PlaybackView ) {
-activateView( PlaybackView );
-}
-}
-}
-HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-activityManager->waitActivity();
-}

changeset 38	b93f525c9244
parent 37	eb79a7c355bf
child 43	0f32e550d9d8
child 48	af3740e3753f