FCL/sf/app/musicplayer: comparison mpviewplugins/mpmediawallviewplugin/src/mpmediawallview.cpp

equal deleted inserted replaced

-:c163ef0b758d
+:ea59c434026a
 #include <hbicon.h>
 #include <hbaction.h>
 #include <hbapplication.h>
 #include <hbscrollbar.h>
 #include <hblabel.h>
-#include <hbpushbutton.h>
 #include <hbtoolbutton.h>
+#include <hblistview.h>
+#include <hbstyleloader.h>
 #include <hgmediawall.h>
 #include "mpmediawallview.h"
 #include "mpmediawalldocumentloader.h"
 mPauseIcon = new HbIcon( "qtg_mono_pause" );
 mPlayIcon = new HbIcon( "qtg_mono_play" );
 mPlayPauseAction = new HbAction( HbIcon() , QString(), this );
 mPlaybackData = MpEngineFactory::sharedEngine()->playbackData();
 qobject_cast<HbToolButton*>( widget )->setAction( mPlayPauseAction );
-//we need this widget to hide the play pause button, for soem reaosn it does not want to hide.
+//we need this widget to hide the play pause button, for some reason it does not want to hide.
 mPlayPauseContainer = mDocumentLoader->findWidget( QString( "playPauseButtonContainer" ) );
 updatePlayPauseAction();
 connect( mPlaybackData, SIGNAL( playbackStateChanged() ),
 this, SLOT( updatePlayPauseAction() ) );
 connect( mPlayPauseAction, SIGNAL( triggered( bool ) ),
 TX_LOG_ARGS( "Error: invalid xml file." );
 Q_ASSERT_X( ok, "MpCollectionView::initializeView", "invalid xml file" );
 }
 mAlbumCover = new MpAlbumCoverWidget( this );
-mAlbumCover->setDefaultIcon( HbIcon( "qtg_large_music_album" ) );
+mAlbumCover->setDefaultIcon( HbIcon( "qtg_large_album_art" ) );
 mAlbumCover->hide();
 mTrackList = new MpTrackListWidget( this );
 mTrackList->list()->setModel( new MpCollectionTBoneListDataModel(mCollectionData, mPlaybackData, mTrackList ) );
 mTrackList->hide();
 connect(mAlbumCover,SIGNAL(clicked()),this, SLOT(hideTracksList()));
 connect(mTrackList->list(), SIGNAL(activated(QModelIndex)), this, SLOT(listItemActivated(QModelIndex)));
-connect(mTrackList,SIGNAL(close()),this, SLOT(hideTracksList()));
+connect(mTrackList,SIGNAL(closed()),this, SLOT(hideTracksList()));
+HbStyleLoader::registerFilePath(":/css/mpcustommediawall.css");
+HbStyleLoader::registerFilePath(":/css/mpcustommediawall.hgmediawall.widgetml");
 TX_EXIT
 }
 /*!
 } else {
 bool ok = false;
 mDocumentLoader->load( MUSIC_MEDIAWALL_DOCML, "mediaWall", &ok);
 if ( ok ) {
 QGraphicsWidget *widget;
-widget = mDocumentLoader->findWidget(QString("mediaWallWidget"));
+widget = mDocumentLoader->findWidget(QString("MPmediaWallWidget"));
 mMediaWallWidget = qobject_cast<HgMediawall*>(widget);
+//set these items as children of the media wall so they show behind the scrollbar.
+mTrackList->setParentItem(mMediaWallWidget);
+mAlbumCover->setParentItem(mMediaWallWidget);
 mModel->refreshModel();
 setUpMediaWallWidget();
 }
 else {
 TX_LOG_ARGS("Error: invalid xml file.");
 }
 }
 }
 else {
 if ( mMediaWallWidget ) {
+//Take ownership of these items to prevent delete from media wall widget.
+mTrackList->setParentItem( this );
+mAlbumCover->setParentItem( this );
 delete mMediaWallWidget;
 mMediaWallWidget = 0;
 }
 if ( !mNoMusic ) {
 }
 mShowingSongsList = true;
 setUpListAnimation();
 mListShowAnimationGroup->setDirection(QAbstractAnimation::Forward);
 mListShowAnimationGroup->start();
+mModel->setItemVisibility( mMediaWallWidget->currentIndex(), false );
 }
 /*!
 Slot to be called to starts the album and list closing animation.
 */
 return;
 }
 mShowingSongsList = false;
 mAlbumCover->hide();
 mTrackList->hide();
