--- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerplaylists.cpp Fri Aug 06 16:51:36 2010 -0500
+++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectioncontainerplaylists.cpp Tue Aug 24 03:36:14 2010 -0500
@@ -49,7 +49,6 @@
*/
MpCollectionContainerPlaylists::MpCollectionContainerPlaylists( HbDocumentLoader *loader, QGraphicsItem *parent )
: MpCollectionListContainer(loader, parent),
- mInfoBar(0),
mCurrentPlaylistIndex(0)
{
TX_LOG
@@ -63,7 +62,6 @@
MpCollectionContainerPlaylists::~MpCollectionContainerPlaylists()
{
TX_ENTRY
- delete mInfoBar;
delete mList;
TX_EXIT
}
@@ -130,6 +128,9 @@
void MpCollectionContainerPlaylists::setupContainer()
{
TX_ENTRY_ARGS("mCollectionContext=" << mCollectionContext);
+
+ mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "showInfoBar");
+
if ( mCollectionData->count() ) {
bool ok = false;
QGraphicsWidget *widget;
@@ -144,10 +145,8 @@
mList = qobject_cast<HbListView*>(widget);
initializeList();
}
- if ( mInfoBar ) {
- delete mInfoBar;
- mInfoBar = 0;
- }
+
+ mInfoBar->setHeading(hbTrId("txt_mus_subhead_playlists_1l").arg(mCollectionData->count()));
}
else if ( mCollectionContext == ECollectionContextPlaylistSongs ) {
mDocumentLoader->load(QString(":/docml/musiccollection.docml"), "playlistSongs", &ok);
@@ -155,16 +154,13 @@
TX_LOG_ARGS("Error: invalid xml file.");
Q_ASSERT_X(ok, "MpCollectionContainerPlaylists::setupContainer", "invalid xml file");
}
-
- widget = mDocumentLoader->findWidget(QString("playlistSongsDetail"));
- mInfoBar = qobject_cast<HbGroupBox*>(widget);
-
+
QString details;
if ( mViewMode == MpCommon::FetchView ) {
- details = hbTrId("txt_mus_subtitle_select_a_song");
+ details = hbTrId("txt_mus_subtitle_select_song");
}
else {
- details = mCollectionData->collectionTitle();
+ details = hbTrId("txt_mus_subhead_1_2l").arg(mCollectionData->collectionTitle()).arg(mCollectionData->count());
}
mInfoBar->setHeading(details);
}
@@ -174,11 +170,10 @@
}
}
else {
- if ( mInfoBar ) {
- delete mInfoBar;
- mInfoBar = 0;
- }
- // Call empty list from base class
+
+ mInfoBar->setHeading(hbTrId("txt_mus_subhead_1_2l").arg(mCollectionData->collectionTitle()).arg(0));
+
+ // Call empty list from base class
setupEmptyListContainer();
}
TX_EXIT