Publish

- + - +

+ + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + +

@@ -85,16 +122,39 @@

- + + + + + + + + + + + + +

+ +

+ + - + + + + + + + - - + + +

diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainer.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainer.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainer.cpp Fri May 14 18:54:37 2010 -0500 @@ -46,12 +46,19 @@ */ /*! + \fn void albumCentered( int index ); + + This signal is emitted only when container contains hgmediawall T-Bone when album + with \a index is centered following a scrolling action. + */ + +/*! Constructs the collection container. */ MpCollectionContainer::MpCollectionContainer( HbDocumentLoader *loader, QGraphicsItem *parent ) : HbWidget(parent), mDocumentLoader(loader), - mCollectionContext(ECollectionContextUnknown) + mViewMode(MpCommon::DefaultView) { TX_LOG } @@ -66,6 +73,9 @@ /*! Sets the data model for the container. + Some of the containers are used for multiple contexts, i.e. Artist, Albums, Playlists. So, + setDataModel() is called multiple times to the same container object. We only want to connect + to dataReloaded() signal once or we'll receive multiple call backs. */ void MpCollectionContainer::setDataModel( MpCollectionDataModel *dataModel ) { @@ -73,6 +83,7 @@ mDataModel = dataModel; mCollectionData = mDataModel->collectionData(); mCollectionContext = mCollectionData->context(); + connect( dataModel, SIGNAL(dataReloaded()), this, SLOT(dataReloaded()), Qt::UniqueConnection ); setupContainer(); TX_EXIT diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontaineralbums.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontaineralbums.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontaineralbums.cpp Fri May 14 18:54:37 2010 -0500 @@ -22,8 +22,12 @@ #include #include +#include + #include "mpcollectioncontaineralbums.h" #include "mpmpxcollectiondata.h" +#include "mpcollectiondatamodel.h" +#include "mpcollectiontbonelistdatamodel.h" #include "mptrace.h" /*! @@ -36,7 +40,7 @@ This container handles the following contexts: \li ECollectionContextAlbums - \li ECollectionContextAlbumSongs + \li ECollectionContextAlbumsTBone \sa MpCollectionContainer */ @@ -46,9 +50,13 @@ */ MpCollectionContainerAlbums::MpCollectionContainerAlbums( HbDocumentLoader *loader, QGraphicsItem *parent ) : MpCollectionListContainer(loader, parent), - mInfoBar(0) + mInfoBar(0), + mTBone(0), + mTBoneListModel(0), + mCurrentAlbumIndex(0) { TX_LOG + mCollectionContext = ECollectionContextAlbums; } /*! @@ -57,30 +65,119 @@ MpCollectionContainerAlbums::~MpCollectionContainerAlbums() { TX_ENTRY - delete mInfoBar; + delete mInfoBar; + delete mTBone; delete mList; + delete mTBoneListModel; + TX_EXIT +} + +/*! + Sets the data model for the container. + */ +void MpCollectionContainerAlbums::setDataModel( MpCollectionDataModel *dataModel ) +{ + TX_ENTRY + MpCollectionContainer::setDataModel(dataModel); + if ( mCollectionContext == ECollectionContextAlbums ) { + if ( mList ) { + mList->setModel(dataModel); + if ( mCollectionData->count() ) { + mList->scrollTo( dataModel->index(mCurrentAlbumIndex, 0) ); + } + } + } + else if ( mCollectionContext == ECollectionContextAlbumsTBone ) { + if ( mTBone ) { + mTBone->setModel(dataModel); + mTBone->scrollTo( dataModel->index(mCurrentAlbumIndex, 0) ); + if ( mTBoneListModel == 0 ) { + mTBoneListModel = new MpCollectionTBoneListDataModel(mCollectionData); + connect( mTBoneListModel, SIGNAL(albumDataChanged()), this, SLOT(albumDataChanged()) ); + } + mList->setModel(mTBoneListModel); + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); + } + } + } TX_EXIT } /*! Slot to be called when an item is selected by the user. - */ +*/ void MpCollectionContainerAlbums::itemActivated( const QModelIndex &index ) { - int row = index.row(); - TX_ENTRY_ARGS("index=" << row); + if ( mCollectionContext == ECollectionContextAlbums ) { + mCurrentAlbumIndex = index.row(); + TX_ENTRY_ARGS("mCurrentAlbumIndex=" << mCurrentAlbumIndex); + MpCollectionListContainer::itemActivated(index); + } + else if ( mCollectionContext == ECollectionContextAlbumsTBone ) { + int row = index.row(); + TX_ENTRY_ARGS("index=" << row); + if ( mViewMode == MpCommon::FetchView ) { + MpCollectionListContainer::itemActivated(index); + } + else { + emit playAlbumSongs(mCurrentAlbumIndex, row); + } + } + TX_EXIT +} - mAlbum = mCollectionData->itemData(row, MpMpxCollectionData::Title); - if ( mAlbum.isEmpty() ) { - mAlbum = hbTrId("txt_mus_dblist_val_unknown3"); +/*! + Slot to be called when scrolling ends in media wall and an album is centered. + */ +void MpCollectionContainerAlbums::albumCentered() +{ + TX_ENTRY + QModelIndex index = mTBone->currentIndex(); + if ( mCurrentAlbumIndex != index.row() ) { + // Prevent reloading if user just moves the center album a little + // and the same album re-centers. + mCurrentAlbumIndex = index.row(); + TX_LOG_ARGS("mCurrentAlbumIndex=" << mCurrentAlbumIndex); + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); + } } + TX_EXIT +} - mArtist = mCollectionData->itemData(row, MpMpxCollectionData::Artist); - if ( mArtist.isEmpty() ) { - mArtist = hbTrId("txt_mus_subtitle_unknown"); +/*! + Slot to be called data model has new data. + Two cases: + 1) User deleted an album. + 2) User deleted last song in an album. + */ +void MpCollectionContainerAlbums::dataReloaded() +{ + TX_ENTRY + if ( mCollectionContext == ECollectionContextAlbumsTBone ) { + if ( mCurrentAlbumIndex > 0 ) { + --mCurrentAlbumIndex; + } + mTBone->scrollTo( mDataModel->index(mCurrentAlbumIndex, 0) ); + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); + } } + else { + MpCollectionListContainer::dataReloaded(); + } + TX_EXIT +} - MpCollectionListContainer::itemActivated(index); +/*! + Slot to be called data model has new data. + User has deleted one of the songs from TBone list. + */ +void MpCollectionContainerAlbums::albumDataChanged() +{ + TX_ENTRY + emit findAlbumSongs(mCurrentAlbumIndex); TX_EXIT } @@ -111,35 +208,51 @@ delete mInfoBar; mInfoBar = 0; } - } - else if ( mCollectionContext == ECollectionContextAlbumSongs ) { - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "albumSongs", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerAlbums::setupContainer", "invalid xml file"); + if ( mTBone ) { + delete mTBone; + mTBone = 0; } - - widget = mDocumentLoader->findWidget(QString("albumSongsDetail")); - mInfoBar = qobject_cast(widget); - - QString details; + } + else if ( mCollectionContext == ECollectionContextAlbumsTBone ) { if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "albumTBoneFetcher", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerAlbums::setupContainer", "invalid xml file"); + } + widget = mDocumentLoader->findWidget(QString("albumTBoneDetail")); + mInfoBar = qobject_cast(widget); + mInfoBar->setHeading( hbTrId("txt_mus_subtitle_select_a_song") ); } else { - details = mArtist; - details.append(" : "); - details.append(mAlbum); + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "albumTBone", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerAlbums::setupContainer", "invalid xml file"); + } } - mInfoBar->setHeading(details); + widget = mDocumentLoader->findWidget(QString("albumWall")); + mTBone = qobject_cast(widget); + HbIcon defaultIcon( "qtg_large_music_album" ); + defaultIcon.setSize(mTBone->itemSize()); + mTBone->setDefaultImage( defaultIcon.pixmap().toImage() ); + mTBone->setTitleFontSpec( HbFontSpec(HbFontSpec::Primary) ); + mTBone->setDescriptionFontSpec( HbFontSpec(HbFontSpec::Secondary) ); + mTBone->setScrollBarPolicy( HgWidget::ScrollBarAlwaysOff ); + mTBone->enableReflections(true); + connect( mTBone, SIGNAL(scrollingEnded()), this, SLOT(albumCentered()) ); } } else { + // Must delete widgets when last song is deleted and view is reloaded. if ( mInfoBar ) { - // When last song in an album is deleted and album list is reloaded delete mInfoBar; mInfoBar = 0; } + if ( mTBone ) { + delete mTBone; + mTBone = 0; + } // Call empty list from base class setupEmptyListContainer(); } diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp Fri May 14 18:54:37 2010 -0500 @@ -45,6 +45,7 @@ mInfoBar(0) { TX_LOG + mCollectionContext = ECollectionContextAllSongs; } /*! @@ -84,7 +85,7 @@ QString details; if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; + details = hbTrId("txt_mus_subtitle_select_a_song"); } else { int count = mCollectionData->count(); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerartists.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerartists.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerartists.cpp Fri May 14 18:54:37 2010 -0500 @@ -22,8 +22,12 @@ #include #include +#include + #include "mpcollectioncontainerartists.h" #include "mpmpxcollectiondata.h" +#include "mpcollectiondatamodel.h" +#include "mpcollectiontbonelistdatamodel.h" #include "mptrace.h" /*! @@ -37,8 +41,9 @@ This container handles the following contexts: \li ECollectionContextArtists \li ECollectionContextArtistAlbums - \li ECollectionContextArtistSongs - + \li ECollectionContextArtistAlbumsTBone + \li ECollectionContextArtistAllSongs + \sa MpCollectionContainer */ @@ -47,9 +52,14 @@ */ MpCollectionContainerArtists::MpCollectionContainerArtists( HbDocumentLoader *loader, QGraphicsItem *parent ) : MpCollectionListContainer(loader, parent), - mInfoBar(0) + mInfoBar(0), + mTBone(0), + mTBoneListModel(0), + mCurrentArtistIndex(0), + mCurrentAlbumIndex(0) { TX_LOG + mCollectionContext = ECollectionContextArtists; } /*! @@ -59,7 +69,89 @@ { TX_ENTRY delete mInfoBar; + delete mTBone; delete mList; + delete mTBoneListModel; + TX_EXIT +} + +/*! + Sets the data model for the container. + */ +void MpCollectionContainerArtists::setDataModel( MpCollectionDataModel *dataModel ) +{ + TX_ENTRY_ARGS("mCollectionContext=" << mCollectionContext); + MpCollectionContainer::setDataModel(dataModel); + int count = mCollectionData->count(); + switch ( mCollectionContext ) { + case ECollectionContextArtists: + if ( mList ) { + mList->setModel(dataModel); + if ( count ) { + if ( mCurrentArtistIndex >= count ) { + // This can happen if the last item is deleted + mCurrentArtistIndex = count - 1; + } + mList->scrollTo( dataModel->index(mCurrentArtistIndex, 0) ); + } + // Reset the current album index for navigation: + // ECollectionContextArtistAlbums -> ECollectionContextArtists + mCurrentAlbumIndex = 0; + } + break; + case ECollectionContextArtistAlbums: + if ( mList ) { + mList->setModel(dataModel); + if ( count ) { + if ( mCurrentAlbumIndex >= count ) { + // This can happen if the last item is deleted + mCurrentAlbumIndex = count - 1; + } + mList->scrollTo( dataModel->index(mCurrentAlbumIndex, 0) ); + } + // Reset the album index offset for navigation: + // ECollectionContextArtistAlbumsTBone -> ECollectionContextArtistAlbums + mAlbumIndexOffset = 0; + } + break; + case ECollectionContextArtistAlbumsTBone: + if ( mTBone ) { + if ( count > 1 ) { + // Selected artist has more than 1 album and therefore the + // artist's "All songs" exist. Since we don't show artist's + // "All songs" in TBone, we need to set an offset. + mAlbumIndexOffset = 1; + } + else { + // Selected artist has exactly 1 album and therefore the + // artist's "All songs" doesn't exist. + mAlbumIndexOffset = 0; + } + if ( mCurrentAlbumIndex >= count ) { + // This can happen if the last item is deleted + mCurrentAlbumIndex = count - 1; + } + mTBone->setModel(dataModel); + mTBone->scrollTo( dataModel->index(mCurrentAlbumIndex - mAlbumIndexOffset, 0) ); + if ( mTBoneListModel == 0 ) { + mTBoneListModel = new MpCollectionTBoneListDataModel(mCollectionData); + connect( mTBoneListModel, SIGNAL(albumDataChanged()), this, SLOT(albumDataChanged()) ); + } + mList->setModel(mTBoneListModel); + + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); + } + } + break; + case ECollectionContextArtistAllSongs: + if ( mList ) { + mList->setModel(dataModel); + } + break; + default: + break; + } TX_EXIT } @@ -69,21 +161,89 @@ void MpCollectionContainerArtists::itemActivated( const QModelIndex &index ) { int row = index.row(); - TX_ENTRY_ARGS("index=" << row); - - if ( mCollectionContext == ECollectionContextArtists ) { - mArtist = mCollectionData->itemData(row, MpMpxCollectionData::Title); - if ( mArtist.isEmpty() ) { - mArtist = hbTrId("txt_mus_subtitle_unknown"); + TX_ENTRY_ARGS("mCollectionContext=" << mCollectionContext << "index=" << row); + switch ( mCollectionContext ) { + case ECollectionContextArtists: + mCurrentArtistIndex = row; + TX_LOG_ARGS("mCurrentArtistIndex=" << mCurrentArtistIndex); + MpCollectionListContainer::itemActivated(index); + break; + case ECollectionContextArtistAlbums: + mCurrentAlbumIndex = row; + TX_LOG_ARGS("mCurrentAlbumIndex=" << mCurrentAlbumIndex); + MpCollectionListContainer::itemActivated(index); + break; + case ECollectionContextArtistAlbumsTBone: + TX_LOG_ARGS("mCurrentAlbumIndex=" << mCurrentAlbumIndex); + if ( mViewMode == MpCommon::FetchView ) { + MpCollectionListContainer::itemActivated(index); + } + else { + emit playAlbumSongs(mCurrentAlbumIndex, row); + } + break; + case ECollectionContextArtistAllSongs: + MpCollectionListContainer::itemActivated(index); + break; + default: + break; + } + TX_EXIT +} + +/*! + Slot to be called when scrolling ends in media wall and an album is centered. + */ +void MpCollectionContainerArtists::albumCentered() +{ + TX_ENTRY + int index = mTBone->currentIndex().row(); + TX_LOG_ARGS("index=" << index); + index += mAlbumIndexOffset; + if ( mCurrentAlbumIndex != index ) { + // Prevent reloading if user just moves the center album a little + // and the same album re-centers. + mCurrentAlbumIndex = index; + TX_LOG_ARGS("mCurrentAlbumIndex=" << mCurrentAlbumIndex); + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); } } - else if ( mCollectionContext == ECollectionContextArtistAlbums ) { - mAlbum = mCollectionData->itemData(row, MpMpxCollectionData::Title); - if ( mAlbum.isEmpty() ) { - mAlbum = hbTrId("txt_mus_dblist_val_unknown3"); + TX_EXIT +} + +/*! + Slot to be called data model has new data. This occurs after a delete operation is complete. + Two cases: + 1) User deleted an artist. + 2) User deleted last song in an album. + */ +void MpCollectionContainerArtists::dataReloaded() +{ + TX_ENTRY + if ( mCollectionContext == ECollectionContextArtistAlbumsTBone ) { + if ( mCurrentAlbumIndex > 0 ) { + --mCurrentAlbumIndex; + } + mTBone->scrollTo( mDataModel->index(mCurrentAlbumIndex - mAlbumIndexOffset, 0) ); + if ( !mCollectionData->setCurrentAlbum(mCurrentAlbumIndex) ) { + emit findAlbumSongs(mCurrentAlbumIndex); } } - MpCollectionListContainer::itemActivated(index); + else { + MpCollectionListContainer::dataReloaded(); + } + TX_EXIT +} + +/*! + Slot to be called data model has new data. + User has deleted one of the songs from TBone list. + */ +void MpCollectionContainerArtists::albumDataChanged() +{ + TX_ENTRY + emit findAlbumSongs(mCurrentAlbumIndex); TX_EXIT } @@ -98,93 +258,114 @@ if ( mCollectionData->count() ) { bool ok = false; QGraphicsWidget *widget; - if ( mCollectionContext == ECollectionContextArtists ) { - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artists", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); - } - if ( !mList ) { - widget = mDocumentLoader->findWidget(QString("artistsList")); - mList = qobject_cast(widget); - mIndexFeedback->setItemView(mList); - initializeList(); - } - if ( mInfoBar ) { - delete mInfoBar; - mInfoBar = 0; - } - } - else if ( mCollectionContext == ECollectionContextArtistAlbums ) { - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistSongs", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); - } - - widget = mDocumentLoader->findWidget(QString("artistSongsDetail")); - mInfoBar = qobject_cast(widget); - - QString details; - if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; - } - else { - details = mArtist; - } - mInfoBar->setHeading(details); + QString artist; + switch ( mCollectionContext ) { + case ECollectionContextArtists: + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artists", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); + } + if ( !mList ) { + widget = mDocumentLoader->findWidget(QString("artistsList")); + mList = qobject_cast(widget); + mIndexFeedback->setItemView(mList); + initializeList(); + } + if ( mInfoBar ) { + delete mInfoBar; + mInfoBar = 0; + } + if ( mTBone ) { + delete mTBone; + mTBone = 0; + } + break; + case ECollectionContextArtistAlbums: + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistAlbums", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); + } + widget = mDocumentLoader->findWidget(QString("artistDetail")); + mInfoBar = qobject_cast(widget); + + artist = mCollectionData->collectionTitle(); + if ( artist.isEmpty() ) { + artist = hbTrId("txt_mus_subtitle_unknown"); + } + mInfoBar->setHeading(artist); + if ( mTBone ) { + delete mTBone; + mTBone = 0; + } + break; + case ECollectionContextArtistAlbumsTBone: + { + if ( mViewMode == MpCommon::FetchView ) { + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistAlbumTBoneFetcher", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerAlbums::setupContainer", "invalid xml file"); + } + widget = mDocumentLoader->findWidget(QString("artistDetail")); + mInfoBar = qobject_cast(widget); + mInfoBar->setHeading( hbTrId("txt_mus_subtitle_select_a_song") ); + } + else { + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistAlbumTBone", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerAlbums::setupContainer", "invalid xml file"); + } + if ( mInfoBar ) { + delete mInfoBar; + mInfoBar = 0; + } + } + widget = mDocumentLoader->findWidget(QString("artistAlbumWall")); + mTBone = qobject_cast(widget); + HbIcon defaultIcon( "qtg_large_music_album" ); + defaultIcon.setSize(mTBone->itemSize()); + mTBone->setDefaultImage( defaultIcon.pixmap().toImage() ); + mTBone->setTitleFontSpec( HbFontSpec(HbFontSpec::Primary) ); + mTBone->setDescriptionFontSpec( HbFontSpec(HbFontSpec::Secondary) ); + mTBone->setScrollBarPolicy( HgWidget::ScrollBarAlwaysOff ); + mTBone->enableReflections(true); + connect( mTBone, SIGNAL(scrollingEnded()), this, SLOT(albumCentered()) ); + } + break; + case ECollectionContextArtistAllSongs: + // No need to load anything. Just reuse the section "artistAlbums" loaded + // in ECollectionContextArtistAlbums context. + if ( mViewMode == MpCommon::FetchView ) { + mInfoBar->setHeading( hbTrId("txt_mus_subtitle_select_a_song") ); + } + else { + artist = mCollectionData->collectionTitle(); + if ( artist.isEmpty() ) { + artist = hbTrId("txt_mus_subtitle_unknown_all"); + } + else { + artist = hbTrId("txt_mus_subtitle_1_all").arg(artist); + } + mInfoBar->setHeading(artist); + } + break; + default: + break; } - else if ( mCollectionContext == ECollectionContextAlbumSongs ) { - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistSongs", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); - } - - widget = mDocumentLoader->findWidget(QString("artistSongsDetail")); - mInfoBar = qobject_cast(widget); - - QString details; - if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; - } - else { - details = mArtist; - details.append(" - "); - details.append(mAlbum); - } - mInfoBar->setHeading(details); - } - else if ( mCollectionContext == ECollectionContextArtistSongs ) { - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "artistSongs", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerArtists::setupContainer", "invalid xml file"); - } - - widget = mDocumentLoader->findWidget(QString("artistSongsDetail")); - mInfoBar = qobject_cast(widget); - - QString details; - if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; - } - else if ( mArtist.isEmpty() ) { - details = hbTrId("txt_mus_subtitle_unknown_all"); - } - else{ - details = hbTrId( "txt_mus_subtitle_1_all" ).arg(mArtist); - - } - mInfoBar->setHeading(details); - } - } + } else { + // Must delete widgets when last song is deleted and view is reloaded. if ( mInfoBar ) { - // When last song in an album is deleted and album list is reloaded delete mInfoBar; mInfoBar = 0; } + if ( mTBone ) { + delete mTBone; + mTBone = 0; + } // Call empty list from base class setupEmptyListContainer(); } diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerfactory.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerfactory.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerfactory.cpp Fri May 14 18:54:37 2010 -0500 @@ -24,7 +24,6 @@ #include "mpcollectioncontainerartists.h" #include "mpcollectioncontaineralbums.h" #include "mpcollectioncontainerplaylists.h" -#include "mpcollectioncontainergenres.h" #include "mptrace.h" /*! @@ -77,22 +76,28 @@ connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); break; case ECollectionContextArtists: - if ( ( mCurrentContext != ECollectionContextArtistAlbums ) && ( mCurrentContext != ECollectionContextAlbumSongs) ) - { - deleteCurrentContainer(); - mCurrentContainer = new MpCollectionContainerArtists(mDocumentLoader); - mCurrentContainer->initialize(); - connect( mCurrentContainer, SIGNAL(itemActivated(int)), mView, SLOT(openIndex(int)) ); - connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); - } - break; + if ( ( mCurrentContext != ECollectionContextArtistAlbums ) + && ( mCurrentContext != ECollectionContextArtistAlbumsTBone) + && ( mCurrentContext != ECollectionContextArtistAllSongs) ) + { + deleteCurrentContainer(); + mCurrentContainer = new MpCollectionContainerArtists(mDocumentLoader); + mCurrentContainer->initialize(); + connect( mCurrentContainer, SIGNAL(itemActivated(int)), mView, SLOT(openIndex(int)) ); + connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); + connect( mCurrentContainer, SIGNAL(findAlbumSongs(int)), mView, SLOT(findAlbumSongs(int)) ); + connect( mCurrentContainer, SIGNAL(playAlbumSongs(int, int)), mView, SLOT(playAlbumSongs(int, int)) ); + } + break; case ECollectionContextAlbums: - if ( mCurrentContext != ECollectionContextAlbumSongs ) { + if ( mCurrentContext != ECollectionContextAlbumsTBone ) { deleteCurrentContainer(); mCurrentContainer = new MpCollectionContainerAlbums(mDocumentLoader); mCurrentContainer->initialize(); connect( mCurrentContainer, SIGNAL(itemActivated(int)), mView, SLOT(openIndex(int)) ); connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); + connect( mCurrentContainer, SIGNAL(findAlbumSongs(int)), mView, SLOT(findAlbumSongs(int)) ); + connect( mCurrentContainer, SIGNAL(playAlbumSongs(int, int)), mView, SLOT(playAlbumSongs(int, int)) ); } break; case ECollectionContextPlaylists: @@ -104,20 +109,11 @@ connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); } break; - case ECollectionContextGenres: - if ( mCurrentContext != ECollectionContextGenreSongs ) { - deleteCurrentContainer(); - mCurrentContainer = new MpCollectionContainerGenres(mDocumentLoader); - mCurrentContainer->initialize(); - connect( mCurrentContainer, SIGNAL(itemActivated(int)), mView, SLOT(openIndex(int)) ); - //connect( mCurrentContainer, SIGNAL(itemLongPressed(int, QPointF)), mView, SLOT(openContextMenu(int, QPointF)) ); - } - break; - case ECollectionContextAlbumSongs: case ECollectionContextArtistAlbums: - case ECollectionContextArtistSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: + case ECollectionContextAlbumsTBone: case ECollectionContextPlaylistSongs: - case ECollectionContextGenreSongs: // For this contexts, reuse the same container. break; } @@ -138,21 +134,18 @@ break; case ECollectionContextArtists: case ECollectionContextArtistAlbums: - case ECollectionContextArtistSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: delete static_cast(mCurrentContainer); break; case ECollectionContextAlbums: - case ECollectionContextAlbumSongs: + case ECollectionContextAlbumsTBone: delete static_cast(mCurrentContainer); break; case ECollectionContextPlaylists: case ECollectionContextPlaylistSongs: delete static_cast(mCurrentContainer); break; - case ECollectionContextGenres: - case ECollectionContextGenreSongs: - delete static_cast(mCurrentContainer); - break; } TX_EXIT } diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainergenres.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainergenres.cpp Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Music Player collection container definition - Genres. -* -*/ - -// INCLUDE FILES -#include - -#include -#include -#include - -#include "mpcollectioncontainergenres.h" -#include "mptrace.h" - -/*! - \class MpCollectionContainerGenres - \brief Music Player collection container definition - Genres. - - 'Genres' collection container implements the interface specified - by MpCollectionContainer. It provides a layout and widgets for the - 'Genres' view. - - This container handles the following contexts: - \li ECollectionContextGenres - \li ECollectionContextGenreSongs - - \sa MpCollectionContainer -*/ - -/*! - Constructs the collection container. - */ -MpCollectionContainerGenres::MpCollectionContainerGenres( HbDocumentLoader *loader, QGraphicsItem *parent ) - : MpCollectionListContainer(loader, parent) -{ - TX_LOG -} - -/*! - Destructs the collection container. - */ -MpCollectionContainerGenres::~MpCollectionContainerGenres() -{ - TX_ENTRY - delete mList; - TX_EXIT -} - -/*! - Sets up the container by organizing widgets according to its layout. - - \reimp - */ -void MpCollectionContainerGenres::setupContainer() -{ - TX_ENTRY_ARGS("mCollectionContext=" << mCollectionContext); - if ( !mList ) { - bool ok = false; - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "genre", &ok); - - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerGenres::setupContainer", "invalid xml file"); - } - - QGraphicsWidget *widget; - widget = mDocumentLoader->findWidget(QString("genreList")); - mList = qobject_cast(widget); - mIndexFeedback->setItemView(mList); - initializeList(); - } - TX_EXIT -} - diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerplaylists.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerplaylists.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerplaylists.cpp Fri May 14 18:54:37 2010 -0500 @@ -23,6 +23,7 @@ #include #include "mpcollectioncontainerplaylists.h" +#include "mpcollectiondatamodel.h" #include "mpmpxcollectiondata.h" #include "mptrace.h" @@ -48,9 +49,12 @@ */ MpCollectionContainerPlaylists::MpCollectionContainerPlaylists( HbDocumentLoader *loader, QGraphicsItem *parent ) : MpCollectionListContainer(loader, parent), - mInfoBar(0) + mInfoBar(0), + mCurrentPlaylistIndex(0) { TX_LOG + mCollectionContext = ECollectionContextPlaylists; + } /*! @@ -65,6 +69,51 @@ } /*! + Sets the data model for the container. + */ +void MpCollectionContainerPlaylists::setDataModel( MpCollectionDataModel *dataModel ) +{ + TX_ENTRY + MpCollectionListContainer::setDataModel(dataModel); + if ( mCollectionContext == ECollectionContextPlaylists ) { + if ( mList ) { + if ( mCollectionData->count() ) { + mList->scrollTo( dataModel->index(mCurrentPlaylistIndex, 0) ); + } + } + } + TX_EXIT +} + +/*! + Slot to be called when an item is selected by the user. +*/ +void MpCollectionContainerPlaylists::itemActivated( const QModelIndex &index ) +{ + if ( mCollectionContext == ECollectionContextPlaylists ) { + mCurrentPlaylistIndex = index.row(); + TX_ENTRY_ARGS("mCurrentPlaylistIndex=" << mCurrentPlaylistIndex); + } + MpCollectionListContainer::itemActivated(index); + TX_EXIT +} + +/*! + Slot to be called data model has new data. + */ +void MpCollectionContainerPlaylists::dataReloaded() +{ + TX_ENTRY + MpCollectionListContainer::dataReloaded(); + if ( mCollectionContext == ECollectionContextPlaylistSongs ) { + // Playlist could have been renamed. + QString details = mCollectionData->collectionTitle(); + mInfoBar->setHeading(details); + } + TX_EXIT +} + +/*! Sets up the container by organizing widgets according to its layout. \reimp @@ -103,7 +152,7 @@ QString details; if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; + details = hbTrId("txt_mus_subtitle_select_a_song"); } else { details = mCollectionData->collectionTitle(); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectiondocumentloader.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectiondocumentloader.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectiondocumentloader.cpp Fri May 14 18:54:37 2010 -0500 @@ -15,7 +15,8 @@ * */ -// INCLUDE FILES +#include + #include "mpcollectiondocumentloader.h" #include "mpnowplayingwidget.h" #include "mpcommondefs.h" @@ -39,12 +40,18 @@ { TX_ENTRY_ARGS("type=" << type << ", name=" << name); - if (type == MpNowPlayingWidget::staticMetaObject.className()) { + if ( type == MpNowPlayingWidget::staticMetaObject.className() ) { QObject *object = new MpNowPlayingWidget(MpCommon::KMusicPlayerUid); object->setObjectName(name); TX_EXIT return object; } + else if ( type == HgMediawall::staticMetaObject.className() ) { + QObject *object = new HgMediawall(); + object->setObjectName(name); + TX_EXIT + return object; + } TX_EXIT return HbDocumentLoader::createObject(type, name); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectionlistcontainer.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectionlistcontainer.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectionlistcontainer.cpp Fri May 14 18:54:37 2010 -0500 @@ -49,9 +49,11 @@ : MpCollectionContainer(loader, parent), mList(0), mNoMusic(0), - mIndexFeedback( new HbIndexFeedback()) + mIndexFeedback(0), + mLongPressedIndex(0) { TX_ENTRY + mIndexFeedback = new HbIndexFeedback(); mIndexFeedback->setIndexFeedbackPolicy(HbIndexFeedback::IndexFeedbackSingleCharacter); TX_EXIT } @@ -91,7 +93,6 @@ /*! Slot to be called when an item is selected by the user. - Start animation. */ void MpCollectionListContainer::itemActivated( const QModelIndex &index ) { @@ -102,11 +103,33 @@ /*! Slot to be called when an item is long pressed by the user. + Remember the index so that we can scroll to this vicinity if the data is reloaded, for example, + after a delete operation is selected from the context menu. */ void MpCollectionListContainer::onLongPressed( HbAbstractViewItem *listViewItem, const QPointF &coords ) { TX_ENTRY - emit MpCollectionContainer::itemLongPressed(listViewItem->modelIndex().row(), coords); + mLongPressedIndex = listViewItem->modelIndex().row(); + emit MpCollectionContainer::itemLongPressed(mLongPressedIndex, coords); + TX_EXIT +} + +/*! + Slot to be called data model has new data. + If the data is reloaded as a result of operation like delete, we want to scroll to the + nearby area where user has performed the action. + + \sa onLongPressed + */ +void MpCollectionListContainer::dataReloaded() +{ + TX_ENTRY + if ( mLongPressedIndex > 0 ) { + --mLongPressedIndex; + } + if ( mList ) { + mList->scrollTo( mDataModel->index(mLongPressedIndex, 0) ); + } TX_EXIT } @@ -117,8 +140,6 @@ { TX_ENTRY mList->setItemRecycling(true); - mList->setScrollingStyle( HbListView::PanOrFlick ); - mList->setClampingStyle( HbListView::BounceBackClamping ); mList->setLongPressEnabled(true); connect(mList, SIGNAL(activated(QModelIndex)), this, SLOT(itemActivated(QModelIndex))); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectionpopuphandler.cpp Fri May 14 18:54:37 2010 -0500 @@ -25,10 +25,11 @@ #include #include -#include "mpengine.h" +#include "mpenginefactory.h" #include "mpcollectionview.h" #include "mpmpxcollectiondata.h" #include "mpcollectiondatamodel.h" +#include "mpcollectiontbonelistdatamodel.h" #include "mpmpxcollectionviewdefs.h" #include "mpcollectionpopuphandler.h" #include "mptrace.h" @@ -54,7 +55,7 @@ mPermanentData( 0 ) { TX_ENTRY - mMpEngine = MpEngine::instance(); + mMpEngine = MpEngineFactory::sharedEngine(); mPermanentData = new MpPopupHandlerPermanentData( this ); TX_EXIT } @@ -81,8 +82,9 @@ switch ( mMpEngine->collectionData()->context() ) { case ECollectionContextAllSongs: - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: + case ECollectionContextArtistAllSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextAlbumsTBone: contextMenu = new HbMenu(); action = contextMenu->addAction( hbTrId( "txt_common_menu_play_music" ) ); action->setObjectName( "open" ); @@ -162,13 +164,13 @@ switch ( mMpEngine->collectionData()->context() ) { case ECollectionContextAllSongs: - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: + case ECollectionContextAlbumsTBone: case ECollectionContextPlaylistSongs: - case ECollectionContextGenreSongs: contextMenu = new HbMenu(); action = contextMenu->addAction( hbTrId("txt_common_menu_play_music") ); - action->setEnabled( mMpEngine->verifyUsbBlocking() ); + action->setEnabled( !mMpEngine->verifyUsbBlocking() ); break; default: break; @@ -227,6 +229,22 @@ } /*! + Request to select songs to add to the playlist from TBone + */ +void MpCollectionPopupHandler::openAddSongsToPlaylistFromTBone( ) +{ + TX_ENTRY + MpCollectionTBoneListDataModel *model; + model = new MpCollectionTBoneListDataModel( mMpEngine->collectionData() ); + //this item will be deleted when clearing permanent data. + model->setParent(mPermanentData); + model->refreshModel(); + getModelIndexes( hbTrId( "txt_mus_title_select_songs" ), model, + SLOT( handleAddSongsToPlayList( HbAction* ) ) ); + TX_EXIT +} + +/*! Request to select songs to be deleted */ void MpCollectionPopupHandler::openDeleteSongs( QAbstractItemModel* model ) @@ -275,10 +293,10 @@ /*! Request to reorder songs */ -void MpCollectionPopupHandler::openArrangeSongs( MpMpxCollectionData* collectionData ) +void MpCollectionPopupHandler::openArrangeSongs( ) { TX_ENTRY - launchArrangeSongsDialog( collectionData ); + launchArrangeSongsDialog(); TX_EXIT } @@ -516,6 +534,9 @@ launchAddToPlaylistDialog( selection ); } } + else { + mPermanentData->clear(); + } } //Dialog is using CollectionView main model, avoid dialog destructor to alter it. @@ -872,9 +893,8 @@ /*! \internal Launches a list dialog to reorder them. - \a collectionData Base to generate dialog's model. */ -void MpCollectionPopupHandler::launchArrangeSongsDialog( MpMpxCollectionData* collectionData ) +void MpCollectionPopupHandler::launchArrangeSongsDialog() { TX_ENTRY @@ -892,7 +912,7 @@ listView->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded); MpCollectionDataModel *model; //Ownership of the model is passed to the listView as a child object. - model = new MpCollectionDataModel( collectionData, listView ); + model = new MpCollectionDataModel( mMpEngine->collectionData() , listView ); model->refreshModel(); connect( model, SIGNAL( orderChanged( int, int, int, int ) ), @@ -932,8 +952,9 @@ switch ( mMpEngine->collectionData()->context() ) { case ECollectionContextAllSongs: - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: + case ECollectionContextAlbumsTBone: message = hbTrId( "txt_mus_delete_song" ); break; case ECollectionContextArtists: @@ -947,8 +968,6 @@ message = hbTrId( "txt_mus_delete_playlist" ); break; case ECollectionContextPlaylistSongs: - case ECollectionContextGenres: - case ECollectionContextGenreSongs: needsConfirmation = false; mMpEngine->deleteSongs( mPermanentData->mSelectedItems ); mPermanentData->clear(); @@ -1028,12 +1047,16 @@ mOriginalName.clear(); mContextMenuIndex = KNullIndex; if ( mIsolatedCollectionData ) { - MpEngine::instance()->releaseIsolatedCollection(); + MpEngineFactory::sharedEngine()->releaseIsolatedCollection(); mIsolatedCollectionData = 0; } if ( mAbstractItemModel ) { delete mAbstractItemModel; mAbstractItemModel = 0; } + //clearing any child Objects. + foreach (QObject* child, children()) { + child->deleteLater(); + } TX_EXIT } diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp Fri May 14 18:54:37 2010 -0500 @@ -18,7 +18,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ #include "mpcollectioncontainerfactory.h" #include "mpcollectioncontainer.h" #include "mpcollectiondatamodel.h" -#include "mpengine.h" +#include "mpenginefactory.h" #include "mpmpxcollectiondata.h" #include "mpnowplayingwidget.h" #include "mpcommondefs.h" @@ -90,8 +90,8 @@ mActivated( false ), mNowPlayingBanner( 0 ), mBannerAttached( false ), - mNavigationQuit( 0 ), - mNavigationBack( 0 ), + mSoftKeyQuit( 0 ), + mSoftKeyBack( 0 ), mDocumentLoader( 0 ), mMainContainer( 0 ), mMainToolBar( 0 ), @@ -113,8 +113,8 @@ { TX_ENTRY delete mSnapshot; - delete mNavigationQuit; - delete mNavigationBack; + delete mSoftKeyQuit; + delete mSoftKeyBack; HbToolBar *toolBar = takeToolBar(); if ( mMainToolBar != toolBar && mPlaylistToolBar != toolBar ) { @@ -127,9 +127,9 @@ mPlaylistToolBar->deleteLater(); } - delete mCollectionDataModel; delete mCollectionContainer; delete mContainerFactory; + delete mCollectionDataModel; delete mDocumentLoader; delete mMpTranslator; delete mCommonTranslator; @@ -165,34 +165,24 @@ mWindow = mainWindow(); // Create softkey actions - mNavigationQuit = new HbAction( Hb::QuitNaviAction, this ); - connect( mNavigationQuit, SIGNAL( triggered() ), this, SLOT( back() ) ); + mSoftKeyQuit = new HbAction( Hb::QuitNaviAction, this ); + connect( mSoftKeyQuit, SIGNAL( triggered() ), this, SLOT( back() ) ); - mNavigationBack = new HbAction( Hb::BackNaviAction, this ); - connect( mNavigationBack, SIGNAL( triggered() ), this, SLOT( back() ) ); + mSoftKeyBack = new HbAction( Hb::BackNaviAction, this ); + connect( mSoftKeyBack, SIGNAL( triggered() ), this, SLOT( back() ) ); + + mMpEngine = MpEngineFactory::sharedEngine(); - mMpEngine = MpEngine::instance(); - - connect( mMpEngine, - SIGNAL( collectionPlaylistOpened() ), - this, - SLOT( startPlaybackView() ) ); - connect( mMpEngine, - SIGNAL( playlistSaved( bool ) ), - this, - SLOT( playlistSaved( bool ) ) ); - connect( mMpEngine, - SIGNAL( songsDeleted( bool ) ), - this, - SLOT( songsDeleted( bool ) ) ); - connect( mMpEngine, - SIGNAL( playlistsRenamed( bool ) ), - this, - SLOT( playlistsRenamed( bool ) ) ); - connect( mMpEngine, - SIGNAL( isolatedCollectionOpened( MpMpxCollectionData* ) ), - this, - SLOT( handleIsolatedCollectionOpened( MpMpxCollectionData* ) ) ); + connect( mMpEngine, SIGNAL( collectionPlaylistOpened() ), + this, SLOT( startPlaybackView() ) ); + connect( mMpEngine, SIGNAL( playlistSaved( bool ) ), + this, SLOT( playlistSaved( bool ) ) ); + connect( mMpEngine, SIGNAL( songsDeleted( bool ) ), + 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"); @@ -216,7 +206,8 @@ } 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" ) ); @@ -421,18 +412,6 @@ } /*! - 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() @@ -467,22 +446,42 @@ QString songUri; switch ( mCollectionContext ) { case ECollectionContextAllSongs: - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: + case ECollectionContextArtistAllSongs: 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: "if" used as workaround for HbListView multiple events: longPress and activated. - // Remove once HbListView get fixed (wk14 or 16) - if ( !mMpPopupHandler->showingPopup() ) { + // TODO: "showingPopup()" used as workaround for HbListView multiple events: longPress and activated. + // Remove once HbListView get fixed (wk16) + if ( doOpen && !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 ); } } @@ -490,6 +489,32 @@ } /*! + 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 +} + +/*! Slot to be called when back/quit softkey is pressed. */ void MpCollectionView::back() @@ -501,17 +526,28 @@ 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; @@ -524,7 +560,7 @@ emit songSelected( "" ); } else { - emit command( MpCommon::Exit ); + emit command( MpCommon::SendToBackground ); } } TX_EXIT @@ -600,7 +636,15 @@ */ void MpCollectionView::addToPlaylist() { - mMpPopupHandler->openAddSongsToPlaylist( mCollectionDataModel ); + switch ( mCollectionContext ) { + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextAlbumsTBone: + mMpPopupHandler->openAddSongsToPlaylistFromTBone(); + break; + default: + mMpPopupHandler->openAddSongsToPlaylist( mCollectionDataModel ); + break; + } } /*! @@ -627,9 +671,9 @@ */ void MpCollectionView::playlistSaved( bool success ) { - if ( success && - ( ECollectionContextPlaylists == mCollectionContext || - ECollectionContextPlaylistSongs == mCollectionContext ) ) { + if ( success + && ( ECollectionContextPlaylists == mCollectionContext + || ECollectionContextPlaylistSongs == mCollectionContext ) ) { mMpEngine->reopenCollection(); } } @@ -687,7 +731,7 @@ */ void MpCollectionView::arrangeSongs( ) { - mMpPopupHandler->openArrangeSongs( mCollectionData ); + mMpPopupHandler->openArrangeSongs(); } /*! @@ -789,12 +833,7 @@ 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" ); @@ -808,15 +847,12 @@ action = qobject_cast( mMainToolBar->actions()[KMainToolBarAll] ); break; case ECollectionContextArtists: - case ECollectionContextArtistAlbums: action = qobject_cast( mMainToolBar->actions()[KMainToolBarArtists] ); break; case ECollectionContextAlbums: - case ECollectionContextAlbumSongs: action = qobject_cast( mMainToolBar->actions()[KMainToolBarAlbums] ); break; case ECollectionContextPlaylists: - case ECollectionContextPlaylistSongs: action = qobject_cast( mMainToolBar->actions()[KMainToolBarPlaylists] ); break; } @@ -954,8 +990,6 @@ 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() ) ); @@ -965,9 +999,10 @@ } connect( myMenu->addAction(hbTrId("txt_common_opt_exit")), SIGNAL(triggered()), this, SLOT(exit()) ); break; - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: - menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) ); + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: + case ECollectionContextAlbumsTBone: + menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_add_to_playlist" ) ); if ( !mUsbBlocked ) { connect( menuAction, SIGNAL( triggered() ), this, SLOT( addToPlaylist() ) ); } @@ -1002,18 +1037,9 @@ } else if ( mViewMode == MpCommon::FetchView ) { switch ( mCollectionContext ) { - case ECollectionContextAllSongs: - menuAction = myMenu->addAction( hbTrId( "txt_mus_opt_refresh_library" ) ); - if ( !mUsbBlocked ) { - connect( menuAction, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) ); - } - else { - menuAction->setDisabled( true ); - } - break; + case ECollectionContextAllSongs: + case ECollectionContextArtists: 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() ) ); @@ -1050,9 +1076,9 @@ } break; case ECollectionContextArtistAlbums: - case ECollectionContextArtistSongs: - case ECollectionContextAlbumSongs: - case ECollectionContextGenreSongs: + case ECollectionContextArtistAlbumsTBone: + case ECollectionContextArtistAllSongs: + case ECollectionContextAlbumsTBone: if ( !toolBar()->actions().empty() ) { takeToolBar(); setToolBar( new HbToolBar ); @@ -1074,7 +1100,7 @@ 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 ) { @@ -1082,11 +1108,10 @@ case ECollectionContextArtists: case ECollectionContextAlbums: case ECollectionContextPlaylists: - case ECollectionContextGenres: - setNavigationAction( mNavigationQuit ); + setNavigationAction( mSoftKeyQuit ); break; default: - setNavigationAction( mNavigationBack ); + setNavigationAction( mSoftKeyBack ); break; } } @@ -1148,12 +1173,11 @@ mWindow->scene()->addItem( mSnapshot ); - if ( ( contextFrom == ECollectionContextAlbums && contextTo == ECollectionContextAlbumSongs ) || - ( contextFrom == ECollectionContextArtists && contextTo == ECollectionContextArtistAlbums ) || - ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextAlbumSongs ) || - ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtistSongs ) || - ( contextFrom == ECollectionContextPlaylists && contextTo == ECollectionContextPlaylistSongs ) || - ( contextFrom == ECollectionContextGenres && contextTo == ECollectionContextGenreSongs ) ) { + if ( ( contextFrom == ECollectionContextAlbums && contextTo == ECollectionContextAlbumsTBone ) || + ( 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" ), @@ -1168,12 +1192,11 @@ "containerTransitionComplete", QString( "mainContainer_effect") ); } - else if( ( contextFrom == ECollectionContextAlbumSongs && contextTo == ECollectionContextAlbums ) || - ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtists ) || - ( contextFrom == ECollectionContextAlbumSongs && contextTo == ECollectionContextArtistAlbums ) || - ( contextFrom == ECollectionContextArtistSongs && contextTo == ECollectionContextArtistAlbums ) || - ( contextFrom == ECollectionContextPlaylistSongs && contextTo == ECollectionContextPlaylists ) || - ( contextFrom == ECollectionContextGenreSongs && contextTo == ECollectionContextGenres ) ) { + else if( ( contextFrom == ECollectionContextAlbumsTBone && contextTo == ECollectionContextAlbums ) || + ( contextFrom == ECollectionContextArtistAlbums && contextTo == ECollectionContextArtists ) || + ( contextFrom == ECollectionContextArtistAlbumsTBone && contextTo == ECollectionContextArtistAlbums ) || + ( contextFrom == ECollectionContextArtistAllSongs && contextTo == ECollectionContextArtistAlbums ) || + ( contextFrom == ECollectionContextPlaylistSongs && contextTo == ECollectionContextPlaylists ) ) { HbEffect::start( mSnapshot, QString( "container" ), QString( "slide_out_to_right" ), @@ -1203,7 +1226,6 @@ "containerTransitionComplete", QString( "mainContainer_effect") ); } - } /*! diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/src/mpsnapshotwidget.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpsnapshotwidget.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpsnapshotwidget.cpp Fri May 14 18:54:37 2010 -0500 @@ -17,7 +17,7 @@ #include #include -#include +#include #include "mpsnapshotwidget.h" #include "mptrace.h" diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/inc/unittest_mpcollectioncontainers.h --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/inc/unittest_mpcollectioncontainers.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/inc/unittest_mpcollectioncontainers.h Fri May 14 18:54:37 2010 -0500 @@ -20,7 +20,7 @@ #include -//Forward declarations +class QTranslator; class MpCollectionContainer; class MpCollectionContainerFactory; class MpCollectionDocumentLoader; @@ -48,11 +48,34 @@ private slots: - void testConstructors(); - void testSetupContainers(); - void testItemActivated(); + void testConstructorAllSongs(); + void testConstructorArtists(); + void testConstructorAlbums(); + void testConstructorPlaylists(); + + void testSetupContainerAllSongs(); + void testSetupContainerAllSongsFetcher(); + void testSetupContainerAllSongsNoData(); + void testSetupContainerArtists(); + void testSetupContainerArtistsFetcher(); + void testSetupContainerArtistsNoData(); + void testSetupContainerAlbums(); + void testSetupContainerAlbumsFetcher(); + void testSetupContainerAlbumsNoData(); + void testSetupContainerPlaylists(); + void testSetupContainerPlaylistsFetcher(); + void testSetupContainerPlaylistsNoData(); + + void testItemActivatedAllSongs(); + void testItemActivatedArtists(); + void testItemActivatedAlbums(); + void testItemActivatedPlaylists(); + void testOnLongPressed(); - + + void testAlbumCenteredArtists(); + void testAlbumCenteredAlbums(); + private: MpCollectionContainer *mTest; @@ -60,6 +83,8 @@ MpCollectionDataModel *mCollectionDataModel; MpMpxCollectionData *mCollectionData; + QTranslator *mMpTranslator; // Own + }; #endif // TESTMPCOLLECTIONCONTAINERS_H diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/src/unittest_mpcollectioncontainers.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/src/unittest_mpcollectioncontainers.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/src/unittest_mpcollectioncontainers.cpp Fri May 14 18:54:37 2010 -0500 @@ -15,12 +15,16 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mpcommondefs.h" #include "mpcollectiondocumentloader.h" #include "stub/inc/mpcollectionview.h" #include "stub/inc/mpmpxcollectiondata.h" @@ -39,7 +43,6 @@ #include "mpcollectioncontainerartists.h" #include "mpcollectioncontaineralbums.h" #include "mpcollectioncontainerplaylists.h" -#include "mpcollectioncontainergenres.h" #undef private #undef protected /*! @@ -47,30 +50,34 @@ */ int main(int argc, char *argv[]) { - HbApplication app(argc, argv); - HbMainWindow window; + QApplication app(argc, argv); TestMpCollectionContainers tv; - char *pass[3]; - pass[0] = argv[0]; - pass[1] = "-o"; - pass[2] = "c:\\data\\unittest_mpcollectioncontainers.txt"; + if ( argc > 1 ) { + return QTest::qExec( &tv, argc, argv); + } + else { + char *pass[3]; + pass[0] = argv[0]; + pass[1] = "-o"; + pass[2] = "c:\\data\\unittest_mpcollectioncontainers.txt"; - int res = QTest::qExec(&tv, 3, pass); - - return res; + return QTest::qExec(&tv, 3, pass); + } } TestMpCollectionContainers::TestMpCollectionContainers() : mTest(0), mCollectionDataModel(0), - mCollectionData(0) + mCollectionData(0), + mMpTranslator(0) { } TestMpCollectionContainers::~TestMpCollectionContainers() { delete mTest; + delete mMpTranslator; } /*! @@ -78,6 +85,15 @@ */ void TestMpCollectionContainers::initTestCase() { + 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); + if ( translatorLoaded ) { + qApp->installTranslator(mMpTranslator); + } } /*! @@ -96,6 +112,7 @@ mView->initializeView(); mCollectionData = new MpMpxCollectionData(); mCollectionDataModel = new MpCollectionDataModel(mCollectionData); + mTest = 0; } /*! @@ -109,345 +126,661 @@ } /*! - Test constructors + Test constructor for AllSongs container + */ +void TestMpCollectionContainers::testConstructorAllSongs() +{ + mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); + QCOMPARE(mTest->mCollectionContext, ECollectionContextAllSongs); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAllSongs); + MpCollectionContainerAllSongs *allSongs = static_cast(mTest); + QVERIFY(allSongs->mList == 0); + QVERIFY(allSongs->mInfoBar == 0); + QVERIFY(allSongs->mNoMusic == 0); + QVERIFY(allSongs->mIndexFeedback != 0); + QVERIFY(allSongs->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); +} + +/*! + Test constructor for Artists container */ -void TestMpCollectionContainers::testConstructors() +void TestMpCollectionContainers::testConstructorArtists() +{ + MpCollectionContainer *temp = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); + QCOMPARE(mTest->mCollectionContext, ECollectionContextArtists); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtists); + MpCollectionContainerArtists *artists = static_cast(mTest); + QVERIFY(artists->mList == 0); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mNoMusic == 0); + QVERIFY(artists->mIndexFeedback != 0); + QVERIFY(artists->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); + + temp = mView->mContainerFactory->createContainer(ECollectionContextArtistAlbums); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtistAlbums); + // Verify that the same container is used. + QVERIFY(mTest == temp); + + temp = 0; + temp = mView->mContainerFactory->createContainer(ECollectionContextArtistAlbumsTBone); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtistAlbumsTBone); + // Verify that the same container is used. + QVERIFY(mTest == temp); + + temp = 0; + temp = mView->mContainerFactory->createContainer(ECollectionContextArtistAllSongs); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtistAllSongs); + // Verify that the same container is used. + QVERIFY(mTest == temp); +} + +/*! + Test constructor for Albums container + */ +void TestMpCollectionContainers::testConstructorAlbums() { - mTest = new MpCollectionContainerAllSongs(mView->mDocumentLoader); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); + MpCollectionContainer *temp = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); + QCOMPARE(mTest->mCollectionContext, ECollectionContextAlbums); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); + MpCollectionContainerAlbums *albums = static_cast(mTest); + QVERIFY(albums->mList == 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mNoMusic == 0); + QVERIFY(albums->mIndexFeedback != 0); + QVERIFY(albums->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); + + temp = 0; + temp = mView->mContainerFactory->createContainer(ECollectionContextAlbumsTBone); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbumsTBone); + // Verify that the same container is used. + QVERIFY(mTest == temp); +} + +/*! + Test constructor for Playlists container + */ +void TestMpCollectionContainers::testConstructorPlaylists() +{ + MpCollectionContainer *temp = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); + QCOMPARE(mTest->mCollectionContext, ECollectionContextPlaylists); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); + MpCollectionContainerPlaylists *playlists = static_cast(mTest); + + QVERIFY(playlists->mList == 0); + QVERIFY(playlists->mInfoBar == 0); + QVERIFY(playlists->mNoMusic == 0); + QVERIFY(playlists->mIndexFeedback != 0); + QVERIFY(playlists->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); + + temp = 0; + temp = mView->mContainerFactory->createContainer(ECollectionContextPlaylistSongs); + QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylistSongs); + // Verify that the same container is used. + QVERIFY(mTest == temp); +} + +/*! + Test setupContainer via setDataModel for AllSongs container. + */ +void TestMpCollectionContainers::testSetupContainerAllSongs() +{ + mCollectionData->mCount = 5; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerAllSongs *allSongs = static_cast(mTest); + + QVERIFY(allSongs->mList != 0); + QVERIFY(allSongs->mInfoBar != 0); + QVERIFY(allSongs->mNoMusic == 0); + QCOMPARE(allSongs->mList->itemRecycling(), true); + QCOMPARE(allSongs->mList->scrollingStyle(), HbListView::PanOrFlick); + QCOMPARE(allSongs->mList->clampingStyle(), HbListView::BounceBackClamping); + QCOMPARE(allSongs->mList->frictionEnabled(), true); + QCOMPARE(allSongs->mList->longPressEnabled(), true); + QCOMPARE(allSongs->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); + QCOMPARE(allSongs->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); + QVERIFY(allSongs->mIndexFeedback->itemView() == allSongs->mList); + + // Normal mode. Should see count. + QCOMPARE(allSongs->mInfoBar->heading(), hbTrId("txt_mus_subhead_ln_songs", 5)); +} + +/*! + Test setupContainer via setDataModel for AllSongs container in Fetcher mode. + */ +void TestMpCollectionContainers::testSetupContainerAllSongsFetcher() +{ + mCollectionData->mCount = 5; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); + mTest->setViewMode(MpCommon::FetchView); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerAllSongs *allSongs = static_cast(mTest); + + // Fetcher mode. + QCOMPARE(allSongs->mInfoBar->heading(), hbTrId("txt_mus_subtitle_select_a_song")); +} + +/*! + Test setupContainer via setDataModel for AllSongs container with no data. + */ +void TestMpCollectionContainers::testSetupContainerAllSongsNoData() +{ + mCollectionData->mCount = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerAllSongs *allSongs = static_cast(mTest); + + QVERIFY(allSongs->mList == 0); + QVERIFY(allSongs->mInfoBar == 0); + QVERIFY(allSongs->mNoMusic != 0); +} - delete mTest; - mTest = 0; - - mTest = new MpCollectionContainerArtists(mView->mDocumentLoader); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - - delete mTest; - mTest = 0; - - mTest = new MpCollectionContainerAlbums(mView->mDocumentLoader); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - - delete mTest; - mTest = 0; - - mTest = new MpCollectionContainerPlaylists(mView->mDocumentLoader); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - - delete mTest; - mTest = 0; - - mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAllSongs); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->indexFeedbackPolicy() == HbIndexFeedback::IndexFeedbackSingleCharacter); - QCOMPARE(mTest->mCollectionContext,ECollectionContextUnknown); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); +/*! + Test setupContainer via setDataModel for Artists container. + */ +void TestMpCollectionContainers::testSetupContainerArtists() +{ + mCollectionData->mCount = 5; + + // User selects Artists + mCollectionData->mContext = ECollectionContextArtists; + mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerArtists *artists = static_cast(mTest); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtists); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone == 0); + QVERIFY(artists->mNoMusic == 0); + QCOMPARE(artists->mList->itemRecycling(), true); + QCOMPARE(artists->mList->scrollingStyle(), HbListView::PanOrFlick); + QCOMPARE(artists->mList->clampingStyle(), HbListView::BounceBackClamping); + QCOMPARE(artists->mList->frictionEnabled(), true); + QCOMPARE(artists->mList->longPressEnabled(), true); + QCOMPARE(artists->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); + QCOMPARE(artists->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); + QVERIFY(artists->mIndexFeedback->itemView() == artists->mList); + QVERIFY(artists->mCurrentAlbumIndex == 0); + + // User selects an artist - case where artist has more than 1 album + mCollectionData->mContext = ECollectionContextArtistAlbums; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbums); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QCOMPARE(artists->mInfoBar->heading(), QString("Title")); + + // User selects an album + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + mCollectionData->mContext = ECollectionContextArtistAlbumsTBone; + mCollectionData->mCurrentAlbumAvailable = false; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbumsTBone); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone != 0); + QVERIFY(artists->mTBoneListModel != 0); + QVERIFY(artists->mAlbumIndexOffset == 1); + QCOMPARE(artists->mTBone->reflectionsEnabled(), false); + QCOMPARE(spy.count(), 1); + + // User selects back - navigate back to artist albums + mCollectionData->mContext = ECollectionContextArtistAlbums; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbums); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QVERIFY(artists->mTBone == 0); + QVERIFY(artists->mAlbumIndexOffset == 0); + QCOMPARE(artists->mInfoBar->heading(), QString("Title")); + + // User selects Artist's all songs + mCollectionData->mContext = ECollectionContextArtistAllSongs; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAllSongs); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QCOMPARE(artists->mInfoBar->heading(), hbTrId("txt_mus_subtitle_1_all").arg("Title")); + + // User selects back - navigate back to artist albums + mCollectionData->mContext = ECollectionContextArtistAlbums; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbums); + + // User selects back - navigate back to artists + mCollectionData->mContext = ECollectionContextArtists; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtists); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mCurrentAlbumIndex == 0); + + // User selects an artist - case where artist has 1 album + // Goes directly to TBone + mCollectionData->mCount = 1; + mCollectionData->mContext = ECollectionContextArtistAlbumsTBone; + mCollectionData->mCurrentAlbumAvailable = true; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbumsTBone); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone != 0); + QVERIFY(artists->mTBoneListModel != 0); + QVERIFY(artists->mAlbumIndexOffset == 0); + // We set mCurrentAlbumAvailable to true, so no signal should emit. + QCOMPARE(spy.count(), 1); + + // User selects back - navigate back to artists + mCollectionData->mContext = ECollectionContextArtists; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtists); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone == 0); + QVERIFY(artists->mCurrentAlbumIndex == 0); +} + +/*! + Test setupContainer via setDataModel for Artists container in Fetcher mode. + */ +void TestMpCollectionContainers::testSetupContainerArtistsFetcher() +{ + mCollectionData->mCount = 1; + + // User selects Artists + mCollectionData->mContext = ECollectionContextArtists; + mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); + mTest->setViewMode(MpCommon::FetchView); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerArtists *artists = static_cast(mTest); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtists); + + // User selects an artist - case where artist has 1 album + // Goes directly to TBone + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + mCollectionData->mContext = ECollectionContextArtistAlbumsTBone; + mCollectionData->mCurrentAlbumAvailable = false; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbumsTBone); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QVERIFY(artists->mTBone != 0); + QVERIFY(artists->mTBoneListModel != 0); + QVERIFY(artists->mAlbumIndexOffset == 0); + QCOMPARE(spy.count(), 1); + QCOMPARE(artists->mInfoBar->heading(), hbTrId("txt_mus_subtitle_select_a_song")); + + // User selects back - navigate back to artists + mCollectionData->mContext = ECollectionContextArtists; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtists); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone == 0); + QVERIFY(artists->mCurrentAlbumIndex == 0); + + // User selects an artist - case where artist has more than 1 album + mCollectionData->mCount = 5; + mCollectionData->mContext = ECollectionContextArtistAlbums; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAlbums); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QCOMPARE(artists->mInfoBar->heading(), QString("Title")); + + // User selects Artist's all songs + mCollectionData->mContext = ECollectionContextArtistAllSongs; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(artists->mCollectionContext, ECollectionContextArtistAllSongs); + QVERIFY(artists->mList != 0); + QVERIFY(artists->mInfoBar != 0); + QCOMPARE(artists->mInfoBar->heading(), hbTrId("txt_mus_subtitle_select_a_song")); } /*! - Test setupContainer via setDataModel + Test setupContainer via setDataModel for Artists container with no data. */ -void TestMpCollectionContainers::testSetupContainers() +void TestMpCollectionContainers::testSetupContainerArtistsNoData() { - mCollectionData->mCount = 1; - mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); + mCollectionData->mCount = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAllSongs); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); - mCollectionData->mContext = ECollectionContextArtists; + MpCollectionContainerArtists *artists = static_cast(mTest); + + QVERIFY(artists->mList == 0); + QVERIFY(artists->mInfoBar == 0); + QVERIFY(artists->mTBone == 0); + QVERIFY(artists->mNoMusic != 0); +} + +/*! + Test setupContainer via setDataModel for Albums container. + */ +void TestMpCollectionContainers::testSetupContainerAlbums() +{ + mCollectionData->mCount = 5; + + // User selects Albums + mCollectionData->mContext = ECollectionContextAlbums; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtists); - - mCollectionData->mContext = ECollectionContextArtistAlbums; + MpCollectionContainerAlbums *albums = static_cast(mTest); + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbums); + QVERIFY(albums->mList != 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mTBone == 0); + QVERIFY(albums->mNoMusic == 0); + QCOMPARE(albums->mList->itemRecycling(), true); + QCOMPARE(albums->mList->scrollingStyle(), HbListView::PanOrFlick); + QCOMPARE(albums->mList->clampingStyle(), HbListView::BounceBackClamping); + QCOMPARE(albums->mList->frictionEnabled(), true); + QCOMPARE(albums->mList->longPressEnabled(), true); + QCOMPARE(albums->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); + QCOMPARE(albums->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); + QVERIFY(albums->mIndexFeedback->itemView() == albums->mList); + + // User selects an album + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + mCollectionData->mContext = ECollectionContextAlbumsTBone; + mCollectionData->mCurrentAlbumAvailable = false; mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtists); - - mCollectionData->mContext = ECollectionContextArtistSongs; - mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextArtists); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbumsTBone); + QVERIFY(albums->mList != 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mTBone != 0); + QVERIFY(albums->mTBoneListModel != 0); + QCOMPARE(albums->mTBone->reflectionsEnabled(), false); + QCOMPARE(spy.count(), 1); + + // User selects back - navigate back to albums mCollectionData->mContext = ECollectionContextAlbums; mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); - - mCollectionData->mContext = ECollectionContextAlbumSongs; - mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == static_cast(mTest)->mList); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); - mCollectionData->mContext = ECollectionContextPlaylists; - mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - - mCollectionData->mContext = ECollectionContextPlaylistSongs; + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbums); + QVERIFY(albums->mList != 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mTBone == 0); +} + +/*! + Test setupContainer via setDataModel for Albums container in Fetcher mode. + */ +void TestMpCollectionContainers::testSetupContainerAlbumsFetcher() +{ + mCollectionData->mCount = 5; + + // User selects Albums + mCollectionData->mContext = ECollectionContextAlbums; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); + mTest->setViewMode(MpCommon::FetchView); mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QCOMPARE(static_cast(mTest)->mList->itemRecycling(), true); - QCOMPARE(static_cast(mTest)->mList->scrollingStyle(), HbListView::PanOrFlick); - QCOMPARE(static_cast(mTest)->mList->clampingStyle(), HbListView::BounceBackClamping); - QCOMPARE(static_cast(mTest)->mList->longPressEnabled(), true); - QCOMPARE(static_cast(mTest)->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); - QCOMPARE(static_cast(mTest)->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - - //Test the case when all the songs are removed from a playlist, previous case is precondition... - mCollectionData->mCount = 0; + MpCollectionContainerAlbums *albums = static_cast(mTest); + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbums); + + // User selects an album + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + mCollectionData->mContext = ECollectionContextAlbumsTBone; + mCollectionData->mCurrentAlbumAvailable = true; mTest->setDataModel(mCollectionDataModel); - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - - //Test the case when songs get added to empty playlist, previous case is precondition... - mCollectionData->mCount = 1; - mTest->setDataModel(mCollectionDataModel); - QVERIFY(static_cast(mTest)->mList != 0); - QVERIFY(static_cast(mTest)->mInfoBar != 0); - QVERIFY(static_cast(mTest)->mNoMusic == 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - - - //No data - mTest = 0; - mCollectionData->mCount = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); - mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAllSongs); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbumsTBone); + QVERIFY(albums->mList != 0); + QVERIFY(albums->mInfoBar != 0); + QVERIFY(albums->mTBone != 0); + QVERIFY(albums->mTBoneListModel != 0); + QCOMPARE(albums->mTBone->reflectionsEnabled(), false); + // We set mCurrentAlbumAvailable to true, so no signal should emit. + QCOMPARE(spy.count(), 0); + QCOMPARE(albums->mInfoBar->heading(), hbTrId("txt_mus_subtitle_select_a_song")); + + // User selects back - navigate back to albums mCollectionData->mContext = ECollectionContextAlbums; mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); - - mCollectionData->mContext = ECollectionContextAlbumSongs; + QCOMPARE(albums->mCollectionContext, ECollectionContextAlbums); + QVERIFY(albums->mList != 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mTBone == 0); +} + +/*! + Test setupContainer via setDataModel for Albums container with no data. + */ +void TestMpCollectionContainers::testSetupContainerAlbumsNoData() +{ + mCollectionData->mCount = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextAlbums); - - mTest = 0; - mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); - mCollectionData->mContext = ECollectionContextPlaylists; - mTest->setDataModel(mCollectionDataModel); - - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - - mCollectionData->mContext = ECollectionContextPlaylistSongs; - mTest->setDataModel(mCollectionDataModel); - mCollectionData->mCount = 0; - QVERIFY(static_cast(mTest)->mList == 0); - QVERIFY(static_cast(mTest)->mInfoBar == 0); - QVERIFY(static_cast(mTest)->mNoMusic != 0); - QVERIFY(static_cast(mTest)->mIndexFeedback->itemView() == 0 ); - QCOMPARE(mView->mContainerFactory->mCurrentContext, ECollectionContextPlaylists); - + MpCollectionContainerAlbums *albums = static_cast(mTest); + + QVERIFY(albums->mList == 0); + QVERIFY(albums->mInfoBar == 0); + QVERIFY(albums->mTBone == 0); + QVERIFY(albums->mNoMusic != 0); } /*! - Test itemActivated + Test setupContainer via setDataModel for Playlists container. + */ +void TestMpCollectionContainers::testSetupContainerPlaylists() +{ + mCollectionData->mCount = 5; + + // User selects Playlists + mCollectionData->mContext = ECollectionContextPlaylists; + mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerPlaylists *playlists = static_cast(mTest); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylists); + QVERIFY(playlists->mList != 0); + QVERIFY(playlists->mInfoBar == 0); + QVERIFY(playlists->mNoMusic == 0); + QCOMPARE(playlists->mList->itemRecycling(), true); + QCOMPARE(playlists->mList->scrollingStyle(), HbListView::PanOrFlick); + QCOMPARE(playlists->mList->clampingStyle(), HbListView::BounceBackClamping); + QCOMPARE(playlists->mList->frictionEnabled(), true); + QCOMPARE(playlists->mList->longPressEnabled(), true); + QCOMPARE(playlists->mList->verticalScrollBarPolicy(), HbScrollArea::ScrollBarAsNeeded); + QCOMPARE(playlists->mList->listItemPrototype()->graphicsSize(), HbListViewItem::Thumbnail); + QVERIFY(playlists->mIndexFeedback->itemView() == 0 ); + + // User selects a playlist + mCollectionData->mContext = ECollectionContextPlaylistSongs; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylistSongs); + QVERIFY(playlists->mList != 0); + QVERIFY(playlists->mInfoBar != 0); + QVERIFY(playlists->mNoMusic == 0); + QCOMPARE(playlists->mInfoBar->heading(), QString("Title")); + + // User selects back - navigate back to playlists + mCollectionData->mContext = ECollectionContextPlaylists; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylists); + QVERIFY(playlists->mList != 0); + QVERIFY(playlists->mInfoBar == 0); +} + +/*! + Test setupContainer via setDataModel for Playlists container in Fetcher mode. */ -void TestMpCollectionContainers::testItemActivated() -{ +void TestMpCollectionContainers::testSetupContainerPlaylistsFetcher() +{ + mCollectionData->mCount = 5; + + // User selects Playlists + mCollectionData->mContext = ECollectionContextPlaylists; + mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); + mTest->setViewMode(MpCommon::FetchView); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerPlaylists *playlists = static_cast(mTest); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylists); + + // User selects a playlist + mCollectionData->mContext = ECollectionContextPlaylistSongs; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylistSongs); + QVERIFY(playlists->mList != 0); + QVERIFY(playlists->mInfoBar != 0); + QVERIFY(playlists->mNoMusic == 0); + QCOMPARE(playlists->mInfoBar->heading(), hbTrId("txt_mus_subtitle_select_a_song")); + + // User selects back - navigate back to playlists + mCollectionData->mContext = ECollectionContextPlaylists; + mTest->setDataModel(mCollectionDataModel); + QCOMPARE(playlists->mCollectionContext, ECollectionContextPlaylists); + QVERIFY(playlists->mList != 0); + QVERIFY(playlists->mInfoBar == 0); +} + +/*! + Test setupContainer via setDataModel for Playlists container with no data. + */ +void TestMpCollectionContainers::testSetupContainerPlaylistsNoData() +{ + mCollectionData->mCount = 0; + mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); + mTest->setDataModel(mCollectionDataModel); + MpCollectionContainerPlaylists *playlists = static_cast(mTest); + + QVERIFY(playlists->mList == 0); + QVERIFY(playlists->mInfoBar == 0); + QVERIFY(playlists->mNoMusic != 0); +} + +/*! + Test itemActivated - AllSongs container + */ +void TestMpCollectionContainers::testItemActivatedAllSongs() +{ mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); - - QSignalSpy spy(mTest, SIGNAL(itemActivated( int ))); + QSignalSpy spy(mTest, SIGNAL(itemActivated(int))); static_cast(mTest)->itemActivated(QModelIndex()); QCOMPARE(spy.count(), 1); QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); - - mTest = 0; +} + +/*! + Test itemActivated - Artists container. + */ +void TestMpCollectionContainers::testItemActivatedArtists() +{ + QModelIndex index = QModelIndex(); mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); - QSignalSpy spy2(mTest, SIGNAL(itemActivated( int ))); - static_cast(mTest)->itemActivated(QModelIndex()); + QSignalSpy spy(mTest, SIGNAL(itemActivated(int))); + MpCollectionContainerArtists *artists = static_cast(mTest); + + artists->itemActivated(index); + QCOMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); + QCOMPARE(artists->mCurrentArtistIndex, -1); + + artists->mCollectionContext = ECollectionContextArtistAlbums; + artists->itemActivated(index); + QCOMPARE(spy.count(), 2); + QCOMPARE(qvariant_cast(spy.at(1).at(0)), -1); + QCOMPARE(artists->mCurrentAlbumIndex, -1); + + artists->mCollectionContext = ECollectionContextArtistAlbumsTBone; + QSignalSpy spy2(mTest, SIGNAL(playAlbumSongs(int, int))); + artists->mCurrentAlbumIndex = 1; + artists->itemActivated(index); + QCOMPARE(spy.count(), 2); QCOMPARE(spy2.count(), 1); - QCOMPARE(qvariant_cast(spy2.at(0).at(0)), -1); - - mTest = 0; + QCOMPARE(qvariant_cast(spy2.at(0).at(0)), 1); + QCOMPARE(qvariant_cast(spy2.at(0).at(1)), -1); + + artists->setViewMode(MpCommon::FetchView); + artists->mCollectionContext = ECollectionContextArtistAlbumsTBone; + artists->itemActivated(index); + QCOMPARE(spy.count(), 3); + QCOMPARE(spy2.count(), 1); + QCOMPARE(qvariant_cast(spy.at(2).at(0)), -1); + + artists->mCollectionContext = ECollectionContextArtistAllSongs; + artists->itemActivated(index); + QCOMPARE(spy.count(), 4); + QCOMPARE(qvariant_cast(spy.at(3).at(0)), -1); +} + +/*! + Test itemActivated - Albums container. + */ +void TestMpCollectionContainers::testItemActivatedAlbums() +{ + QModelIndex index = QModelIndex(); mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); - QSignalSpy spy3(mTest, SIGNAL(itemActivated( int ))); - static_cast(mTest)->itemActivated(QModelIndex()); - QCOMPARE(spy3.count(), 1); - QCOMPARE(qvariant_cast(spy3.at(0).at(0)), -1); - - mTest = 0; + QSignalSpy spy(mTest, SIGNAL(itemActivated(int))); + MpCollectionContainerAlbums *albums = static_cast(mTest); + + albums->itemActivated(index); + QCOMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); + QCOMPARE(albums->mCurrentAlbumIndex, -1); + + albums->mCollectionContext = ECollectionContextAlbumsTBone; + QSignalSpy spy2(mTest, SIGNAL(playAlbumSongs(int, int))); + albums->mCurrentAlbumIndex = 1; + albums->itemActivated(index); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy2.count(), 1); + QCOMPARE(qvariant_cast(spy2.at(0).at(0)), 1); + QCOMPARE(qvariant_cast(spy2.at(0).at(1)), -1); + + albums->setViewMode(MpCommon::FetchView); + albums->mCollectionContext = ECollectionContextAlbumsTBone; + albums->itemActivated(index); + QCOMPARE(spy.count(), 2); + QCOMPARE(spy2.count(), 1); + QCOMPARE(qvariant_cast(spy.at(1).at(0)), -1); +} + +/*! + Test itemActivated - Playlists container + */ +void TestMpCollectionContainers::testItemActivatedPlaylists() +{ + QModelIndex index = QModelIndex(); mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); - QSignalSpy spy4(mTest, SIGNAL(itemActivated( int ))); - static_cast(mTest)->itemActivated(QModelIndex()); - QCOMPARE(spy4.count(), 1); - QCOMPARE(qvariant_cast(spy4.at(0).at(0)), -1); + QSignalSpy spy(mTest, SIGNAL(itemActivated(int))); + MpCollectionContainerPlaylists *playlists = static_cast(mTest); + + playlists->itemActivated(index); + QCOMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); + QCOMPARE(playlists->mCurrentPlaylistIndex, -1); + + playlists->mCollectionContext = ECollectionContextPlaylistSongs; + playlists->itemActivated(index); + QCOMPARE(spy.count(), 2); + QCOMPARE(qvariant_cast(spy.at(1).at(0)), -1); } /*! Test onLongPressed - */ +*/ void TestMpCollectionContainers::testOnLongPressed() { mTest = mView->mContainerFactory->createContainer(ECollectionContextAllSongs); QSignalSpy spy(mTest, SIGNAL(itemLongPressed( int, QPointF ))); - + HbListView *viewItem = new HbListView(); static_cast(mTest)->onLongPressed(viewItem->listItemPrototype(), QPointF()); QCOMPARE(spy.count(), 1); QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); - - mTest = 0; + + mTest = 0; mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); QSignalSpy spy2(mTest, SIGNAL(itemLongPressed( int, QPointF ))); static_cast(mTest)->onLongPressed(viewItem->listItemPrototype(), QPointF()); QCOMPARE(spy2.count(), 1); QCOMPARE(qvariant_cast(spy2.at(0).at(0)), -1); - - mTest = 0; + + mTest = 0; mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); QSignalSpy spy3(mTest, SIGNAL(itemLongPressed( int, QPointF ))); static_cast(mTest)->onLongPressed(viewItem->listItemPrototype(), QPointF()); QCOMPARE(spy3.count(), 1); QCOMPARE(qvariant_cast(spy3.at(0).at(0)), -1); - - mTest = 0; + + mTest = 0; mTest = mView->mContainerFactory->createContainer(ECollectionContextPlaylists); QSignalSpy spy4(mTest, SIGNAL(itemLongPressed( int, QPointF ))); static_cast(mTest)->onLongPressed(viewItem->listItemPrototype(), QPointF()); @@ -455,4 +788,65 @@ QCOMPARE(qvariant_cast(spy4.at(0).at(0)), -1); } -// End of file + +/*! + Test albumCentered - Artists container. + */ +void TestMpCollectionContainers::testAlbumCenteredArtists() +{ + mTest = mView->mContainerFactory->createContainer(ECollectionContextArtists); + mTest->mCollectionData = mCollectionData; + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + MpCollectionContainerArtists *artists = static_cast(mTest); + + mCollectionData->mCurrentAlbumAvailable = false; + artists->mAlbumIndexOffset = 0; + artists->mCurrentAlbumIndex = 0; + artists->albumCentered(); + QCOMPARE(artists->mCurrentAlbumIndex, -1); + QCOMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); + + mCollectionData->mCurrentAlbumAvailable = true; + artists->mAlbumIndexOffset = 0; + artists->mCurrentAlbumIndex = 0; + artists->albumCentered(); + QCOMPARE(artists->mCurrentAlbumIndex, -1); + QCOMPARE(spy.count(), 1); + + // Re-centered on same item + artists->mAlbumIndexOffset = 1; + artists->mCurrentAlbumIndex = 0; + artists->albumCentered(); + QCOMPARE(spy.count(), 1); +} + +/*! + Test albumCentered - Albums container. + */ +void TestMpCollectionContainers::testAlbumCenteredAlbums() +{ + mTest = mView->mContainerFactory->createContainer(ECollectionContextAlbums); + mTest->mCollectionData = mCollectionData; + QSignalSpy spy(mTest, SIGNAL(findAlbumSongs(int))); + MpCollectionContainerAlbums *albums = static_cast(mTest); + + mCollectionData->mCurrentAlbumAvailable = false; + albums->mCurrentAlbumIndex = 0; + albums->albumCentered(); + QCOMPARE(albums->mCurrentAlbumIndex, -1); + QCOMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast(spy.at(0).at(0)), -1); + + mCollectionData->mCurrentAlbumAvailable = true; + albums->mCurrentAlbumIndex = 0; + albums->albumCentered(); + QCOMPARE(albums->mCurrentAlbumIndex, -1); + QCOMPARE(spy.count(), 1); + + // Re-centered on same item + albums->mCurrentAlbumIndex = -1; + albums->albumCentered(); + QCOMPARE(spy.count(), 1); +} + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/hgmediawall.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/hgmediawall.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,82 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: HgMediawall stub for testing mpcollectioncontainers +* +*/ + +#ifndef HGMEDIAWALL_H +#define HGMEDIAWALL_H + +//includes +#include +#include +#include + +class HgWidget : public HbWidget +{ + Q_OBJECT + +public: + + enum ScrollBarPolicy { + ScrollBarAsNeeded = Qt::ScrollBarAsNeeded, + ScrollBarAlwaysOff = Qt::ScrollBarAlwaysOff, + ScrollBarAlwaysOn = Qt::ScrollBarAlwaysOn, + ScrollBarAutoHide + }; + + explicit HgWidget ( QGraphicsItem *parent = 0 ); + virtual ~HgWidget (); + + void setScrollBarPolicy( ScrollBarPolicy policy ); + virtual void setModel(QAbstractItemModel *model); + void scrollTo(const QModelIndex &index); + QModelIndex currentIndex() const; + +signals: + + void scrollingEnded(); + +}; + +class HgMediawall : public HgWidget +{ + Q_OBJECT + +public: + + enum LabelPosition { + PositionNone = 0, + PositionAboveImage, + PositionBelowImage + }; + + explicit HgMediawall( QGraphicsItem *parent = 0 ); + virtual ~HgMediawall(); + + void setTitlePosition( LabelPosition position ); + void setDescriptionPosition( LabelPosition position ); + void setTitleFontSpec( const HbFontSpec &fontSpec ); + void setDescriptionFontSpec( const HbFontSpec &fontSpec ); + + void enableReflections( bool enabled ); + bool reflectionsEnabled() const; + +public: + + bool mReflectionEnabled; + +}; + +#endif // HGMEDIAWALL_H diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectiondatamodel.h --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectiondatamodel.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectiondatamodel.h Fri May 14 18:54:37 2010 -0500 @@ -11,7 +11,8 @@ * * Contributors: * -* Description: Music Player collection abstract data model stub for testing mpcollectioncontainers +* Description: Music Player collection abstract data model stub for testing +* mpcollectioncontainers. * */ @@ -39,7 +40,6 @@ void refreshModel(); MpMpxCollectionData *collectionData(); - public: MpMpxCollectionData *mCollectionData; diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectiontbonelistdatamodel.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectiontbonelistdatamodel.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Music Player collection abstract data model (for TBone) stub +* for testing mpcollectioncontainers. +* +*/ + +#ifndef MPCOLLECTIONTBONELISTDATAMODEL_H +#define MPCOLLECTIONTBONELISTDATAMODEL_H + +#include + +class MpMpxCollectionData; + +class MpCollectionTBoneListDataModel : public QAbstractListModel +{ + Q_OBJECT + +public: + + explicit MpCollectionTBoneListDataModel( MpMpxCollectionData *data, QObject *parent=0 ); + virtual ~MpCollectionTBoneListDataModel(); + + int rowCount(const QModelIndex &parent=QModelIndex()) const; + QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const; + +public slots: + + void refreshModel(); + +private: + + MpMpxCollectionData *mCollectionData; // Not own + int mRowCount; + +}; + +#endif // MPCOLLECTIONTBONELISTDATAMODEL_H + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectionview.h --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectionview.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpcollectionview.h Fri May 14 18:54:37 2010 -0500 @@ -55,9 +55,11 @@ public slots: - + void openIndex( int index ); void openContextMenu( int index, const QPointF &coords ); + void findAlbumSongs( int index ); + void playAlbumSongs( int albumIndex, int songIndex ); public: @@ -76,8 +78,8 @@ bool mEffectOnGoing; HbMainWindow *mWindow; // Not own - HbAction *mNavigationQuit; // Not own - HbAction *mNavigationBack; // Not own + HbAction *mSoftKeyQuit; // Not own + HbAction *mSoftKeyBack; // Not own MpCollectionDocumentLoader *mDocumentLoader; // Own HbWidget *mMainContainer; // Own diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpmpxcollectiondata.h --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpmpxcollectiondata.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/inc/mpmpxcollectiondata.h Fri May 14 18:54:37 2010 -0500 @@ -18,12 +18,12 @@ #ifndef MPMPXCOLLECTIONDATA_H #define MPMPXCOLLECTIONDATA_H +#include #include "mpmpxcollectionviewdefs.h" class CMPXMedia; - -class MpMpxCollectionData +class MpMpxCollectionData : public QObject { public: @@ -41,22 +41,29 @@ }; // Stub functions - MpMpxCollectionData(); - ~MpMpxCollectionData(); + explicit MpMpxCollectionData( QObject *parent=0 ); + virtual ~MpMpxCollectionData(); TCollectionContext context(); + + int count() const; + QString collectionTitle() const; QString itemData( int index, MpMpxCollectionData::DataType type ) const; - void setMpxMedia( const CMPXMedia& entries ); + bool setCurrentAlbum( int index ); + const CMPXMedia& containerMedia(); - int count() const; - QString collectionTitle() const; public: + CMPXMedia *mContainerMedia; - TBool mMediaSet; + bool mMediaSet; TCollectionContext mContext; int mCount; + int mCurrentAlbumIndex; + bool mCurrentAlbumAvailable; + bool mReturnCollectionTitle; + }; #endif // MPMPXCOLLECTIONDATA_H diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/hgmediawall.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/hgmediawall.cpp Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,135 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: HgMediawall stub for testing mpcollectioncontainers +* +*/ + +#include "hgmediawall.h" + + +/*! + Constructs the mediawall widget stub. + */ +HgWidget::HgWidget( QGraphicsItem *parent ) +{ + Q_UNUSED(parent); +} + +/*! + Destructs the mediawall widget stub. + */ +HgWidget::~HgWidget() +{ +} + +/*! + Stub function + */ +void HgWidget::setScrollBarPolicy( ScrollBarPolicy policy ) +{ + Q_UNUSED(policy); +} + +/*! + Stub function + */ +void HgWidget::setModel( QAbstractItemModel *model ) +{ + Q_UNUSED(model); +} + +/*! + Stub function + */ +void HgWidget::scrollTo( const QModelIndex &index ) +{ + Q_UNUSED(index); +} + +/*! + Stub function + */ +QModelIndex HgWidget::currentIndex() const +{ + return QModelIndex(); +} + + +//=========================================================================== +//=========================================================================== + +/*! + Constructs the mediawall widget stub. + */ +HgMediawall::HgMediawall( QGraphicsItem *parent ) +{ + Q_UNUSED(parent); + mReflectionEnabled = true; +} + +/*! + Destructs the mediawall widget stub. + */ +HgMediawall::~HgMediawall() +{ +} + +/*! + Stub function + */ +void HgMediawall::setTitlePosition( LabelPosition position ) +{ + Q_UNUSED(position); +} + +/*! + Stub function + */ +void HgMediawall::setDescriptionPosition( LabelPosition position ) +{ + Q_UNUSED(position); +} + +/*! + Stub function + */ +void HgMediawall::setTitleFontSpec( const HbFontSpec &fontSpec ) +{ + Q_UNUSED(fontSpec); +} + +/*! + Stub function + */ +void HgMediawall::setDescriptionFontSpec( const HbFontSpec &fontSpec ) +{ + Q_UNUSED(fontSpec); +} + +/*! + Stub function + */ +void HgMediawall::enableReflections( bool enabled ) +{ + mReflectionEnabled = enabled; +} + +/*! + Stub function + */ +bool HgMediawall::reflectionsEnabled() const +{ + return mReflectionEnabled; +} + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectiondatamodel.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectiondatamodel.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectiondatamodel.cpp Fri May 14 18:54:37 2010 -0500 @@ -11,7 +11,8 @@ * * Contributors: * -* Description: Music Player collection data model stub for testing mpcollectioncontainers. +* Description: Music Player collection abstract data model stub for testing +* mpcollectioncontainers. * */ @@ -28,8 +29,7 @@ : QAbstractListModel(parent), mCollectionData(data) { - TX_ENTRY - TX_EXIT + TX_LOG } /*! @@ -37,8 +37,7 @@ */ MpCollectionDataModel::~MpCollectionDataModel() { - TX_ENTRY - TX_EXIT + TX_LOG } /*! @@ -65,8 +64,8 @@ Q_UNUSED(index); Q_UNUSED(role); QVariant returnValue = QVariant(); + TX_EXIT return returnValue; - TX_EXIT } /*! @@ -74,8 +73,7 @@ */ void MpCollectionDataModel::refreshModel() { - TX_ENTRY - TX_EXIT + TX_LOG } /*! diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectiontbonelistdatamodel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectiontbonelistdatamodel.cpp Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,72 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Music Player collection abstract data model (for TBone) stub +* for testing mpcollectioncontainers. +* +*/ + +#include "stub/inc/mpcollectiontbonelistdatamodel.h" +#include "stub/inc/mpmpxcollectiondata.h" +#include "mptrace.h" + +/*! + Stub function + */ +MpCollectionTBoneListDataModel::MpCollectionTBoneListDataModel( MpMpxCollectionData *data, QObject *parent ) + : QAbstractListModel(parent), + mCollectionData(data), + mRowCount(0) +{ + TX_LOG +} + +/*! + Stub function + */ +MpCollectionTBoneListDataModel::~MpCollectionTBoneListDataModel() +{ + TX_LOG +} + +/*! + Stub function + */ +int MpCollectionTBoneListDataModel::rowCount( const QModelIndex &parent ) const +{ + TX_LOG + Q_UNUSED(parent); + return mRowCount; +} + +/*! + Stub function + */ +QVariant MpCollectionTBoneListDataModel::data(const QModelIndex &index, int role) const +{ + TX_ENTRY + Q_UNUSED(index); + Q_UNUSED(role); + QVariant returnValue = QVariant(); + TX_EXIT + return returnValue; +} + +/*! + Stub function + */ +void MpCollectionTBoneListDataModel::refreshModel() +{ + TX_LOG +} + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectionview.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectionview.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpcollectionview.cpp Fri May 14 18:54:37 2010 -0500 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include +#include #include "stub/inc/mpcollectionview.h" #include "mpcollectiondocumentloader.h" @@ -36,7 +36,7 @@ */ MpCollectionView::MpCollectionView() : mContainerFactory(0), - mDocumentLoader(0) + mDocumentLoader(0) { TX_LOG } @@ -84,5 +84,21 @@ Q_UNUSED(coords); } +/*! + Stub function + */ +void MpCollectionView::findAlbumSongs( int index ) +{ + Q_UNUSED(index); +} + +/*! + Stub function + */ +void MpCollectionView::playAlbumSongs( int albumIndex, int songIndex ) +{ + Q_UNUSED(albumIndex); + Q_UNUSED(songIndex); +} diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpmpxcollectiondata.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpmpxcollectiondata.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/stub/src/mpmpxcollectiondata.cpp Fri May 14 18:54:37 2010 -0500 @@ -23,18 +23,23 @@ /*! Stub function. */ -MpMpxCollectionData::MpMpxCollectionData() - :mContainerMedia(0), - mMediaSet(EFalse), - mContext (ECollectionContextUnknown) -{ +MpMpxCollectionData::MpMpxCollectionData( QObject *parent ) + : QObject(parent), + mContainerMedia(0), + mMediaSet(false), + mContext(ECollectionContextUnknown), + mCount(0), + mCurrentAlbumIndex(-1), + mCurrentAlbumAvailable(false), + mReturnCollectionTitle(true) +{ } /*! Stub function. */ MpMpxCollectionData::~MpMpxCollectionData() -{ +{ } /*! @@ -47,6 +52,27 @@ /*! Stub function. + */ +int MpMpxCollectionData::count() const +{ + return mCount; +} + +/*! + Stub function. + */ +QString MpMpxCollectionData::collectionTitle() const +{ + if ( mReturnCollectionTitle ) { + return QString("Title"); + } + else { + return QString(); + } +} + +/*! + Stub function. */ QString MpMpxCollectionData::itemData( int index, MpMpxCollectionData::DataType type ) const { @@ -58,15 +84,14 @@ return QString(); } } + /*! Stub function. */ -void MpMpxCollectionData::setMpxMedia( const CMPXMedia& entries ) +bool MpMpxCollectionData::setCurrentAlbum( int index ) { - delete mContainerMedia; - mContainerMedia = 0; - mContainerMedia = CMPXMedia::NewL(entries); - mMediaSet = ETrue; + mCurrentAlbumIndex = index; + return mCurrentAlbumAvailable; } /*! @@ -77,20 +102,3 @@ return *mContainerMedia; } -/*! - Stub function. - */ -int MpMpxCollectionData::count() const -{ - return mCount; -} - -/*! - Stub function. - */ -QString MpMpxCollectionData::collectionTitle() const -{ - QString title("Title"); - return title; -} -//end of file diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/unittest_mpcollectioncontainers.pro --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/unittest_mpcollectioncontainers.pro Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectioncontainers/unittest_mpcollectioncontainers.pro Fri May 14 18:54:37 2010 -0500 @@ -16,19 +16,21 @@ TEMPLATE = app CONFIG += qtestlib hb -TARGET = +CONFIG += symbian_test +TARGET = unittest_mpcollectioncontainers +TARGET.CAPABILITY = CAP_APPLICATION DEPENDPATH += . INCLUDEPATH += . \ stub/inc \ ../../../../inc - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +INCLUDEPATH += $$MW_LAYER_PUBLIC_EXPORT_PATH(hgwidgets) LIBS += -lestor.dll \ - -lmpnowplayingbanner.dll - + -lmpnowplayingbanner.dll \ + -lganeswidgets.dll HEADERS += inc/unittest_mpcollectioncontainers.h \ ../../inc/mpcollectioncontainerfactory.h \ @@ -38,12 +40,13 @@ ../../inc/mpcollectioncontainerartists.h \ ../../inc/mpcollectioncontaineralbums.h \ ../../inc/mpcollectioncontainerplaylists.h \ - ../../inc/mpcollectioncontainergenres.h \ ../../inc/mpcollectiondocumentloader.h \ stub/inc/mpcollectiondatamodel.h \ + stub/inc/mpcollectiontbonelistdatamodel.h \ stub/inc/mpmpxcollectiondata.h \ - stub/inc/mpcollectionview.h - + stub/inc/mpcollectionview.h \ + stub/inc/hgmediawall.h + SOURCES += src/unittest_mpcollectioncontainers.cpp \ ../../src/mpcollectioncontainerfactory.cpp \ ../../src/mpcollectioncontainer.cpp \ @@ -52,10 +55,11 @@ ../../src/mpcollectioncontainerartists.cpp \ ../../src/mpcollectioncontaineralbums.cpp \ ../../src/mpcollectioncontainerplaylists.cpp \ - ../../src/mpcollectioncontainergenres.cpp \ ../../src/mpcollectiondocumentloader.cpp \ stub/src/mpcollectiondatamodel.cpp \ + stub/src/mpcollectiontbonelistdatamodel.cpp \ stub/src/mpmpxcollectiondata.cpp \ - stub/src/mpcollectionview.cpp - + stub/src/mpcollectionview.cpp \ + stub/src/hgmediawall.cpp + RESOURCES += ../../resources/mpcollectionviewresources.qrc \ No newline at end of file diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/inc/unittest_mpcollectiondocumentloader.h --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/inc/unittest_mpcollectiondocumentloader.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/inc/unittest_mpcollectiondocumentloader.h Fri May 14 18:54:37 2010 -0500 @@ -31,17 +31,17 @@ TestMpCollectionDocumentLoader(); virtual ~TestMpCollectionDocumentLoader(); -signals: +public slots: - -public slots: void initTestCase(); void cleanupTestCase(); void init(); void cleanup(); private slots: + void testCreateMpNowPlayingWidget(); + void testCreateHgMediawall(); void testCreateQObject(); private: diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/src/unittest_mpcollectiondocumentloader.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/src/unittest_mpcollectiondocumentloader.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/src/unittest_mpcollectiondocumentloader.cpp Fri May 14 18:54:37 2010 -0500 @@ -16,12 +16,10 @@ */ #include -#include -#include -#include #include "unittest_mpcollectiondocumentloader.h" #include "mpnowplayingwidget.h" +#include "hgmediawall.h" // Do this so we can access all member variables. #define private public @@ -33,18 +31,20 @@ */ int main(int argc, char *argv[]) { - HbApplication app(argc, argv); - HbMainWindow window; + QApplication app(argc, argv); TestMpCollectionDocumentLoader tv; - char *pass[3]; - pass[0] = argv[0]; - pass[1] = "-o"; - pass[2] = "c:\\data\\unittest_mpcollectiondocumentloader.txt"; + if ( argc > 1 ) { + return QTest::qExec( &tv, argc, argv); + } + else { + char *pass[3]; + pass[0] = argv[0]; + pass[1] = "-o"; + pass[2] = "c:\\data\\unittest_mpcollectiondocumentloader.txt"; - int res = QTest::qExec(&tv, 3, pass); - - return res; + return QTest::qExec(&tv, 3, pass); + } } TestMpCollectionDocumentLoader::TestMpCollectionDocumentLoader() @@ -93,30 +93,37 @@ */ void TestMpCollectionDocumentLoader::testCreateMpNowPlayingWidget() { - cleanup(); - init(); QObject *theObject; - theObject = mTest->createObject(QString("MpNowPlayingWidget"),QString("myMpNowPlayingWidget")); - QCOMPARE(theObject->metaObject()->className(),"MpNowPlayingWidget"); - QCOMPARE(theObject->objectName(),QString("myMpNowPlayingWidget")); + theObject = mTest->createObject(QString("MpNowPlayingWidget"), QString("myMpNowPlayingWidget")); + QCOMPARE(theObject->metaObject()->className(), "MpNowPlayingWidget"); + QCOMPARE(theObject->objectName(), QString("myMpNowPlayingWidget")); QVERIFY(qobject_cast(theObject)); delete theObject; +} +/*! + Tests the correct creation of HgMediawall. + */ +void TestMpCollectionDocumentLoader::testCreateHgMediawall() +{ + QObject *theObject; + theObject = mTest->createObject(QString("HgMediawall"), QString("HgMediawall")); + QCOMPARE(theObject->metaObject()->className(),"HgMediawall"); + QCOMPARE(theObject->objectName(),QString("HgMediawall")); + QVERIFY(qobject_cast(theObject)); + delete theObject; } /*! Tests the correct creation of QObject, this should be pased to the - base clas and base clas should return a named object. + base class and base class should return a named object. */ void TestMpCollectionDocumentLoader::testCreateQObject() { - cleanup(); - init(); QObject *theObject; - theObject = mTest->createObject(QString("QObject"),QString("myQObject")); - QCOMPARE(theObject->metaObject()->className(),"QObject"); - QCOMPARE(theObject->objectName(),QString("myQObject")); + theObject = mTest->createObject(QString("QObject"), QString("myQObject")); + QCOMPARE(theObject->metaObject()->className(), "QObject"); + QCOMPARE(theObject->objectName(), QString("myQObject")); delete theObject; } -// End of file diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/stub/inc/hgmediawall.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/stub/inc/hgmediawall.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,36 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: HgMediawall stub for testing MpCollectionDocumentLoader +* +*/ + +#ifndef HGMEDIAWALL_H +#define HGMEDIAWALL_H + +//includes +#include +#include + +class HgMediawall : public QObject +{ + Q_OBJECT + +public: + + explicit HgMediawall( QGraphicsItem *parent = 0 ); + virtual ~HgMediawall(); + +}; + +#endif // HGMEDIAWALL_H diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/stub/src/hgmediawall.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/stub/src/hgmediawall.cpp Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,34 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: HgMediawall stub for testing MpCollectionDocumentLoader +* +*/ + +#include "hgmediawall.h" + + +/*! + Constructs the mediawall widget stub. + */ +HgMediawall::HgMediawall( QGraphicsItem *parent ) +{ + Q_UNUSED(parent); +} + +/*! + Destructs the mediawall widget stub. + */ +HgMediawall::~HgMediawall() +{ +} diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/unittest_mpcollectiondocumentloader.pro --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/unittest_mpcollectiondocumentloader.pro Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpcollectiondocumentloader/unittest_mpcollectiondocumentloader.pro Fri May 14 18:54:37 2010 -0500 @@ -16,20 +16,25 @@ TEMPLATE = app CONFIG += qtestlib hb -TARGET = +CONFIG += symbian_test +TARGET = unittest_mpcollectiondocumentloader +TARGET.CAPABILITY = CAP_APPLICATION DEPENDPATH += . INCLUDEPATH += . \ stub/inc \ ../../../../inc - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +INCLUDEPATH += $$MW_LAYER_PUBLIC_EXPORT_PATH(hgwidgets) HEADERS += inc/unittest_mpcollectiondocumentloader.h \ ../../inc/mpcollectiondocumentloader.h \ - stub/inc/mpnowplayingwidget.h - + stub/inc/mpnowplayingwidget.h \ + stub/inc/hgmediawall.h + SOURCES += src/unittest_mpcollectiondocumentloader.cpp \ ../../src/mpcollectiondocumentloader.cpp \ - stub/src/mpnowplayingwidget.cpp + stub/src/mpnowplayingwidget.cpp \ + stub/src/hgmediawall.cpp + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/src/unittest_mpsnapshotwidget.cpp --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/src/unittest_mpsnapshotwidget.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/src/unittest_mpsnapshotwidget.cpp Fri May 14 18:54:37 2010 -0500 @@ -16,9 +16,7 @@ */ #include -#include -#include -#include +#include #include "unittest_mpsnapshotwidget.h" @@ -32,19 +30,24 @@ */ int main(int argc, char *argv[]) { - HbApplication app(argc, argv); - HbMainWindow window; - window.show(); + QApplication app(argc, argv); + QGraphicsScene *testScene = new QGraphicsScene(QRectF(0,0,200,200)); + QGraphicsView mainWindow(testScene); + mainWindow.show(); + TestMpSnapshotWidget tv; - char *pass[3]; - pass[0] = argv[0]; - pass[1] = "-o"; - pass[2] = "c:\\data\\unittest_mpsnapshotwidget.txt"; + if ( argc > 1 ) { + return QTest::qExec( &tv, argc, argv); + } + else { + char *pass[3]; + pass[0] = argv[0]; + pass[1] = "-o"; + pass[2] = "c:\\data\\unittest_mpsnapshotwidget.txt"; - int res = QTest::qExec(&tv, 3, pass); - - return res; + return QTest::qExec(&tv, 3, pass); + } } TestMpSnapshotWidget::TestMpSnapshotWidget() @@ -112,7 +115,8 @@ { cleanup(); init(); - HbMainWindow *mainWindow = hbInstance->allMainWindows()[0]; + QGraphicsView *mainWindow = qobject_cast(qApp->activeWindow()); + QVERIFY(mainWindow != 0); QGraphicsRectItem rectItem(QRectF(0,0,10,10)); mainWindow->scene()->addItem(&rectItem); rectItem.show(); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/unittest_mpsnapshotwidget.pro --- a/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/unittest_mpsnapshotwidget.pro Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpcollectionviewplugin/tsrc/unittest_mpsnapshotwidget/unittest_mpsnapshotwidget.pro Fri May 14 18:54:37 2010 -0500 @@ -16,7 +16,9 @@ TEMPLATE = app CONFIG += qtestlib hb -TARGET = +CONFIG += symbian_test +TARGET = unittest_mpsnapshotwidget +TARGET.CAPABILITY = CAP_APPLICATION DEPENDPATH += . INCLUDEPATH += . \ @@ -26,6 +28,6 @@ HEADERS += inc/unittest_mpsnapshotwidget.h \ ../../inc/mpsnapshotwidget.h - + SOURCES += src/unittest_mpsnapshotwidget.cpp \ ../../src/mpsnapshotwidget.cpp \ No newline at end of file diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/logger.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/inc/logger.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,100 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Tracing macros +* +*/ + +#ifndef LOGGER_H +#define LOGGER_H + +#ifndef _DEBUG + + #define TRACE( AA ) + + #define TRACE2( AA, BB ) + + #define TRACE3( AA, BB, CC ) + + #define TRACE4( AA, BB, CC, DD ) + + #define TRACE5( AA, BB, CC, DD, EE ) + + #define DUMP8( AA ) + + #define TRACE_DOWNLOADER_STATE( AA ) + + #define TRACE_AND_PANIC( AA ) + + #define PANIC_ON_ERROR(AA, BB) + +#else + + // INCLUDES + #include + + #define TRACE_AND_PANIC( AA ) \ + { \ + RDebug::Printf( "ERROR: " AA ); \ + ASSERT(EFalse); \ + } + + #define PANIC_ON_ERROR(AA, BB) \ + { \ + if(AA) \ + { \ + RDebug::Printf( "ERROR: " BB, AA ); \ + ASSERT(EFalse); \ + } \ + } + + #define TRACE( AA ) do { RDebug::Printf( AA ); } while( 0 ) + + #define TRACE2( AA, BB ) do { RDebug::Printf( AA, BB ); } while( 0 ) + + #define TRACE3( AA, BB, CC ) do { RDebug::Printf( AA, BB, CC ); } while( 0 ) + + #define TRACE4( AA, BB, CC, DD ) do { RDebug::Printf( AA, BB, CC, DD ); } while( 0 ) + + #define TRACE5( AA, BB, CC, DD, EE ) do { RDebug::Printf( AA, BB, CC, DD, EE ); } while( 0 ) + + #define DUMP8( AA ) \ + TRAP_IGNORE( \ + { \ + HBufC* conversion = HBufC::NewLC( AA.Length() ); \ + TPtr convPtr( conversion->Des() ); \ + convPtr.Copy( AA ); \ + const TInt KMaxLine = 60; \ + for ( TInt index = convPtr.Length(); index > 0; \ + index -= KMaxLine ) \ + { \ + if ( index <= KMaxLine ) \ + { \ + RDebug::Print( convPtr ); \ + break; \ + } \ + else \ + { \ + RDebug::Print( convPtr.Left( KMaxLine ) ); \ + convPtr.Copy( convPtr.Mid( KMaxLine ) ); \ + } \ + } \ + CleanupStack::PopAndDestroy( conversion ); \ + } ); + + +#endif // _LOGGER + +#endif // _LOGGER + +// End of File diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpdetailssharedialog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/inc/mpdetailssharedialog.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,57 @@ +#ifdef SHARE_FUNC_ENABLED +#ifndef MPDETAILSSHAREDIALOG_H +#define MPDETAILSSHAREDIALOG_H + +#include +#include "mpsharedata.h" + +class QGraphicsWebView; +class QNetworkAccessManager; +class MpSongData; + +/*! + Implements Share Player dialog for music player details view. + First, construct an instance of the class, then call initialize method. +*/ +class MpDetailsShareDialog : public HbDialog +{ + Q_OBJECT + +public: + MpDetailsShareDialog(); + + /*! + Initializes an instance of the class with given MpSongData. + MpSongData object ownership is not transferred, + Music Player Engine retains the ownership. + */ + void initialize( MpSongData* aSongData ); + virtual ~MpDetailsShareDialog(); + void logoutPlayer(); + +public slots: + void addContext(); + void updateSharedData(); + void onIndexLoad( bool ok ); + void debugJs( QString s ); + void errorHandler( QString error, QString message ); + void clearCache(); + +signals: + void closeShareDialog(); + +private: + void initShareData( MpSongData* aSongData ); + void initNetworkAccessManager(); + void initWebView(); + void initSignalSlots(); + bool initUser(); + +private: + MpShareData mShareData; + QGraphicsWebView* mShareWebView; // Owned by HbDialog + QNetworkAccessManager* mShareNetAccMan; // Owned +}; + +#endif // MPDETAILSSHAREDIALOG_H +#endif // SHARE_FUNC_ENABLED diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpdetailsview.h --- a/mpviewplugins/mpdetailsviewplugin/inc/mpdetailsview.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/inc/mpdetailsview.h Fri May 14 18:54:37 2010 -0500 @@ -18,8 +18,7 @@ #ifndef MPDETAILSVIEW_H #define MPDETAILSVIEW_H -#include -#include +#include #include #include #include @@ -37,15 +36,31 @@ class HbPushButton; class HbDocumentLoader; class HbListWidget; -class HbDialog; class ThumbnailManager; class QTranslator; class QGraphicsLinearLayout; +class HbProgressBar; +class MpEngine; class MpSongData; -class MpMpxDetailsFrameworkWrapper; +class MpQueryManager; + +#ifdef SHARE_FUNC_ENABLED +class MpDetailsShareDialog; +#endif //class declaration +/*! + Details view is the "flipside view" of Music Player. + In addition to displaying song details, details view + also provides user the possibility to comment a + track (by initiating sharedialog), and to get + recommendations based on his playlist (by displaying + a list of favourites, fetched from OVI music server). + + DetailsView's song information will not be updated + if the track changes while detailsview is active. +*/ class MpDetailsView : public MpViewBase { Q_OBJECT @@ -65,51 +80,48 @@ public slots: void back(); void albumArtChanged(); + void setAlbumArtUri( const QString &albumArtUri, const QString &albumArtName ); private slots: - void share(); - void webViewLoaded( bool ok ); - void playbackInfoChanged(); + void handlePlaybackInfoChanged(); void songDetailInfoChanged(); - // groupbox handling, one or zero groupbox is expanded - void toggleDetailsGroupBox( bool state ); - void toggleInspireMeGroupBox( bool state ); - - void retrieveInformationFinished( QNetworkReply* reply ); - void retrieveInformationNetworkError( QNetworkReply::NetworkError error ); - void retrieveInformationSslErrors( const QList &error ); - - void DownloadFinished( QNetworkReply* reply ); + void handleDetailsGroupBoxToggled( bool state ); + void handleInspireMeGroupBoxToggled( bool state ); + + void handleNetworkError(); void thumbnailReady( const QPixmap& pixmap, void *data, int id, int error ); - - void addContext(); - void close(); - + void updateSharedData(const QString& url); + +#ifdef SHARE_FUNC_ENABLED + void share(); + void closeShareDialog(); +#endif + private: - void setupMenu(); - void loadSharePlayer(); + bool canQueryRecommendations() const; + bool canQuerySharePlayerLink() const; - void constructRequest( QString &uri ); - // retrieve URI from Ovi music server - void retrieveInformation( const QString &urlEncoded ); + void setupMenu(); + + void clearInspireMe(); - void composeAlbumCover( QPixmap albumart ); - QString keyValues( QStringList keys, QStringList values ) const; - void handleParsedXML(); - - void setAlbumArtUri( const QString &albumArtUri, const QString &albumArtName ); void RenderInspireMeGroupBox(); void recommendationAlbumArtReady(); + +#ifdef SHARE_FUNC_ENABLED + void createShareDialog(); +#endif + +private: + MpEngine *mMpEngine; // Own -private: MpSongData *mSongData; - MpMpxDetailsFrameworkWrapper *mFrameworkWrapper; bool mActivated; HbMainWindow *mWindow; - HbAction *mNavigationBack; + HbAction *mSoftKeyBack; HbWidget *mContainer; HbLabel *mSongText; //owned @@ -120,27 +132,17 @@ HbGroupBox *mInspireMeGroupBox; //owned HbPushButton *mShareButton; //owned HbDocumentLoader *mDocumentLoader;//owned - QPixmap mCompositePixmap; HbListWidget *mDetailList; // owned by mSongDetailsGroupBox HbListWidget *mInspireList; // owned by mInspireMeGroupBox - HbWidget *mInspireMe; - QGraphicsLinearLayout *mLayout; HbPushButton *mButton; - - QList mRecommendationSongs; - QList mRecommendationArtists; - QList mRecommendationAlbumArtsLink; - QList mRecommendationAlbumArtsName; - - QNetworkAccessManager *mManager; - QNetworkAccessManager *mDownloadManager; + HbProgressBar *mInspireMeProgressBar; int mDownloadedAlbumArts; ThumbnailManager *mThumbnailManager; //owned QPixmap mDefaultRecommendationAlbumArt; - QMap mRecommendationAlbumArtsMap; - int mAlbumArtsReadyCount; + + QList mReplys; QDomDocument mDomDocument; @@ -148,9 +150,17 @@ QTranslator *mMpTranslator; // Own QTranslator *mCommonTranslator; // Own - HbDialog *mPopup; - QGraphicsWebView *mWebView; // owned by popup dialog + MpQueryManager* mMpQueryManager; // Own + + bool mInspireMeQueryOngoing; + bool mInspireMeQueryRendered; + bool mInspireMeOpen; + bool mSongDetailsGbOpen; +#ifdef SHARE_FUNC_ENABLED + MpDetailsShareDialog* mSharePopup; // Own +#endif + Q_DISABLE_COPY(MpDetailsView) }; diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpdetailsviewplugin.h --- a/mpviewplugins/mpdetailsviewplugin/inc/mpdetailsviewplugin.h Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/inc/mpdetailsviewplugin.h Fri May 14 18:54:37 2010 -0500 @@ -18,13 +18,22 @@ #ifndef MPDETAILSVIEWPLUGIN_H #define MPDETAILSVIEWPLUGIN_H -#include +#include #include //forward declartions class MpDetailsView; //class declaration +/*! + MpDetailsViewPlugin is one of the four view plugins in Music Player. + Each view plugin is instantiated on music player startup, and + destructed on music player exit. + + The actual view is a member variable of ViewPlugin. + View's visibility is controlled by using its activateView() and + deactivateView() methods. +*/ class MpDetailsViewPlugin : public MpxViewPlugin { Q_OBJECT diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpmpxdetailsframeworkwrapper.h --- a/mpviewplugins/mpdetailsviewplugin/inc/mpmpxdetailsframeworkwrapper.h Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Framework wrapper -* -*/ - -#ifndef MPMPXDETAILSFRAMEWORKWRAPPER_H_ -#define MPMPXDETAILSFRAMEWORKWRAPPER_H_ - -//includes -#include - -//forward declartions -class MpSongData; -class MpMpxDetailsFrameworkWrapperPrivate; - -//class declaration -class MpMpxDetailsFrameworkWrapper : public QObject -{ - Q_OBJECT - friend class MpMpxDetailsFrameworkWrapperPrivate; - -public: - explicit MpMpxDetailsFrameworkWrapper( QObject *parent=0 ); - virtual ~MpMpxDetailsFrameworkWrapper(); - - MpSongData *songData(); - -public: - void retrieveSong(); - -private: - Q_DISABLE_COPY( MpMpxDetailsFrameworkWrapper ) - MpMpxDetailsFrameworkWrapperPrivate *d_ptr; //owned -}; - - -#endif /* MPMPXDETAILSFRAMEWORKWRAPPER_H_ */ diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpmpxdetailsframeworkwrapper_p.h --- a/mpviewplugins/mpdetailsviewplugin/inc/mpmpxdetailsframeworkwrapper_p.h Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Framework wrapper - Private. -* -*/ - - -#ifndef MPMPXDETAILSFRAMEWORKWRAPPER_P_H_ -#define MPMPXDETAILSFRAMEWORKWRAPPER_P_H_ - -#include -#include - -//forward declartions -class MMPXPlaybackUtility; -class MpMpxDetailsFrameworkWrapper; -class CMPXMedia; -class MpSongData; - -//class declaration -class MpMpxDetailsFrameworkWrapperPrivate : public MMPXPlaybackObserver, - public MMPXPlaybackCallback -{ - -public: - explicit MpMpxDetailsFrameworkWrapperPrivate( MpMpxDetailsFrameworkWrapper *qq ); - virtual ~MpMpxDetailsFrameworkWrapperPrivate(); - -public: //from MMPXPlaybackObserver - void HandlePlaybackMessage( CMPXMessage *aMessage, TInt aError ); - -public: //from MMPXPlaybackCallback - void HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError ); - void HandleSubPlayerNamesL( TUid aPlayer, const MDesCArray *aSubPlayers, - TBool aComplete, TInt aError ); - void HandleMediaL( const CMPXMedia& aProperties, TInt aError ); - -public: - MpSongData *songData(); - void retrieveSong(); - -private: - void constructProviderL(); - void destructProviderL(); - void doRetrieveSongL(); - -private: - MpMpxDetailsFrameworkWrapper *q_ptr; //not owned - MpSongData *iSongData; // not owned - MMPXPlaybackUtility *iPlaybackUtility; // owned -}; - - -#endif /* MPMPXDETAILSFRAMEWORKWRAPPER_P_H_ */ diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpquerymanager.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/inc/mpquerymanager.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,107 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Music Player Query Manager. +* +*/ +#ifndef MPQUERYMANAGER_H_ +#define MPQUERYMANAGER_H_ + +#include +#include +#include +#include + +#include "mpviewbase.h" + +class QNetworkAccessManager; + +/*! + MpQueryManager class is responsible for performing music player + related network queries, including retrieving the URL for the + music. + + It emits searchUrlRetrieved signal when it has received the + URL. +*/ +class MpQueryManager : public QObject +{ + Q_OBJECT + +public: + MpQueryManager(); + ~MpQueryManager(); + +public: + void clearNetworkReplies(); + void queryLocalMusicStore( QString mArtist,QString mAlbum,QString mTitle ); + void queryInspireMeItems( QString mArtist,QString mAlbum,QString mTitle ); + void clearRecommendations(); + + QStringList recommendationSongs(); + QStringList recommendationArtists(); + QStringList recommendationAlbumArtsLink(); + QMap recommendationAlbumArtsMap(); + int &albumArtsReadyCount(); + + void insertMapItem( const QString &uri, const QPixmap &pixmap ); + +private slots: + void retrieveInformationFinished( QNetworkReply* reply ); + void retrieveInformationNetworkError( QNetworkReply::NetworkError error ); + void retrieveInformationSslErrors( const QList &error ); + void DownloadFinished( QNetworkReply* reply ); + +private: + void constructRequest( QString &uri ); + // retrieve URI from Ovi music server + void retrieveInformation( const QString &urlEncoded ); + + void composeAlbumCover( QPixmap albumart ); + QString keyValues( QStringList keys, QStringList values ) const; + void handleParsedXML(); + + bool writeImageToFile( const QByteArray &aImageData, const QString &aImageFileName ); + +signals: + void networkError(); + void setAlbumArt( const QString &albumArtUri, const QString &albumArtName ); + void searchUrlRetrieved( const QString& url ); + +private: + + QNetworkAccessManager *mManager; + QNetworkAccessManager *mDownloadManager; + + int mDownloadedAlbumArts; + + QList mReplys; + + QDomDocument mDomDocument; + + + QString mArtist; + QString mAlbum; + QString mTitle; + + QStringList mRecommendationAlbumArtsName; + + QStringList mRecommendationSongs; + QStringList mRecommendationArtists; + QStringList mRecommendationAlbumArtsLink; + QMap mRecommendationAlbumArtsMap; + int mAlbumArtsReadyCount; + + +}; +#endif /* MPQUERYMANAGER_H_ */ diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpsharedata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/inc/mpsharedata.h Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,58 @@ +#ifdef SHARE_FUNC_ENABLED + +#ifndef MPSHAREDATA_H +#define MPSHAREDATA_H + +#include +#include +#include + +class MpSongData; +class HbIcon; + +/*! + MpShareData represents the information that is + used for sharing purposes. This information includes + e.g. song information and user information. +*/ +class MpShareData : public QObject +{ + Q_OBJECT + +public: + MpShareData(); + virtual ~MpShareData(); + + void setOwner( QObject* aOwner ); + void setSongData( MpSongData* aSongData ); + void setErrorMessage( const QString& s ); + void setLanguage( const QString& s ); + +public slots: + QObject* owner() const; + MpSongData* songData() const; + QString errorMessage() const; + void setUsername( const QString& s ); + QString username() const; + void setPassword( const QString& s ); + QString password() const; + QString objectType() const; + QString objectContent() const; + int objectReservedLength() const; + QString language() const; + QString title() const; + QString album() const; + QString artist() const; + QString albumArtBase64() const; + +private: + QObject* mOwner; // NOT owned. + MpSongData* mSongData; // NOT owned. + QString mErrorMessage; + QString mUsername; + QString mPassword; + QString mLanguage; +}; + +#endif // MPSHAREDATA_H +#endif // SHARE_FUNC_ENABLED diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/inc/mpsongdata.h --- a/mpviewplugins/mpdetailsviewplugin/inc/mpsongdata.h Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Metadata of song for details view. -* -*/ - -#ifndef MPSONGDATA_H -#define MPSONGDATA_H - -#include -#include -#include - -//forward declartions -class QIcon; -class ThumbnailManager; - -//class declaration -class MpSongData : public QObject -{ - Q_OBJECT - -public: - explicit MpSongData( QObject *parent=0 ); - virtual ~MpSongData(); - - bool setTitle( const QString &title ); - bool setAlbum( const QString &album ); - bool setArtist( const QString &artist ); - bool setComment( const QString &comment ); - void setAlbumArtUri( const QString &albumArtUri ); - bool setYear( int date ); - bool setGenre( const QString &genre ); - bool setComposer( const QString &compoer ); - bool setAlbumTrack( const QString &albumtrack ); - void setLink( const QString &link ); - - // inform details view when basic information is ready to accelerate UI update - void commitPlaybackInfo(); - // inform details view when details information is ready - void commitSongDetailInfo(); - -public slots: - void thumbnailReady( const QPixmap& pixmap, void *data, int id, int error ); - - int reservedLength() const { return mLink.length() + mTitle.length() + mArtist.length(); } - - QString title() const; - QString album() const; - QString artist() const; - QString comment() const; - void albumArt( QPixmap& pixmap ); - QString year() const; - QString genre() const; - QString composer() const; - QString albumTrack() const; - QString link() const; - -signals: - void albumArtReady(); - void playbackInfoChanged(); - void songDetailInfoChanged(); - -private: - QString mTitle; - QString mAlbum; - QString mArtist; - QString mComment; - QString mComposer; - QString mGenre; - QString mYear; - QString mAlbumTrack; - QPixmap mAlbumArt; - ThumbnailManager *mThumbnailManager; //owned - TInt mReqId; - QString currentAAUri; - QPixmap mDefaultAlbumArt; - QString mLink; - - Q_DISABLE_COPY(MpSongData) -}; - -#endif // MPSONGDATA_H diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/mpdetailsviewplugin.pro --- a/mpviewplugins/mpdetailsviewplugin/mpdetailsviewplugin.pro Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/mpdetailsviewplugin.pro Fri May 14 18:54:37 2010 -0500 @@ -17,11 +17,12 @@ symbian:TARGET.UID3 = 0x2002D0AA TEMPLATE = lib -CONFIG += hb qt ecomplugin +CONFIG += hb qt ecomplugin mobility QT += webkit \ network \ xml TARGET = mpdetailsviewplugin +MOBILITY += bearer SERVICE.INTERFACE_NAME = org.nokia.mmdt.MpxViewPlugin/1.0 SERVICE.CONFIGURATION = "" @@ -35,24 +36,33 @@ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE LIBS += -lmpxviewframeworkqt.dll \ - -lmpxplaybackutility.dll \ + -lmpxplaybackutility.dll \ -lmpxcommon.dll \ - -lthumbnailmanagerqt.dll - -symbian:TARGET.EPOCALLOWDLLDATA = 1 + -lthumbnailmanagerqt.dll \ + -lmpsettingsmanager.dll \ + -lmpengine.dll \ + -lmpdata.dll + +symbian:TARGET.EPOCALLOWDLLDATA = 1 # Input SOURCES += src/mpdetailsviewplugin.cpp \ - src/mpdetailsview.cpp \ - src/mpmpxdetailsframeworkwrapper.cpp \ - src/mpmpxdetailsframeworkwrapper_p.cpp \ - src/mpsongdata.cpp + src/mpdetailsview.cpp \ + src/mpquerymanager.cpp HEADERS = ../../inc/mpviewbase.h \ - inc/mpdetailsviewplugin.h \ - inc/mpdetailsview.h \ - inc/mpmpxdetailsframeworkwrapper.h \ - inc/mpmpxdetailsframeworkwrapper_p.h \ - inc/mpsongdata.h - + inc/mpdetailsviewplugin.h \ + inc/mpdetailsview.h \ + inc//mpquerymanager.h + +# Sharing functionality +CONFIG(SHARE_FUNC_ENABLED) { + SOURCES += src/mpdetailssharedialog.cpp src/mpsharedata.cpp + HEADERS += inc/mpdetailssharedialog.h inc/mpsharedata.h + DEFINES += SHARE_FUNC_ENABLED + debug { + DEFINES += SHARE_PLAYER_RND + } +} + RESOURCES += resources/mpdetailsviewresources.qrc diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/defaultalbumart.png Binary file mpviewplugins/mpdetailsviewplugin/resources/defaultalbumart.png has changed diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/index.html Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,30 @@ + + + + + Publish + + + + + + + + + + + + + + + + + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/mpdetailsview.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/mpdetailsview.docml Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/mpdetailsviewresources.qrc --- a/mpviewplugins/mpdetailsviewplugin/resources/mpdetailsviewresources.qrc Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/resources/mpdetailsviewresources.qrc Fri May 14 18:54:37 2010 -0500 @@ -1,9 +1,13 @@ - - - detailsview.docml + + + mpdetailsview.docml - - - defaultalbumart.png + + qtg_large_music_album.svg + + + index.html + musiccontext.js + musiccontext.css diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/musiccontext.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/musiccontext.css Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,36 @@ +/* Info */ +ul.info-list { + /*padding-top:5px; + padding-bottom:5px;*/ +} + +ul.info-list li { + line-height: 32px; + padding: 2px 0; +} + +.info-list .description .artist { + padding-top:10px; + color:#ccc; +} + +.info-list .description .title { + +} + + +.info-list .description { + display:inline-block; + padding-left:20px; + vertical-align:top; + padding-top:10px; +} + + +ul.info-list li.music .icon { + display: inline-block; + width: 32px; + height: 32px; + padding-left: 36px; + background: transparent url(../images/CheckButton.png) left top no-repeat; +} diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/musiccontext.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/musiccontext.js Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,202 @@ +//Logging for QT + +// Override the default alert function. +alert = function(str) { + console.log(str); + if(window['context'] && context['owner']){ + context.owner().debugJs('alert: ' + str); + } + window.context.owner().errorHandler("Alert", str); +} + +function logme(str){ + console.log(str); + if(window['context'] && context['owner']){ + context.owner().debugJs('debugJs: ' + str); + } +} + +function traceme(){ + var cf = arguments.callee.caller; + logme('-------------- Start traceme ' + new Date().toLocaleTimeString() + ' --------------'); + var arr = new Array(); + while (cf) { + var fn = cf.toString(); + fn = fn.substr(0,fn.indexOf('{')); + arr.push(fn); + cf = cf.caller; + } + //arr.reverse(); + for(i=0;i<=arr.length -1;i++){ + logme(arr[i]); + } + logme('-------------- End traceme --------------'); +} + + +window["music"] = window["music"] || +{}; + +(function(){ + if (typeof window.context === 'undefined') { + window['context'] = { + token: "hipsu:hipsupass", + song: "Queen - Bohemian Rhapsody", + objectReservedLength: function(){return 70;}, + objectContent: function() { return "http://music.ovi.com/ru/ru/pc/Product/Queen/Bohemian-Rhapsody/8019069"; }, + objectType: function(){ return "URI"; }, + artist: function() { return "♫ Queen"; }, + title: function() { return "Bohemian Rhapsody"; }, + username: function() { return "hipsu"; }, + password: function() { return "hipsupass"; }, + albumArtBase64: function() { return "https://secure-profile.facebook.com/v227/1739/21/n100000756794479_1863.jpg"; }, + owner: function() { + return { + errorHandler: function(a,b) {}, + clearCache: function() {}, + debugJs: function(s) {} + } + } + } + }else{ + try { + logme(context.objectType() + ' | ' + window.context.objectContent() + ' | ' + window.context.objectReservedLength()); + }catch (e) { + logme(e); + } + } + + var musicContext = null; + var publishingPlayer = null; + + music.getPostContent = function(){ + traceme(); + return { + reservedLength : window.context.objectReservedLength(), + type : window.context.objectType(), + content : window.context.objectContent() + }; + } + + // Hard code something for the browser.. + + /** + * Check if player is loaded and call error function if not. + */ + music.playerLoaded = function() { + traceme(); + if (!_playerReady()) { + alert("Error loading player scripts"); + } + } + + /** + * Call this for player to show UI and initialize connection to SNC + */ + music.initPlayer = function() + { + traceme(); + // Initialize player + publishingPlayer = new ovi.player.publish.Player({ + locale : "en-US", + credentials : { + type : "", + sso_base_url : "", + token : _getNoa() + } + }); + + // Show UI + publishingPlayer.create(null, function(status, data){ + traceme(); + if (status != publishingPlayer.status.updateservices_ok && status != publishingPlayer.status.show_ok) { + // Delegate errors to native side + window.context.errorHandler(status, data.message); + } + }); + + } + + /** + * Call this for player to update context area (the song UI). + */ + music.updateContextArea = function() { + // Update artist and title metadata. + traceme(); + publishingPlayer.setContextObject(_getMusicContext()); + } + + /** + * Call this function to update metadata (called when music player has retrieved the link) + */ + music.updateMetadata = function() { + // Update url at bottom of comment field. + traceme(); + musicContext.updateObject(music.getPostContent()); + } + + /** + * Call this function to release all resources from player. + */ + music.teardown = function() { + traceme(); + publishingPlayer.cancel(); + } + + // Private functions, read data from native side.. + function _playerReady() { + traceme(); + return typeof ovi != "undefined" && + typeof ovi.player != "undefined" && + typeof ovi.player.publish != "undefinded"; + } + + + function _getMusicContext() { + traceme(); + musicContext = new ovi.player.contextobject.Player(); + + var attachment = music.getPostContent(); + + logme('music._getMusicContext() | attachment'); + + logme('music._getMusicContext() | musicContext.create'); + + var sharePlayerArtImage = ""; + var sharePlayerArtBase64 = window.context.albumArtBase64(); + if ( sharePlayerArtBase64.length > 0 ) { + // TODO: this is temporary solution until base64 defect in QT is fixed. + sharePlayerArtImage = "

"; +// sharePlayerArtImage = "

"; + } + // Create context object + musicContext.create({ + view: "none", + data: { + miniview: "

username: " + window.context.username() + "/" + window.context.password() + "

" + window.context.title() + "

" + + "

" + window.context.artist() + "

", + object: attachment + } + }); + return musicContext; + } + + function _getNoa() { + traceme(); + // temporary solution until SSO token get from QT SSO DE (now we fetch username, password and re-authenticate using api.ovi.com) + var token = (window.context.username)? [window.context.username(),window.context.password()] : window.context.token.split(":"); + logme(token[0] + "/" + token[1]); + return { + username: token[0], + password: token[1] + } + } +})(); diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/ovicredentials.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/ovicredentials.txt Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,1 @@ +hipsu:hipsupass diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/resources/qtg_large_music_album.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/resources/qtg_large_music_album.svg Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,101 @@ + + + \ No newline at end of file diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/src/mpdetailssharedialog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/src/mpdetailssharedialog.cpp Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,324 @@ +#ifdef SHARE_FUNC_ENABLED + +#include "mpdetailssharedialog.h" +#include "mpsharedata.h" +#include "mpsongdata.h" +#include "mptrace.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +// SHARE_INDEX_FILE defines where the index.html file is loaded from. +#define SHARE_INDEX_URL "qrc:///shareview/index.html" + +#ifdef Q_OS_SYMBIAN +// Symbian target. +#ifdef SHARE_PLAYER_RND +// For R&D testing, index.html may be loaded from E: drive. +// User must manually place index.html in the correct location. +// If the RND file does not exist, then SHARE_INDEX_URL will be used. +#define RND_SHARE_INDEX_URL "file:///e:/index.html" +#define RND_SHARE_INDEX_FILE "e:\\index.html" +#define RND_OVI_LOGIN_FILE "e:\\ovicredentials.txt" +#define RND_DEFAULT_USER "hipsu" +#define RND_DEFAULT_PASS "hipsupass" +#endif +#else +// Assume Windows target. +#define RND_SHARE_INDEX_URL "file:///c:/temp/index.html" +#define RND_SHARE_INDEX_FILE "c:\\temp\\index.html" +#define RND_OVI_LOGIN_FILE "c:\\temp\\ovicredentials.txt" + +#endif + +// For allowing local caching of javascript files loaded by popup +class MpNetworkAccessManager : public QNetworkAccessManager +{ +public: + MpNetworkAccessManager() { }; + +private: + QNetworkReply *createRequest( Operation op, + const QNetworkRequest &request, + QIODevice *outgoingData = 0 ) + { + TX_ENTRY + QVariant val = request.attribute( QNetworkRequest::CacheLoadControlAttribute ); + qDebug() << "request cachecontrol - " << val.typeName() << val.toInt(); + + // Change the cache load control attrbute! + QNetworkRequest req = request; + req.setAttribute( QNetworkRequest::CacheLoadControlAttribute, + QVariant( QNetworkRequest::PreferCache ) ); // was PreferNetwork + TX_EXIT + return QNetworkAccessManager::createRequest( op, req, outgoingData ); + } +}; + + +/*! + Constructor. + */ +MpDetailsShareDialog::MpDetailsShareDialog() + : mShareWebView( 0 ), + mShareNetAccMan( 0 ) +{ +} + +void MpDetailsShareDialog::initialize( MpSongData* aSongData ) +{ + TX_ENTRY + if ( !initUser() ) + { + emit closeShareDialog(); + return; + } + initShareData( aSongData ); + initNetworkAccessManager(); + initWebView(); + initSignalSlots(); + + setDismissPolicy( HbDialog::NoDismiss ); + + // No timeout needed for the dialog. + setTimeout( HbPopup::NoTimeout ); + +#ifdef SHARE_PLAYER_RND + // Test whether the RND file exists. + QFile file( RND_SHARE_INDEX_FILE ); + if ( file.exists() ) + { + // Load the RND URL from the specified location to the web view. + TX_LOG_ARGS( "share: Use RND index.html file " << RND_SHARE_INDEX_FILE ) + mShareWebView->load( QUrl( RND_SHARE_INDEX_URL ) ); + } + else +#endif + { + // Load the production URL from the application resources to the web view. + TX_LOG_ARGS( "share: Use QRC index.html file " << SHARE_INDEX_URL ) + mShareWebView->load( QUrl( SHARE_INDEX_URL ) ); + } + TX_EXIT +} + + +/*! + Destructor. + */ +MpDetailsShareDialog::~MpDetailsShareDialog() +{ + TX_ENTRY + logoutPlayer(); + delete mShareNetAccMan; + TX_EXIT +} + +void MpDetailsShareDialog::initShareData( MpSongData* aSongData ) +{ + TX_ENTRY + // Set information for the share data. + mShareData.setOwner( this ); + mShareData.setSongData( aSongData ); + // TODO need localized error message. + mShareData.setErrorMessage( "An error occured. Sharing is not currently available" ); + // TODO need language setting. + mShareData.setLanguage( "en" ); + TX_EXIT +} + +void MpDetailsShareDialog::initNetworkAccessManager() +{ + TX_ENTRY + // Make our own network access manager to allow JS retrieval from local cache, + // since configuration for the default network access manager seems to be + // to always redownload from network. + mShareNetAccMan = new MpNetworkAccessManager(); + mShareNetAccMan->proxyFactory()->setUseSystemConfiguration( true ); + QNetworkDiskCache* diskCache = new QNetworkDiskCache( this ); + QString location = QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); + diskCache->setCacheDirectory( location ); + mShareNetAccMan->setCache( diskCache ); + TX_EXIT +} + +void MpDetailsShareDialog::initWebView() +{ + TX_ENTRY + mShareWebView = new QGraphicsWebView(); + mShareWebView->settings()->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true ); + mShareWebView->settings()->setAttribute( QWebSettings::LocalStorageDatabaseEnabled, true ); + mShareWebView->settings()->enablePersistentStorage(); + mShareWebView->page()->setNetworkAccessManager( mShareNetAccMan ); + setContentWidget( mShareWebView ); + TX_EXIT +} + +void MpDetailsShareDialog::initSignalSlots() +{ + TX_ENTRY + // Connect various signals to slots for interface to webview. + connect( mShareWebView, SIGNAL( loadFinished( bool ) ), SLOT( onIndexLoad( bool ) ) ); + connect( mShareWebView->page()->mainFrame(), SIGNAL( javaScriptWindowObjectCleared() ), this, SLOT( addContext() ) ); + connect( mShareWebView->page(), SIGNAL( windowCloseRequested() ), this, SIGNAL( closeShareDialog() ) ); + TX_EXIT +} + +/*! + initUser is used as temporary solution until Single Sign On is implemented in platform. + */ +bool MpDetailsShareDialog::initUser() +{ + TX_ENTRY + bool result = false; +#ifdef SHARE_PLAYER_RND + // ovicredentials.txt is used as temporary solution until Single Sign On is implemented in platform. + QFile file( RND_OVI_LOGIN_FILE ); + if ( !file.open( QFile::ReadOnly ) ) + { +// errorHandler( "share", QString( RND_OVI_LOGIN_FILE ) + " missing" ); + mShareData.setUsername( RND_DEFAULT_USER ); + mShareData.setPassword( RND_DEFAULT_PASS ); + result = true; + } + else + { + QTextStream stream ( &file ); + QString strCred = stream.readLine( 0 ); + file.close(); + QStringList slCred = strCred.split( ":" ); + if ( slCred.length() > 1 ) + { + mShareData.setUsername( slCred[ 0 ] ); + mShareData.setPassword( slCred[ 1 ] ); + result = true; + } + else + { + errorHandler( "share", QString( RND_OVI_LOGIN_FILE ) + " username:password expected" ); + } + } + TX_LOG_ARGS( "share: credentials " << mShareData.username() << " / " << mShareData.password() ) +#else + // TODO: Single Sign On stuff. +#endif // SHARE_PLAYER_RND + TX_EXIT + return result; +} + +/*! + Release resources from share player. + */ +void MpDetailsShareDialog::logoutPlayer() +{ + TX_ENTRY + if (mShareWebView) + { + mShareWebView->page()->mainFrame()->evaluateJavaScript( "music.teardown();" ); + } + TX_EXIT +} + +/*! + Adds the shared data context to the javascript of the loaded page. + */ +void MpDetailsShareDialog::addContext() +{ + TX_ENTRY + if (mShareWebView) + { + mShareWebView->page()->mainFrame()->addToJavaScriptWindowObject( "context", &mShareData ); + } + TX_EXIT +} + +/*! + Updates the shared data context in the javascript of the loaded page. + */ +void MpDetailsShareDialog::updateSharedData() +{ + TX_ENTRY + if (mShareWebView) + { + mShareWebView->page()->mainFrame()->evaluateJavaScript( "music.updateContextArea();" ); + mShareWebView->page()->mainFrame()->evaluateJavaScript( "music.updateMetadata();" ); + } + TX_EXIT +} + +/*! + Slot to call when index.html loading completes. + */ +void MpDetailsShareDialog::onIndexLoad( bool aOk ) +{ + TX_ENTRY + if ( !aOk ) + { + // Close the popup window, failed to load index.html. + // This is pretty serious and most likely unrecoverable error. + // Only thing we can do really is to close the share player + // dialog - TODO do we need to show any error message to user? + TX_LOG_ARGS( "share: failed to load index.html" ) + emit closeShareDialog(); + } + TX_EXIT +} + +/*! + Slot to call for debug output. + */ +void MpDetailsShareDialog::debugJs( QString s ) +{ + TX_ENTRY + TX_LOG_ARGS( "share: debugJs: " << s ) + TX_EXIT +} + +/*! + Slot to call for displaying an error message to the user. + */ +void MpDetailsShareDialog::errorHandler( QString error, QString message ) +{ + TX_ENTRY + TX_LOG_ARGS( "share: errorHandler: " << error << ": " << message ) + HbMessageBox::warning( error + ": " + message ); // For week16 hbwidgets +// HbMessageBox::launchWarningMessageBox( error + ": " + message ); // For week12 hbwidgets + TX_EXIT +} + +/*! + Slot to call to clear the web view cache. + */ +void MpDetailsShareDialog::clearCache() +{ + TX_ENTRY + QAbstractNetworkCache* cache = mShareNetAccMan ? mShareNetAccMan->cache() : NULL; + if ( cache ) + { + TX_LOG_ARGS( "share: clearCache: clearing cache" ) + cache->clear(); +#ifdef SHARE_PLAYER_RND + errorHandler( "Cache", "Cleared cache!" ); +#endif + } + else + { + TX_LOG_ARGS( "share: clearCache: unable to clear cache" ) +#ifdef SHARE_PLAYER_RND + errorHandler( "Cache", "Could not clear cache!" ); +#endif + } + TX_EXIT +} + +#endif // SHARE_FUNC_ENABLED diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/src/mpdetailsview.cpp --- a/mpviewplugins/mpdetailsviewplugin/src/mpdetailsview.cpp Fri Apr 30 19:33:32 2010 -0500 +++ b/mpviewplugins/mpdetailsviewplugin/src/mpdetailsview.cpp Fri May 14 18:54:37 2010 -0500 @@ -14,20 +14,17 @@ * Description: Music Player details view. * */ -#include -#include +#include #include #include #include -#include #include -#include -#include #include #include #include #include #include +#include #include #include @@ -45,76 +42,118 @@ #include #include #include +#include +#include #include "mpdetailsview.h" +#include "mpenginefactory.h" #include "mpcommondefs.h" -#include "mpmpxdetailsframeworkwrapper.h" #include "mpsongdata.h" +#include "mpsettingsmanager.h" +#include "mpquerymanager.h" #include "mptrace.h" +#ifdef SHARE_FUNC_ENABLED +#include "mpdetailssharedialog.h" +#endif + const int KUndefined = -1; -const int KRecommendationNum = 2; +const int KRecommendationCount = 2; + /*! Constructor */ MpDetailsView::MpDetailsView() - : mSongData( 0 ), - mFrameworkWrapper( 0 ), + : mMpEngine( 0 ), + mSongData( 0 ), mActivated( false ), mWindow( 0 ), - mNavigationBack( 0 ), + mSoftKeyBack( 0 ), mSongText( NULL ), mAlbumText( NULL ), mArtistText( NULL ), mAlbumArt( NULL ), mDocumentLoader( NULL ), mDownloadedAlbumArts( 0 ), - mAlbumArtsReadyCount( 0 ), mMpTranslator( 0 ), - mCommonTranslator( 0 ) + mCommonTranslator( 0 ), + mMpQueryManager( 0 ), + mInspireMeQueryOngoing( false ), + mInspireMeQueryRendered( false ), + mInspireMeOpen(true), + mSongDetailsGbOpen(false) +#ifdef SHARE_FUNC_ENABLED + , mSharePopup( 0 ) +#endif { TX_ENTRY bool widgetsOk = false; HbMainWindow *mainWindow = hbInstance->allMainWindows()[0]; mDocumentLoader = new HbDocumentLoader(); + + TX_LOG_ARGS("Document loader created") + if(!mDocumentLoader) { + TX_LOG_ARGS( "MpDetailsView() Error: HbDocumentLoader not constructed" ); + return; + } - if ( mDocumentLoader ) { - mDocumentLoader->load( QString(":/detailsviewdocml/detailsview.docml"), &widgetsOk ); - } - if ( widgetsOk ) { - QGraphicsWidget *widget; + TX_LOG_ARGS("Loading :/mpdetailsviewdocml/mpdetailsview.docml") + mDocumentLoader->load( QString(":/mpdetailsviewdocml/mpdetailsview.docml"), &widgetsOk ); + if(!widgetsOk) { + TX_LOG_ARGS( "MpDetailsView() Error: invalid mpdetailsview.docml" ); + return; + } + + TX_LOG_ARGS("Loaded :/mpdetailsviewdocml/mpdetailsview.docml") + QGraphicsWidget *widget = 0; - widget = mDocumentLoader->findWidget( QString("content") ); - mContainer = qobject_cast(widget); - if ( mContainer ) { - setWidget( mContainer ); - } - - widget = mDocumentLoader->findWidget( QString("shareButton") ); - mShareButton = qobject_cast(widget); - - widget = mDocumentLoader->findWidget( QString("songText") ); - mSongText = qobject_cast(widget); + widget = mDocumentLoader->findWidget( QString("content") ); + TX_LOG_ARGS( "MpDetailsView() mDocumentLoader->findWidget for : " << (int)(widget) ); + mContainer = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mContainer: " << (int)(mContainer)); + setWidget( mContainer ); + + widget = mDocumentLoader->findWidget( QString("shareButton") ); + mShareButton = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mShareButton: " << (int)(mShareButton) ); + + widget = mDocumentLoader->findWidget( QString("trackTitle") ); + mSongText = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mSongText: " << (int)(mSongText) ); - widget = mDocumentLoader->findWidget( QString("artistText") ); - mArtistText = qobject_cast(widget); + widget = mDocumentLoader->findWidget( QString("artist") ); + mArtistText = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mArtistText: " << (int)(mArtistText) ); + + widget = mDocumentLoader->findWidget( QString("albumName") ); + mAlbumText = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mAlbumText: " << (int)(mAlbumText) ); + + widget = mDocumentLoader->findWidget( QString("albumArt") ); + mAlbumArt = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mAlbumArt: " << (int)(mAlbumArt) ); - widget = mDocumentLoader->findWidget( QString("albumText") ); - mAlbumText = qobject_cast(widget); + widget = mDocumentLoader->findWidget( QString("songDetails") ); + mSongDetailsGroupBox = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mSongDetailsGroupBox: " << (int)(mSongDetailsGroupBox) ); + + widget = mDocumentLoader->findWidget( QString("songDetailsListWidget") ); + mDetailList = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mDetailList: " << (int)(mDetailList) ); + + widget = mDocumentLoader->findWidget( QString("inspireMeGroupBox") ); + mInspireMeGroupBox = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mInspireMeGroupBox: " << (int)(mInspireMeGroupBox) ); - widget = mDocumentLoader->findWidget( QString("albumArt") ); - mAlbumArt = qobject_cast(widget); + widget = mDocumentLoader->findWidget( QString("inspireListWidget") ); + mInspireList = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mInspireList: " << (int)(mInspireList) ); - widget = mDocumentLoader->findWidget( QString("songDetailsGroupBox") ); - mSongDetailsGroupBox = qobject_cast(widget); - - widget = mDocumentLoader->findWidget( QString("inspireMeGroupBox") ); - mInspireMeGroupBox = qobject_cast(widget); - } - else { - TX_LOG_ARGS( "Error: invalid detailsview.docml" ); - } + widget = mDocumentLoader->findWidget( QString("inspireMeProgressBar") ); + mInspireMeProgressBar = qobject_cast(widget); + TX_LOG_ARGS("MpDetailsView() widget found mInspireMeProgressBar: " << (int)(mInspireMeProgressBar) ); + TX_EXIT } @@ -124,29 +163,26 @@ MpDetailsView::~MpDetailsView() { TX_ENTRY - if ( mFrameworkWrapper ) { - delete mFrameworkWrapper; - } - if ( mNavigationBack ) { - delete mNavigationBack; + if ( mSoftKeyBack ) { + delete mSoftKeyBack; } if ( mDocumentLoader ) { delete mDocumentLoader; } - if ( mManager ) { - mManager->deleteLater(); - } - if ( mDownloadManager ) { - mDownloadManager->deleteLater(); - } if( mThumbnailManager ) { delete mThumbnailManager; } delete mMpTranslator; delete mCommonTranslator; + delete mMpQueryManager; + +#ifdef SHARE_FUNC_ENABLED + closeShareDialog(); +#endif TX_EXIT } + /*! Initializes the details view. Allocates all resources needed by the view. */ @@ -155,71 +191,65 @@ 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 ); - } + QString lang = QLocale::system().name(); + QString path = QString( "z:/resource/qt/translations/" ); + bool translatorLoaded = false; - mCommonTranslator = new QTranslator( this ); - translatorLoaded = mCommonTranslator->load( path + "common_" + lang ); - TX_LOG_ARGS( "Loading common translator ok=" << translatorLoaded ); - if ( translatorLoaded ) { - qApp->installTranslator( mCommonTranslator ); - } + mCommonTranslator = new QTranslator( this ); + translatorLoaded = mCommonTranslator->load( path + "common_" + lang ); + TX_LOG_ARGS( "Loading common translator ok=" << translatorLoaded ); + if ( translatorLoaded ) { + qApp->installTranslator( mCommonTranslator ); + } + + mMpTranslator = new QTranslator( this ); + translatorLoaded = mMpTranslator->load( path + "musicplayer_" + lang ); + TX_LOG_ARGS( "Loading translator ok=" << translatorLoaded ); + if ( translatorLoaded ) { + qApp->installTranslator( mMpTranslator ); + } - mWindow = mainWindow(); - mNavigationBack = new HbAction( Hb::BackNaviAction, this ); - mFrameworkWrapper = new MpMpxDetailsFrameworkWrapper( ); - mSongData = mFrameworkWrapper->songData(); + // TODO: Hkn: Remove this once ELCE-844GBS is fixed + mInspireMeProgressBar->hide(); - mCompositePixmap = QPixmap( 150, 150 ); + mWindow = mainWindow(); + mSoftKeyBack = new HbAction( Hb::BackNaviAction, this ); + + mMpEngine = MpEngineFactory::sharedEngine(); + mSongData = mMpEngine->songData(); - mDetailList = new HbListWidget( mSongDetailsGroupBox ); - mButton = new HbPushButton( tr( "More recommendations" ) ); - mSongDetailsGroupBox->setCollapsable( true ); - mSongDetailsGroupBox->setHeading( tr("Song details") ); - mSongDetailsGroupBox->setContentWidget( mDetailList ); - mSongDetailsGroupBox->setCollapsed( true ); - - mLayout = new QGraphicsLinearLayout( Qt::Vertical ); - mInspireMe = new HbWidget( mInspireMeGroupBox ); - mInspireList = new HbListWidget(); - mInspireMeGroupBox->setCollapsable( true ); - mInspireMeGroupBox->setHeading( tr("Inspire me") ); - mInspireMeGroupBox->setContentWidget( mInspireMe ); + // TODO: Remove this once Orbit bug ELCE-843HFJ is fixed + mInspireList->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff); - - mManager = new QNetworkAccessManager( this ); - connect( mManager, SIGNAL( finished( QNetworkReply * ) ), this, SLOT( retrieveInformationFinished( QNetworkReply * ) ) ); - mDownloadManager = new QNetworkAccessManager( this ); - connect( mDownloadManager, SIGNAL( finished( QNetworkReply * ) ), this, SLOT( DownloadFinished( QNetworkReply * ) ) ); - - mRecommendationAlbumArtsName << "C:\\Data\\albumOne.png" << "C:\\Data\\albumTwo.png"; + mThumbnailManager = new ThumbnailManager( this ); mThumbnailManager->setQualityPreference( ThumbnailManager::OptimizeForQuality ); mThumbnailManager->setThumbnailSize( ThumbnailManager::ThumbnailSmall ); QObject::connect( mThumbnailManager, SIGNAL( thumbnailReady( QPixmap , void * , int , int ) ), this, SLOT( thumbnailReady( QPixmap , void * , int , int ) ) ); - mDefaultRecommendationAlbumArt = QPixmap( ":/detailsviewicons/defaultalbumart.png" ); + // TODO: Use the album art in provided by 10.1 wk16 platform. Current one is in the binary + mDefaultRecommendationAlbumArt = QPixmap( ":/mpdetailsviewicons/qtg_large_music_album.svg" ); // TODO: might need later setupMenu(); + mMpQueryManager = new MpQueryManager(); - connect( mNavigationBack, SIGNAL( triggered() ), this, SLOT( back() ) ); - connect( mShareButton, SIGNAL( clicked() ), this, SLOT( share() ) ); + connect( mSoftKeyBack, SIGNAL( triggered() ), this, SLOT( back() ) ); connect( mSongData, SIGNAL( albumArtReady() ), this, SLOT( albumArtChanged() ) ); - connect( mSongData, SIGNAL( playbackInfoChanged() ), this, SLOT( playbackInfoChanged() ) ); + connect( mSongData, SIGNAL( playbackInfoChanged() ), this, SLOT( handlePlaybackInfoChanged() ) ); connect( mSongData, SIGNAL( songDetailInfoChanged() ), this, SLOT( songDetailInfoChanged() ) ); - connect( mSongDetailsGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( toggleInspireMeGroupBox( bool ) ) ); - connect( mInspireMeGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( toggleDetailsGroupBox( bool ) ) ); + connect( mMpQueryManager, SIGNAL( networkError() ), this ,SLOT( handleNetworkError() ) ); + connect( mMpQueryManager, SIGNAL(setAlbumArt(const QString &, const QString &) ), this ,SLOT(setAlbumArtUri(const QString &, const QString & ))); + connect( mMpQueryManager, SIGNAL(searchUrlRetrieved(const QString&)), this, SLOT(updateSharedData(const QString&))); + +#ifdef SHARE_FUNC_ENABLED + connect( mShareButton, SIGNAL( clicked() ), this, SLOT( share() ) ); + + // Preload the share popup + createShareDialog(); +#endif TX_EXIT } @@ -229,10 +259,20 @@ void MpDetailsView::activateView() { TX_ENTRY - setNavigationAction( mNavigationBack ); - mFrameworkWrapper->retrieveSong(); + setNavigationAction( mSoftKeyBack ); + mMpEngine->retrieveSong(); mActivated = true; + mInspireMeOpen = MpSettingsManager::inspireMe(); + mSongDetailsGbOpen = MpSettingsManager::songDetailsGb(); + TX_LOG_ARGS( "InspireMeVal: " << mInspireMeOpen ); + TX_LOG_ARGS( "SongDetailsGbVal: " << mSongDetailsGbOpen ); + mInspireMeGroupBox->setCollapsed(!mInspireMeOpen); + mSongDetailsGroupBox->setCollapsed(!mSongDetailsGbOpen); + + connect( mSongDetailsGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( handleDetailsGroupBoxToggled( bool ) ) ); + connect( mInspireMeGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( handleInspireMeGroupBoxToggled( bool ) ) ); + TX_EXIT } @@ -242,8 +282,24 @@ void MpDetailsView::deactivateView() { TX_ENTRY + if (mInspireMeGroupBox->isCollapsed() ) { + MpSettingsManager::setInspireMe(false); + } else { + MpSettingsManager::setInspireMe(true); + } + + if (mSongDetailsGroupBox->isCollapsed() ) { + MpSettingsManager::setSongDetailsGb(false); + } else { + MpSettingsManager::setSongDetailsGb(true); + } + setNavigationAction( 0 ); mActivated = false; + + disconnect( mSongDetailsGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( handleDetailsGroupBoxToggled( bool ) ) ); + disconnect( mInspireMeGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( handleInspireMeGroupBoxToggled( bool ) ) ); + TX_EXIT } @@ -259,8 +315,6 @@ /*! Slot to handle back command from softkey. - - \reimp */ void MpDetailsView::back() { @@ -270,163 +324,27 @@ } /*! - Slot to be called when share button is clicked - */ -void MpDetailsView::share() -{ - TX_ENTRY - TX_EXIT -} - -/*! Slot to handle Album art changed. */ void MpDetailsView::albumArtChanged( ) { TX_ENTRY - QPixmap pixmap; - QIcon qicon; - mSongData->albumArt( pixmap ); - composeAlbumCover( pixmap ); - if ( !mCompositePixmap.isNull() ) - qicon = QIcon( mCompositePixmap ); - else - qicon = QIcon( pixmap ); - HbIcon icon( qicon ); + HbIcon icon; + mSongData->albumArt( icon ); mAlbumArt->setIcon( icon ); TX_EXIT } -void MpDetailsView::loadSharePlayer() -{ - TX_ENTRY - TX_EXIT -} - - -/*! - Slot to call when widget is loaded - */ -void MpDetailsView::webViewLoaded( bool ok ) -{ - TX_ENTRY - if ( ok ) { - TX_LOG_ARGS( "Loading web page successfully." ); - - } else { - TX_LOG_ARGS( "Loading web page failed!" ); - } - TX_EXIT -} - - -/*! - Compose the album art. - */ -void MpDetailsView::composeAlbumCover( QPixmap albumart ) -{ - TX_ENTRY - mCompositePixmap.fill( Qt::transparent ); - QPainter painter( &mCompositePixmap ); - painter.setCompositionMode( QPainter::CompositionMode_Clear ); - painter.setCompositionMode( QPainter::CompositionMode_SourceOver ); - painter.fillRect( mCompositePixmap.rect(), Qt::transparent ); - painter.drawPixmap( QRect( 0, 0, 150, 150 ), albumart ); - TX_EXIT -} - /*! - Make a key & value pair string for querying + Slot to handle network error. */ -QString MpDetailsView::keyValues( QStringList keys, QStringList values ) const -{ - TX_ENTRY - QString str; - if ( keys.length() != values.length() ) { - TX_LOG_ARGS( "Error: keys length is not equal to values length" ); - } else { - for ( int i = 0; i < keys.length(); i++ ) { - QString tValue = values.at( i ); - if ( 0 != tValue.length() ) - { - str += keys.at( i ) + "=" + values.at( i ) + "&"; - } - } - } - TX_EXIT - return str.left( str.length() - 1 ); -} - -/*! - Find the most suitable link based on Atom response from Ovi music server - */ -void MpDetailsView::handleParsedXML() +void MpDetailsView::handleNetworkError() { TX_ENTRY - QDomElement rootElement = mDomDocument.documentElement(); - - if ( rootElement.attribute( "type" ) == tr( "search" ) ) { - TX_LOG_ARGS( "URI response" ) - QString result; - QDomElement entry = rootElement.firstChildElement( "entry" ); - while ( !entry.isNull() ) - { - if ( entry.attribute( "type" ) == tr( "musictrack" ) ) { - QDomElement link = entry.firstChildElement( "link" ); - while ( !link.isNull() ) - { - if ( link.attribute( "rel" ) == tr( "alternate" ) - && link.attribute( "type" ) == tr( "text/html" ) ) { - result = link.attribute( "href" ); - } - link = link.nextSiblingElement( "link" ); - } - } - entry = entry.nextSiblingElement( "entry" ); - } - - mSongData->setLink( result ); - } else if ( rootElement.attribute( "type" ) == tr( "recommendedTracks" ) ) { - TX_LOG_ARGS( "Recommendation response" ) - QDomElement entry = rootElement.firstChildElement( "entry" ); - QNetworkReply *reply; - int count = 0; - while ( !entry.isNull() && count < KRecommendationNum ) - { - if ( entry.attribute( "type" ) == tr( "musictrack" ) ) { - QDomElement link = entry.firstChildElement( "link" ); - while ( !link.isNull() ) - { - if ( link.attribute( "title" ) == tr( "albumart100" ) ) { - mRecommendationAlbumArtsLink.append( link.attribute( "href" ) ); - break; - } else { - link = link.nextSiblingElement( "link" ); - } - } - QDomElement metadata = entry.firstChildElement( "metadata" ); - mRecommendationSongs.append( metadata.firstChildElement( "name" ).text() ); - mRecommendationArtists.append( metadata.firstChildElement( "primaryartist" ).text() ); - count++; - } - entry = entry.nextSiblingElement( "entry" ); - } - - for (int i = 0; i < KRecommendationNum; i++ ) { - TX_LOG_ARGS( "song name: " << mRecommendationSongs.at(i) ); - TX_LOG_ARGS( "Artist name: " << mRecommendationArtists.at(i) ); - TX_LOG_ARGS( "Album art link: " << mRecommendationAlbumArtsLink.at(i) ); - - if ( mRecommendationAlbumArtsLink.at( i ).contains( "http", Qt::CaseInsensitive ) ) { - reply = mDownloadManager->get( QNetworkRequest( QUrl( mRecommendationAlbumArtsLink.at(i) ) ) ); - mReplys.append( reply ); - connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( retrieveInformationNetworkError( QNetworkReply::NetworkError ) ) ); - connect( reply, SIGNAL( sslErrors( QList ) ), this, SLOT( retrieveInformationSslErrors( QList ) ) ); - } - } - } else { - TX_LOG_ARGS( "Not supported response" ) - } + mInspireMeQueryOngoing = false; + mInspireMeQueryRendered = false; + clearInspireMe(); + mInspireMeGroupBox->setCollapsed( true ); TX_EXIT } @@ -437,17 +355,17 @@ { TX_ENTRY_ARGS( "albumArtUri = " << albumArtUri ) TX_LOG_ARGS( "albumArtName = " << albumArtName ) - if ( !albumArtUri.isEmpty() ) { + if ( !albumArtUri.isEmpty() && !albumArtName.isEmpty() ) { int id = mThumbnailManager->getThumbnail( albumArtName, reinterpret_cast( const_cast( &albumArtUri ) ) ); if ( id == KUndefined ) { // Request failed. Set default album art. - mRecommendationAlbumArtsMap.insert( albumArtUri, mDefaultRecommendationAlbumArt ); + mMpQueryManager->insertMapItem( albumArtUri, mDefaultRecommendationAlbumArt ); recommendationAlbumArtReady(); } } else { // No album art uri. Set default album art. - mRecommendationAlbumArtsMap.insert( albumArtUri, mDefaultRecommendationAlbumArt ); + mMpQueryManager->insertMapItem( albumArtUri, mDefaultRecommendationAlbumArt ); recommendationAlbumArtReady(); } TX_EXIT @@ -459,102 +377,130 @@ void MpDetailsView::RenderInspireMeGroupBox() { TX_ENTRY - for ( int i = 0; i < KRecommendationNum; i++ ) { - HbListWidgetItem *item = new HbListWidgetItem(); - HbIcon icon( QIcon( mRecommendationAlbumArtsMap.value( mRecommendationAlbumArtsLink.at( i ) ) ) ); - item->setIcon( icon ); - item->setText( mRecommendationSongs.at( i ) ); - item->setSecondaryText( mRecommendationArtists.at( i ) ); - - mInspireList->addItem( item ); + mInspireMeQueryOngoing = false; + mInspireMeQueryRendered = true; + mInspireMeProgressBar->hide(); + if( mMpQueryManager->recommendationAlbumArtsMap().count() ) { + TX_LOG_ARGS( "There are recommendations." ) + // we have recommendations + for ( int i = 0; i < KRecommendationCount; i++ ) { + // configure the layout properties + if(!mInspireList->count()) { + // we havent configured the prototype before + HbListViewItem *prototype = mInspireList->listItemPrototype(); + prototype->setGraphicsSize( HbListViewItem::LargeIcon ); + } + // create the item + HbListWidgetItem *inspireMeItem = new HbListWidgetItem(); + HbIcon icon( QIcon( mMpQueryManager->recommendationAlbumArtsMap().value(mMpQueryManager->recommendationAlbumArtsLink().at( i ) ) ) ); + inspireMeItem->setIcon( icon ); + inspireMeItem->setText( mMpQueryManager->recommendationSongs().at( i ) ); + inspireMeItem->setSecondaryText( mMpQueryManager->recommendationArtists().at( i ) ); + mInspireList->addItem( inspireMeItem ); + } } - - // TODO: HbListWidget has some problem to return the correct height, hard code to 180 for now. - TX_LOG_ARGS( "height = " << mInspireList->geometry().height() ); - TX_LOG_ARGS( "height2 = " << mInspireList->size().height() ); - mInspireList->setMinimumHeight( 180 ); - mInspireList->setMaximumHeight( 180 ); - - mLayout->addItem( mInspireList ); - mButton->show(); - mLayout->addItem( mButton ); - mInspireMe->setLayout( mLayout ); + else { + TX_LOG_ARGS( "There is NO recommendation." ) + // we dont have recommendations + // we havent configured the prototype before + HbListViewItem *prototype = mInspireList->listItemPrototype(); + const int maxTextRowCount = 20; + const int minTextRowCount = 1; + prototype->setSecondaryTextRowCount(minTextRowCount,maxTextRowCount); + + HbListWidgetItem *inspireMeItem = new HbListWidgetItem(); + QString info(tr("There are no recommendations for this track, but you can always discover new music on Ovi")); + inspireMeItem->setText( QString( " " ) ); + inspireMeItem->setSecondaryText( info ); + mInspireList->addItem( inspireMeItem ); + } TX_EXIT } void MpDetailsView::recommendationAlbumArtReady() { - TX_ENTRY_ARGS( "mAlbumArtsReadyCount = " << mAlbumArtsReadyCount ) - mAlbumArtsReadyCount++; - if ( mAlbumArtsReadyCount == KRecommendationNum ) { + TX_ENTRY_ARGS( "mAlbumArtsReadyCount = " << mMpQueryManager->albumArtsReadyCount() ) + ( mMpQueryManager->albumArtsReadyCount() )++; + if ( mMpQueryManager->albumArtsReadyCount() == KRecommendationCount ) { RenderInspireMeGroupBox(); } TX_EXIT } +bool MpDetailsView::canQueryRecommendations() const +{ + bool result = ( ( !mSongData->album().isEmpty() ) || + ( !mSongData->artist().isEmpty() ) ) && + !( mInspireMeGroupBox->isCollapsed() ); + TX_LOG_ARGS( "Can query recommendations:" << result ); + return result; +} + +bool MpDetailsView::canQuerySharePlayerLink() const +{ + bool result = ( !mSongData->title().isEmpty() ) && + ( !mSongData->artist().isEmpty() ) ; + TX_LOG_ARGS( "Can query share player link:" << result ); + return result; +} + /*! Slot to handle basic song information */ -void MpDetailsView::playbackInfoChanged() +void MpDetailsView::handlePlaybackInfoChanged() { TX_ENTRY - mSongText->setPlainText( mSongData->title() ); - mAlbumText->setPlainText( mSongData->album() ); - mArtistText->setPlainText( mSongData->artist() ); + mMpQueryManager->clearNetworkReplies(); + clearInspireMe(); + mInspireMeQueryRendered = false; + + if ( !mSongData->title().isEmpty () ) { + mSongText->setPlainText( mSongData->title() ); + } else { + mSongText->setPlainText( mSongData->fileName() ); + } - // Clear information & Remove album arts downloaded previously when song changes - TX_LOG_ARGS( "Reply count = " << mReplys.count() ); - for ( int i = 0; i < mReplys.count(); i++ ) { - QNetworkReply *reply = mReplys.at( i ); - if ( reply != NULL ) { - TX_LOG_ARGS( "Reply index : " << i ); - reply->close(); - delete reply; - reply = NULL; - } + if ( !mSongData->album().isEmpty () ) { + mAlbumText->setPlainText( mSongData->album() ); + } else { + mAlbumText->setPlainText( tr( "Unknown ") ); } - mReplys.clear(); - mDownloadedAlbumArts = 0; - mAlbumArtsReadyCount = 0; - mInspireList->clear(); - for ( int i = 0; i < KRecommendationNum; i++) { - mRecommendationSongs.clear(); - mRecommendationArtists.clear(); - mRecommendationAlbumArtsLink.clear(); - mRecommendationAlbumArtsMap.clear(); + if ( !mSongData->artist().isEmpty() ) { + mArtistText->setPlainText( mSongData->artist() ); + } else { + mArtistText->setPlainText( tr( "Unknown ") ); + } - QFile file( mRecommendationAlbumArtsName.at( i ) ); - if ( file.exists() ) { - if ( file.remove() ) { - TX_LOG_ARGS( "File removed - " << file.fileName() ); - } - else { - TX_LOG_ARGS( "Cannot remove file - " << file.fileName() ); - } - } else { - TX_LOG_ARGS( "File doesn't exist - " << file.fileName() ); + if (canQueryRecommendations()) { + // start inspire me area progress bar + // TODO: currently, till we get to this callback from MPX the bar not shown + // TODO: check if inspireMe is ON, if not, dont show + mInspireMeProgressBar->show(); + if (canQuerySharePlayerLink() ) { + mMpQueryManager->queryLocalMusicStore(mSongData->artist(),mSongData->album(),mSongData->title()); } + mMpQueryManager->queryInspireMeItems(mSongData->artist(),mSongData->album(),mSongData->title()); + mInspireMeQueryOngoing = true; } - mButton->hide(); - - // TODO: country information handling, MCC - QString queryURI("http://api.music.ovi.com/1.0/ru/?"); - constructRequest( queryURI ); - TX_LOG_ARGS( "queryURI : " << queryURI ); - retrieveInformation( queryURI ); - - QString queryRecommendation("http://api.music.ovi.com/1.0/gb/releases/recommend/?"); - constructRequest( queryRecommendation ); - TX_LOG_ARGS( "queryRecommendation : " << queryRecommendation ); - retrieveInformation( queryRecommendation ); - - loadSharePlayer(); - TX_EXIT + else { + // metadata to query for inspire me items not available + // show information note + if (!mInspireMeGroupBox->isCollapsed()) + RenderInspireMeGroupBox(); + } + TX_EXIT } +void MpDetailsView::clearInspireMe() +{ + TX_ENTRY + mInspireList->clear(); + mMpQueryManager->clearRecommendations(); + TX_EXIT +} /*! Slot to handle detail song information */ @@ -563,183 +509,165 @@ TX_ENTRY mDetailList->clear(); - HbListWidgetItem *item = new HbListWidgetItem(); - item->setText( tr( "Track" ) ); - item->setSecondaryText( mSongData->albumTrack() ); - mDetailList->addItem( item ); + if ( !mSongData->albumTrack().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Song number" ) ); + item->setSecondaryText( mSongData->albumTrack() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->year().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Year" ) ); + item->setSecondaryText( mSongData->year() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->genre().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Genre" ) ); + item->setSecondaryText( mSongData->genre() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } - item = new HbListWidgetItem(); - item->setText( tr( "Composer" ) ); - item->setSecondaryText( mSongData->composer() ); - mDetailList->addItem( item ); + if ( !mSongData->composer().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Composer" ) ); + item->setSecondaryText( mSongData->composer() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->fileName().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "File name" ) ); + item->setSecondaryText( mSongData->fileName() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->mimeType().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Format" ) ); + item->setSecondaryText( mSongData->mimeType() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } - item = new HbListWidgetItem(); - item->setText( tr( "Year" ) ); - item->setSecondaryText( mSongData->year() ); - mDetailList->addItem( item ); + if ( !mSongData->duration().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Duration" ) ); + item->setSecondaryText( mSongData->duration() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->bitRate().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Bitrate" ) ); + item->setSecondaryText( mSongData->bitRate().append( " Kbps" ) ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->sampleRate().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Sampling rate" ) ); + item->setSecondaryText( mSongData->sampleRate().append( " hz" ) ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->size().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Size" ) ); + item->setSecondaryText( mSongData->size().append( " MB" ) ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } - item = new HbListWidgetItem(); - item->setText( tr( "Genre" ) ); - item->setSecondaryText( mSongData->genre() ); - mDetailList->addItem( item ); + if ( !mSongData->modified().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Modified" ) ); + item->setSecondaryText( mSongData->modified() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } - item = new HbListWidgetItem(); - item->setText( tr( "Comment" ) ); - item->setSecondaryText( mSongData->comment() ); - mDetailList->addItem( item ); + if ( !mSongData->copyright().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Copyright" ) ); + item->setSecondaryText( mSongData->copyright() ); + item->setEnabled( false ); + mDetailList->addItem( item ); + } + + if ( !mSongData->musicURL().isNull() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Web site" ) ); + item->setSecondaryText( mSongData->musicURL() ); + item->setEnabled( true ); + mDetailList->addItem( item ); + } + + if ( mSongData->isDrmProtected() ) { + HbListWidgetItem *item = new HbListWidgetItem(); + item->setText( tr( "Licences" ) ); + item->setSecondaryText( tr( "Click for details" ) ); + item->setEnabled( true ); + mDetailList->addItem( item ); + } + TX_EXIT } -/*! - Slot to handle details groupbox toggling - */ -void MpDetailsView::toggleDetailsGroupBox(bool /*state*/) +void MpDetailsView::handleDetailsGroupBoxToggled(bool state) { - TX_ENTRY - if ( !mInspireMeGroupBox->isCollapsed() ) { - mSongDetailsGroupBox->setCollapsed( true ); - } - TX_EXIT -} - -/*! - Slot to handle inspire me groupbox toggling - */ -void MpDetailsView::toggleInspireMeGroupBox(bool /*state*/) -{ + Q_UNUSED(state); TX_ENTRY if ( !mSongDetailsGroupBox->isCollapsed() ) { - mInspireMeGroupBox->setCollapsed( true ); + mInspireMeGroupBox->setCollapsed( true ); } TX_EXIT } -/*! - Construct the query for fetching URI & recommendations - */ -void MpDetailsView::constructRequest( QString &uri ) -{ - TX_ENTRY_ARGS( "uri =" << uri) - - QStringList keys; - keys << tr("artist") << tr("albumtitle") << tr("tracktitle") << tr("orderby"); - - // TODO: need to clarify which crition to use for sort, currently hard code to "relevancy" - // order can be relevancy, alltimedownloads, streetreleasedate, sortname, recentdownloads - QStringList values; - values << mSongData->artist() << mSongData->album() - << mSongData->title() << QString(tr("relevancy")); - TX_LOG_ARGS( "Artist: " << mSongData->artist() ); - TX_LOG_ARGS( "Album: " << mSongData->album() ); - TX_LOG_ARGS( "Title: " << mSongData->title() ); - - uri += keyValues( keys, values ); - - QUrl url(uri); - uri = url.toEncoded(); - TX_EXIT -} - -/*! - Get Atom response from Ovi server based on query - */ -void MpDetailsView::retrieveInformation( const QString &urlEncoded ) -{ - TX_ENTRY_ARGS( "urlEconded = " << urlEncoded) - QNetworkReply *reply = mManager->get( QNetworkRequest( QUrl( urlEncoded ) ) ); - mReplys.append( reply ); - - connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( retrieveInformationNetworkError( QNetworkReply::NetworkError ) ) ); - connect( reply, SIGNAL( sslErrors( QList ) ), this, SLOT( retrieveInformationSslErrors( QList ) ) ); - TX_EXIT -} - - -/*! - Slot to call when getting response - */ -void MpDetailsView::retrieveInformationFinished( QNetworkReply* reply ) +void MpDetailsView::handleInspireMeGroupBoxToggled(bool /*state*/) { TX_ENTRY - QString errorStr; - int errorLine; - int errorColumn; - bool parsingSuccess; - - if ( reply->error() == QNetworkReply::NoError ) - { - parsingSuccess = mDomDocument.setContent( reply, true, &errorStr, &errorLine, &errorColumn ); - if ( parsingSuccess ) { - handleParsedXML(); //CodeScanner throws a warning mis-interpreting the trailing 'L' to be a leaving function. + if ( !mInspireMeGroupBox->isCollapsed() ) { + TX_LOG_ARGS( "InspireMe is expanded." ) + mSongDetailsGroupBox->setCollapsed( true ); + if ( mInspireMeQueryOngoing ) { + TX_LOG_ARGS( "Query is ongoing " ) + mInspireMeProgressBar->show(); } else { - // TODO: agree on error handling - TX_LOG_ARGS( "XML parsing error" ); + TX_LOG_ARGS( "Query is NOT ongoing " ) + if ( mInspireMeQueryRendered ) { + TX_LOG_ARGS( "InspireMe is rendered already. " ) + mInspireMeProgressBar->hide(); + } else { + if ( canQueryRecommendations() ) { + TX_LOG_ARGS( "InspireMe is NOT rendered yet but can query for recommendations. " ) + mMpQueryManager->queryInspireMeItems(mSongData->artist(),mSongData->album(),mSongData->title()); + mInspireMeProgressBar->show(); + mInspireMeQueryOngoing = true; + } else { + TX_LOG_ARGS( "InspireMe is NOT rendered yet and CANNOT query for recommendations either. " ) + RenderInspireMeGroupBox(); + } + } } - } - else - { - // TODO: agree on error handling - TX_LOG_ARGS( "Network error in retrieving Information" ); + } else { + TX_LOG_ARGS( "InspireMe is collapsed." ) + mInspireMeProgressBar->hide(); } TX_EXIT } /*! - Slot to call when there is network error - */ -void MpDetailsView::retrieveInformationNetworkError( QNetworkReply::NetworkError /*error*/ ) -{ - // TODO: agree on error handling - TX_ENTRY_ARGS( "Network error for retrieving Information" ); - TX_EXIT -} - -/*! - Slot to call when there is ssl error - */ -void MpDetailsView::retrieveInformationSslErrors( const QList &/*error*/ ) -{ - // TODO: agree on error handling - TX_ENTRY_ARGS( "SSL error for retrieving Information" ); - TX_EXIT -} - -/*! - Slot to call when downloading finished - */ -void MpDetailsView::DownloadFinished( QNetworkReply* reply ) -{ - TX_ENTRY_ARGS( "mDownloadedAlbumArts = " << mDownloadedAlbumArts ); - if ( reply->error() == QNetworkReply::NoError ) - { - QString fileName = mRecommendationAlbumArtsName.at( mDownloadedAlbumArts ); - TX_LOG_ARGS( "File name: " << fileName ); - QFile file(fileName); - - if ( fileName.isEmpty() ) { - TX_LOG_ARGS( "Only store two album arts" ); - } else { - if ( !file.open( QIODevice::ReadWrite ) ) { - TX_LOG_ARGS( "Unable to open file" ); - } else { - file.write( reply->readAll() ); - file.flush(); - file.close(); - setAlbumArtUri( mRecommendationAlbumArtsLink.at( mDownloadedAlbumArts ), - mRecommendationAlbumArtsName.at( mDownloadedAlbumArts ) ); - } - } - } - else - { - TX_LOG_ARGS( "Downloading album art failed!" ); - } - - mDownloadedAlbumArts++; - TX_EXIT -} - -/*! Slot to handle the recommendation album art */ void MpDetailsView::thumbnailReady( @@ -749,38 +677,82 @@ int error ) { TX_ENTRY + // TODO: Hkn: use qobject_cast QString uri = *( reinterpret_cast( data ) ); TX_LOG_ARGS( "Uri: " << uri ); if ( error == 0 ) { TX_LOG_ARGS( "album art link: " << uri ); - mRecommendationAlbumArtsMap.insert( uri, pixmap ); - recommendationAlbumArtReady(); + mMpQueryManager->insertMapItem( uri, pixmap ); + } else { + mMpQueryManager->insertMapItem( uri, mDefaultRecommendationAlbumArt ); } - else { - mRecommendationAlbumArtsMap.insert( uri, mDefaultRecommendationAlbumArt ); - recommendationAlbumArtReady(); - } - + recommendationAlbumArtReady(); TX_EXIT } - +#ifdef SHARE_FUNC_ENABLED /*! - Slot to add context to javascript + Slot to be called when share button is clicked */ -void MpDetailsView::addContext() +void MpDetailsView::share() { TX_ENTRY + createShareDialog(); + if ( mSharePopup ) + { + mSharePopup->show(); + } + if (canQuerySharePlayerLink() ) + { + mMpQueryManager->queryLocalMusicStore(mSongData->artist(),mSongData->album(),mSongData->title() ); + } TX_EXIT } /*! - Slot to close widget - */ -void MpDetailsView::close() + Method to create the share dialog on demand. + */ +void MpDetailsView::createShareDialog() { TX_ENTRY + if ( !mSharePopup ) + { + mSharePopup = new MpDetailsShareDialog(); + connect( mSharePopup, SIGNAL(closeShareDialog() ), this, SLOT( closeShareDialog() ) ); + mSharePopup->initialize( mSongData ); + } TX_EXIT } +/*! + Slot to be called when ok/close button in share dialog is pressed. + */ +void MpDetailsView::closeShareDialog() +{ + TX_ENTRY + if ( mSharePopup ) + { + mSharePopup->close(); + delete mSharePopup; + mSharePopup = NULL; + } + TX_EXIT +} +#endif + +/*! + Slot to handle the music store URL retrieval from the query manager. +*/ +void MpDetailsView::updateSharedData(const QString& url) +{ + TX_ENTRY + mSongData->setLink( url ); +#ifdef SHARE_FUNC_ENABLED + if ( mSharePopup ) + { + mSharePopup->updateSharedData(); + } +#endif + TX_EXIT +} diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/src/mpmpxdetailsframeworkwrapper.cpp --- a/mpviewplugins/mpdetailsviewplugin/src/mpmpxdetailsframeworkwrapper.cpp Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Framework wrapper -* -*/ - - -#include "mpmpxdetailsframeworkwrapper.h" -#include "mpmpxdetailsframeworkwrapper_p.h" -#include "mptrace.h" - -/*! - \class MpMpxDetailsFrameworkWrapper - \brief Wrapper for mpx framework utilities. - - MPX framework wrapper provides Qt style interface to the MPX framework - utilities. Its implementation is hidden using private class data pattern. -*/ - - -/*! - Constructs the utility wrapper. - */ -MpMpxDetailsFrameworkWrapper::MpMpxDetailsFrameworkWrapper( QObject *parent ) - : QObject(parent), - d_ptr( q_check_ptr( new MpMpxDetailsFrameworkWrapperPrivate( this ) ) ) //from Qt 4.6 -{ - TX_ENTRY - TX_EXIT -} - -/*! - Destructs the utility wrapper. - */ -MpMpxDetailsFrameworkWrapper::~MpMpxDetailsFrameworkWrapper() -{ - TX_ENTRY - delete d_ptr; - TX_EXIT -} - -/*! - Returns pointer to MpSongData - */ -MpSongData *MpMpxDetailsFrameworkWrapper::songData() -{ - TX_LOG - return d_ptr->songData(); -} - -/*! - Retrieve currently playing song meta data - */ -void MpMpxDetailsFrameworkWrapper::retrieveSong() -{ - TX_LOG - d_ptr->retrieveSong(); -} - diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/src/mpmpxdetailsframeworkwrapper_p.cpp --- a/mpviewplugins/mpdetailsviewplugin/src/mpmpxdetailsframeworkwrapper_p.cpp Fri Apr 30 19:33:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,283 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Framework wraper - Private. -* -*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "mpmpxdetailsframeworkwrapper_p.h" -#include "mpmpxdetailsframeworkwrapper.h" -#include "mpcommondefs.h" -#include "mptrace.h" -#include "mpsongdata.h" - -/*! - \class MpMpxDetailsFrameworkWrapperPrivate - \brief Wrapper for mpx framework utilities - private implementation. - - This is a private implementation of the mpx framework wrapper utilties interface. -*/ - -/*! - \internal - */ -MpMpxDetailsFrameworkWrapperPrivate::MpMpxDetailsFrameworkWrapperPrivate( MpMpxDetailsFrameworkWrapper *qq ) - : q_ptr( qq ), - iSongData(0), - iPlaybackUtility(0) -{ - TX_ENTRY - // TODO: Who will call the destructor if it throws ? - QT_TRAP_THROWING( constructProviderL() ); - TX_EXIT -} - -/*! - \internal - */ -MpMpxDetailsFrameworkWrapperPrivate::~MpMpxDetailsFrameworkWrapperPrivate() -{ - TX_ENTRY - // TODO: Hkn: Trace the leave on debug, remove any TRAP_IGNORE s - TRAP_IGNORE( destructProviderL() ); - TX_EXIT -} - -/*! - \internal - \ TODO: Hkn: rename - */ -void MpMpxDetailsFrameworkWrapperPrivate::constructProviderL() -{ - TX_ENTRY - iPlaybackUtility = MMPXPlaybackUtility::UtilityL( - TUid::Uid( MpCommon::KMusicPlayerUid ) ); - iPlaybackUtility->AddObserverL( *this ); - - iSongData = new MpSongData(); - User::LeaveIfNull(iSongData); - - TX_EXIT -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::destructProviderL() -{ - TX_ENTRY - if ( iPlaybackUtility ) - { - iPlaybackUtility->RemoveObserverL( *this ); - iPlaybackUtility->Close(); - iPlaybackUtility = NULL; - //do not delete pointer data - } - - delete iSongData; - iSongData=NULL; - TX_EXIT -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::HandlePlaybackMessage( - CMPXMessage *aMessage, - TInt aError ) -{ - Q_UNUSED( aMessage ); - Q_UNUSED( aError ); -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::HandlePropertyL( TMPXPlaybackProperty /*aProperty*/, TInt /*aValue*/, TInt /*aError*/ ) -{ - TX_LOG -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::HandleSubPlayerNamesL( TUid /*aPlayer*/, const MDesCArray */*aSubPlayers*/, TBool /*aComplete*/, TInt /*aError*/ ) -{ - TX_LOG -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::HandleMediaL( - const CMPXMedia& aProperties, - TInt aError ) -{ - TX_ENTRY - - if ( KErrNone != aError ){ - // TODO: Hkn: Add a proper trace macro and trace - TX_EXIT - return; - } - - bool changed = false; - if ( aProperties.IsSupported( KMPXMediaGeneralTitle ) ) { - changed |= iSongData->setTitle( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaGeneralTitle ).Ptr(), - aProperties.ValueText( KMPXMediaGeneralTitle ).Length() ) ); - } else { - changed |= iSongData->setTitle( QString() ); - } - - if ( aProperties.IsSupported( KMPXMediaMusicArtist ) ) { - changed |= iSongData->setArtist( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaMusicArtist ).Ptr(), - aProperties.ValueText( KMPXMediaMusicArtist ).Length() ) ); - } else { - changed |= iSongData->setArtist( QString() ); - } - - if ( aProperties.IsSupported( KMPXMediaMusicAlbum ) ) { - changed |= iSongData->setAlbum( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaMusicAlbum ).Ptr(), - aProperties.ValueText( KMPXMediaMusicAlbum ).Length() ) ); - } else { - changed |= iSongData->setAlbum( QString() ); - } - if ( changed ) { - iSongData->commitPlaybackInfo( ); - } - - // call back will be called when Album art is retrieved - if ( aProperties.IsSupported( TMPXAttribute( KMPXMediaMusicAlbumArtFileName ) ) ) { - iSongData->setAlbumArtUri( - QString::fromUtf16( - aProperties.ValueText(KMPXMediaMusicAlbumArtFileName).Ptr(), - aProperties.ValueText(KMPXMediaMusicAlbumArtFileName).Length())); - } else { - iSongData->setAlbumArtUri( QString() ); - } - - // all following will be for song details - changed = false; - if ( aProperties.IsSupported( KMPXMediaGeneralComment ) ) { - TX_LOG_ARGS( "Comment is supported " ); - changed |= iSongData->setComment( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaGeneralComment ).Ptr(), - aProperties.ValueText( KMPXMediaGeneralComment ).Length() ) ); - } else { - changed |= iSongData->setComment( QString() ); - } - - if ( aProperties.IsSupported( TMPXAttribute( KMPXMediaMusicComposer ) ) ) { - TX_LOG_ARGS( "Composer is supported " ); - changed |= iSongData->setComposer( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaMusicComposer ).Ptr(), - aProperties.ValueText( KMPXMediaMusicComposer ).Length())); - } else { - changed |= iSongData->setComposer( QString() ); - } - - if ( aProperties.IsSupported( TMPXAttribute( KMPXMediaMusicYear ) ) ) { - TInt64 yearInMicroSeconds = aProperties.ValueTObjectL( KMPXMediaMusicYear ); - TTime yearTime( yearInMicroSeconds ); - changed |= iSongData->setYear( yearTime.DateTime().Year() ); - } else { - // to clear previous result - changed |= iSongData->setYear( -1 ); - } - - if ( aProperties.IsSupported( TMPXAttribute( KMPXMediaMusicAlbumTrack ) ) ) { - changed |= iSongData->setAlbumTrack( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaMusicAlbumTrack ).Ptr(), - aProperties.ValueText( KMPXMediaMusicAlbumTrack ).Length())); - } else { - changed |= iSongData->setAlbumTrack( QString() ); - } - - if ( aProperties.IsSupported( TMPXAttribute( KMPXMediaMusicGenre ) ) ) { - changed |= iSongData->setGenre( - QString::fromUtf16( - aProperties.ValueText( KMPXMediaMusicGenre ).Ptr(), - aProperties.ValueText( KMPXMediaMusicGenre ).Length())); - } else { - changed |= iSongData->setGenre( QString() ); - } - - if ( changed ) { - iSongData->commitSongDetailInfo( ); - } - TX_EXIT -} - -/*! - return song data - */ -MpSongData *MpMpxDetailsFrameworkWrapperPrivate::songData() -{ - TX_LOG - return iSongData; -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::retrieveSong() -{ - TX_ENTRY - TRAP_IGNORE( doRetrieveSongL() ); - TX_EXIT -} - -/*! - \internal - */ -void MpMpxDetailsFrameworkWrapperPrivate::doRetrieveSongL() -{ - TX_ENTRY - MMPXSource *mediaSrc = iPlaybackUtility->Source(); - User::LeaveIfNull( mediaSrc ); - RArray requestedAttr; - CleanupClosePushL( requestedAttr ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaGeneralTitle ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicArtist ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicAlbum ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaGeneralUri ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicAlbumArtFileName ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaGeneralComment ) ); - - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicAlbumTrack ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicComposer ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicYear ) ); - requestedAttr.AppendL( TMPXAttribute( KMPXMediaMusicGenre ) ); - - mediaSrc->MediaL( requestedAttr.Array(), *this ); - CleanupStack::PopAndDestroy( &requestedAttr ); - TX_EXIT -} diff -r 2c5162224003 -r fdb31ab341af mpviewplugins/mpdetailsviewplugin/src/mpquerymanager.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpdetailsviewplugin/src/mpquerymanager.cpp Fri May 14 18:54:37 2010 -0500 @@ -0,0 +1,474 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Music Player Query Manager. +* +*/ + +#include "mpquerymanager.h" +#include +#include +#include +#include +#include

Loading...