diff -r 4e84c994a771 -r 82baf59ce8dd mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp --- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp Fri Mar 19 09:28:13 2010 +0200 +++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerallsongs.cpp Fri Apr 16 14:56:30 2010 +0300 @@ -19,11 +19,11 @@ #include #include -#include +#include +#include #include "mpcollectioncontainerallsongs.h" #include "mpmpxcollectiondata.h" -#include "mpcollectioninfobar.h" #include "mptrace.h" /*! @@ -66,31 +66,36 @@ void MpCollectionContainerAllSongs::setupContainer() { TX_ENTRY - bool ok = false; - mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "allSongs", &ok); - if ( !ok ) { - TX_LOG_ARGS("Error: invalid xml file."); - Q_ASSERT_X(ok, "MpCollectionContainerAllSongs::setupContainer", "invalid xml file"); - } + if ( mCollectionData->count() ) { + bool ok = false; + mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "allSongs", &ok); + if ( !ok ) { + TX_LOG_ARGS("Error: invalid xml file."); + Q_ASSERT_X(ok, "MpCollectionContainerAllSongs::setupContainer", "invalid xml file"); + } + QGraphicsWidget *widget; + widget = mDocumentLoader->findWidget(QString("allSongsDetail")); + mInfoBar = qobject_cast(widget); - QString details; - if ( mViewMode == MpCommon::FetchView ) { - details = "Select a song"; + widget = mDocumentLoader->findWidget(QString("allSongsList")); + mList = qobject_cast(widget); + mIndexFeedback->setItemView(mList); + initializeList(); + + QString details; + if ( mViewMode == MpCommon::FetchView ) { + details = "Select a song"; + } + else { + int count = mCollectionData->count(); + details = hbTrId("txt_mus_subhead_ln_songs", count); + } + mInfoBar->setHeading(details); } else { - int count = mCollectionData->count(); - details.setNum(count); - details.append(" songs"); + // Call empty list from base class + setupEmptyListContainer(); } - - QGraphicsWidget *widget; - widget = mDocumentLoader->findWidget(QString("allSongsDetail")); - mInfoBar = qobject_cast(widget); - mInfoBar->setText(details); - - widget = mDocumentLoader->findWidget(QString("allSongsList")); - mList = qobject_cast(widget); - initializeList(); TX_EXIT }