+mModel->setItemVisibility( mMediaWallWidget->currentIndex(), true );
 mListShowAnimationGroup->stop();
 disconnect(mListShowAnimationGroup, SIGNAL(finished()), this, SLOT(dismissListClosingAnimation()));
 }
 /*!
 //points to albums on media wall, this is used to construct the playlist.
 MpEngineFactory::sharedEngine()->playAlbumSongs( albumIndex, index.row(), mCollectionData );
 }
 /*!
+Slot to be called to fetch the songs for an album.
+*/
+void MpMediaWallView::fetchAlbumSongs(QModelIndex index)
+{
+if ( !mCollectionData->setCurrentAlbum( index.row() ) ) {
+mEngine->findAlbumSongs( index.row() );
+}
+}
+/*!
 Loads the media wall widget.
 */
 void MpMediaWallView::setUpMediaWallWidget()
 {
-HbIcon defaultIcon( "qtg_large_music_album" );
+HbIcon defaultIcon( "qtg_large_album_art" );
 defaultIcon.setSize(mMediaWallWidget->itemSize());
 mMediaWallWidget->setDefaultImage( defaultIcon.pixmap().toImage() );
-mMediaWallWidget->enableReflections( false );
+mMediaWallWidget->enableReflections( true );
 mMediaWallWidget->setModel( mModel );
 if ( mPlaybackData->playbackState() != MpPlaybackData::NotPlaying ) {
 scrollToNowPlaying();
 }
 //The rest of the cases are attepting to balance the items on screen.
 mMediaWallWidget->setTitleFontSpec( HbFontSpec( HbFontSpec::Primary ) );
 mMediaWallWidget->setDescriptionFontSpec( HbFontSpec( HbFontSpec::Secondary ) );
 mMediaWallWidget->setScrollBarPolicy( HgWidget::ScrollBarAlwaysOn ); //HgWidget::ScrollBarAutoHide
 mMediaWallWidget->scrollBar()->setInteractive( true );
 mMediaWallWidget->setIndexFeedbackPolicy( HgWidget::IndexFeedbackSingleCharacter );
+connect(mMediaWallWidget, SIGNAL(animationAboutToEnd(QModelIndex)), SLOT(fetchAlbumSongs(QModelIndex)));
 connect(mMediaWallWidget, SIGNAL(activated(QModelIndex)), SLOT(showTrackList()));
 connect(mMediaWallWidget, SIGNAL(scrollingStarted()), SLOT(dismissListClosingAnimation()));
 }
 /*!
 mCoverShowListAnimation->setEasingCurve(QEasingCurve::InOutCubic);
 mListShowAnimationGroup->addAnimation(mCoverShowListAnimation);
 mListShowListAnimation = new QPropertyAnimation( mTrackList, "geometry", this );
 mListShowListAnimation->setDuration( 400 );
 mListShowListAnimation->setEasingCurve(QEasingCurve::InOutCubic);
 mListShowAnimationGroup->addAnimation(mListShowListAnimation);
-//track list goes on top of media wall.
-mTrackList->setZValue(mMediaWallWidget->zValue()+1);
-//album cover goes on top of track list.
-mAlbumCover->setZValue(mMediaWallWidget->zValue()+2);
 }
 //Get the current album cover geometry.
 QPolygonF poly;
 QModelIndex index = mMediaWallWidget->currentIndex();
 if ( !mMediaWallWidget->getItemOutline( index, poly ) ) {
 return;
 }
 QRectF itemRect = poly.boundingRect();
-//Request the albums tracks, they are set to the track list model.
-if ( !mCollectionData->setCurrentAlbum( index.row() ) ) {
-mEngine->findAlbumSongs( index.row() );
-}
 //Get the album cover icon.
 QVariant image = mModel->data(index, Qt::DecorationRole);
 if ( image.canConvert<HbIcon>() ) {
 mAlbumCover->setIcon(image.value<HbIcon>());
 //Calculate start and end position of items for the animation.
 QRectF endRect = itemRect;
 endRect.moveTo( endRect.topLeft().x() - endRect.size().width() / 2.0, endRect.topLeft().y() );
 mCoverShowListAnimation->setStartValue(itemRect);
 mCoverShowListAnimation->setEndValue(endRect);
-endRect.moveTo(endRect.topRight() - QPointF(1,0)); //adjust by one pixel to prevent a gap.
+endRect.moveTo( endRect.topRight() );
 mListShowListAnimation->setStartValue(itemRect);
 mListShowListAnimation->setEndValue(endRect);
 //set initial condition and show to prevent flicker.
 mAlbumCover->setPos(itemRect.topLeft());

changeset 41	ea59c434026a
parent 32	c163ef0b758d
child 43	0f32e550d9d8