@@ -48,15 +50,15 @@

- - - + + + - - + +

- \ No newline at end of file + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/resources/mpcustomlistitem.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpmediawallviewplugin/resources/mpcustomlistitem.css Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,57 @@ +HbListViewItem[layoutName="mpmwtracklist"][icon-2]{ + layout:mpmwtracklist-1; +} + +HbListViewItem[layoutName="mpmwtracklist"][!icon-2]{ + layout:mpmwtracklist-2; +} + +HbListViewItem::text-1[layoutName="mpmwtracklist"]{ + text-height: var(hb-param-text-height-secondary); + font-variant: secondary; + pref-width:-1; + text-align: Left; + size-policy-horizontal: ignored; + text-line-count-min:1; + text-line-count-max:1; + text-wrap-mode:no-wrap; +} + +HbListViewItem::icon-2[layoutName="mpmwtracklist"]{ + fixed-height: var(hb-param-graphic-size-secondary); + fixed-width: var(hb-param-graphic-size-secondary); +} + +HbListViewItem::text-2[layoutName="mpmwtracklist"]{ + minimum-height: 0.0un; + minimum-width: 0.0un; + fixed-height: 0.0un; + fixed-width: 0.0un; + text-line-count-min: 1; + text-line-count-max: 1; + text-wrap-mode: no-wrap; +} + +HbListViewItem::text-3[layoutName="mpmwtracklist"]{ + minimum-height: 0.0un; + minimum-width: 0.0un; + fixed-height: 0.0un; + fixed-width: 0.0un; + text-line-count-min: 1; + text-line-count-max: 1; + text-wrap-mode: no-wrap; +} + +HbListViewItem::icon-1[layoutName="mpmwtracklist"]{ + minimum-height: 0.0un; + minimum-width: 0.0un; + fixed-height: 0.0un; + fixed-width: 0.0un; +} + +HbListViewItem::multiselection-toucharea[layoutName="mpmwtracklist"]{ + minimum-height: 0.0un; + minimum-width: 0.0un; + fixed-height: 0.0un; + fixed-width: 0.0un; +} diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/resources/mpcustomlistitem.hblistviewitem.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpmediawallviewplugin/resources/mpcustomlistitem.hblistviewitem.widgetml Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/resources/mpcustommediawall.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpmediawallviewplugin/resources/mpcustommediawall.css Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,68 @@ +HgMediawall#MPmediaWallWidget +{ + layout:mpmediawallview; + front-cover-elevation-factor:0.51; +} + +HgMediawall#MPmediaWallWidget::content +{ + size-policy: ignored ignored; + left:0un; + right:0un; + top:0un; + bottom:0un; + zvalue: 0; +} + +HgMediawall#MPmediaWallWidget::title +{ + text-height: var(hb-param-text-height-primary); + font-variant:primary; + text-align: center center; + text-line-count-min:1; + text-line-count-max:1; + text-wrap-mode:no-wrap; + left:-expr(var(hb-param-touch-area-gene-primary-medium)+var(hb-param-margin-gene-left)); + right:expr(var(hb-param-touch-area-gene-primary-medium)+var(hb-param-margin-gene-right)); + top:0un; + bottom:0un; + zvalue: 2; +} + +HgMediawall#MPmediaWallWidget::description +{ + text-height: var(hb-param-text-height-secondary); + font-variant:secondary; + text-align: center center; + text-line-count-min:1; + text-line-count-max:1; + text-wrap-mode:no-wrap; + left:-expr(var(hb-param-touch-area-gene-primary-medium)+var(hb-param-margin-gene-left)); + right:expr(var(hb-param-touch-area-gene-primary-medium)+var(hb-param-margin-gene-right)); + top:0un; + bottom:0un; + zvalue: 2; +} + +HgMediawall#MPmediaWallWidget::centeritem +{ + size-policy: fixed fixed; + fixed-height: 41un; + fixed-width: 41un; + left:0un; + right:0un; + top:0un; + bottom:0un; + zvalue: 2; +} + +HgMediawall#MPmediaWallWidget::scrollbar-horizontal +{ + size-policy: preferred preferred; + left:0un; + right:0un; + top:0un; + bottom:0un; + zvalue: 2; +} + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/resources/mpcustommediawall.hgmediawall.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpmediawallviewplugin/resources/mpcustommediawall.hgmediawall.widgetml Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/resources/mpmediawallviewresources.qrc --- a/mpviewplugins/mpmediawallviewplugin/resources/mpmediawallviewresources.qrc Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpmediawallviewplugin/resources/mpmediawallviewresources.qrc Fri Jun 11 19:36:32 2010 -0500 @@ -3,5 +3,13 @@ mediawall.docml + + + mpcustomlistitem.css + mpcustomlistitem.hblistviewitem.widgetml + + mpcustommediawall.css + mpcustommediawall.hgmediawall.widgetml + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/src/mpalbumcoverwidget.cpp --- a/mpviewplugins/mpmediawallviewplugin/src/mpalbumcoverwidget.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpmediawallviewplugin/src/mpalbumcoverwidget.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -17,19 +17,42 @@ #include #include -#include #include "mpalbumcoverwidget.h" +#include "mpreflectioneffect.h" +/*! + \class MpAlbumCoverWidget + \brief Album Cover Widget. + + This widget provides upscaled rendering of images and SVG rendering. + Also there is a reflection effect. +*/ + +/*! + \fn void clicked( ) + + This signal is emitted when the item is clicked. + */ /*! Constructs the album cover widget */ MpAlbumCoverWidget::MpAlbumCoverWidget( QGraphicsItem *parent ) : - QGraphicsWidget( parent ) + HbWidget( parent ) { + setFlag( QGraphicsItem::ItemHasNoContents, false ); grabGesture(Qt::TapGesture); - grabGesture(Qt::SwipeGesture); + + MpReflectionEffect *effect = new MpReflectionEffect(this); + setGraphicsEffect(effect); +} + +/*! + Destructs the album cover widget. + */ +MpAlbumCoverWidget::~MpAlbumCoverWidget() +{ } /*! @@ -58,7 +81,6 @@ { Q_UNUSED( widget ) Q_UNUSED( option ) - //TODO: add a function to set default album art ,and use default when qicon is NULL, if ( !mIcon.isNull() ) { if ( mPixmap.isNull() ) { mPixmap = mIcon.qicon().pixmap( size().toSize() ); @@ -79,7 +101,6 @@ void MpAlbumCoverWidget::mousePressEvent( QGraphicsSceneMouseEvent *event ) { if ( event->button() == Qt::LeftButton ) { - HbInstantFeedback::play( HbFeedback::Basic ); event->accept(); } else { @@ -101,4 +122,15 @@ } } +/*! + \reimp + */ +void MpAlbumCoverWidget::gestureEvent(QGestureEvent *event) +{ + QGesture* gesture = event->gesture(Qt::TapGesture); + if (gesture) { + event->accept(Qt::TapGesture); + } +} + //EOF diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/src/mpmediawallview.cpp --- a/mpviewplugins/mpmediawallviewplugin/src/mpmediawallview.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpmediawallviewplugin/src/mpmediawallview.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -23,8 +23,9 @@ #include #include #include -#include #include +#include +#include #include @@ -131,7 +132,7 @@ mPlayPauseAction = new HbAction( HbIcon() , QString(), this ); mPlaybackData = MpEngineFactory::sharedEngine()->playbackData(); qobject_cast( 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() ), @@ -162,7 +163,7 @@ } mAlbumCover = new MpAlbumCoverWidget( this ); - mAlbumCover->setDefaultIcon( HbIcon( "qtg_large_music_album" ) ); + mAlbumCover->setDefaultIcon( HbIcon( "qtg_large_album_art" ) ); mAlbumCover->hide(); mTrackList = new MpTrackListWidget( this ); @@ -171,9 +172,10 @@ 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 } @@ -227,8 +229,11 @@ mDocumentLoader->load( MUSIC_MEDIAWALL_DOCML, "mediaWall", &ok); if ( ok ) { QGraphicsWidget *widget; - widget = mDocumentLoader->findWidget(QString("mediaWallWidget")); + widget = mDocumentLoader->findWidget(QString("MPmediaWallWidget")); mMediaWallWidget = qobject_cast(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(); } @@ -241,6 +246,9 @@ } 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; @@ -344,6 +352,7 @@ setUpListAnimation(); mListShowAnimationGroup->setDirection(QAbstractAnimation::Forward); mListShowAnimationGroup->start(); + mModel->setItemVisibility( mMediaWallWidget->currentIndex(), false ); } /*! @@ -367,6 +376,7 @@ mShowingSongsList = false; mAlbumCover->hide(); mTrackList->hide(); + mModel->setItemVisibility( mMediaWallWidget->currentIndex(), true ); mListShowAnimationGroup->stop(); disconnect(mListShowAnimationGroup, SIGNAL(finished()), this, SLOT(dismissListClosingAnimation())); } @@ -383,14 +393,24 @@ } /*! + 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(); @@ -427,6 +447,7 @@ 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())); } @@ -458,11 +479,7 @@ 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); + mListShowAnimationGroup->addAnimation(mListShowListAnimation); } //Get the current album cover geometry. @@ -472,11 +489,6 @@ 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); @@ -494,7 +506,7 @@ 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); diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/src/mpreflectioneffect.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpmediawallviewplugin/src/mpreflectioneffect.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,98 @@ +/* +* 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: Reflection effect for Music Player Media Wall. +* +*/ + +#include +#include +#include + +#include "mpreflectioneffect.h" + + +/*! + \class MpReflectionEffect + \brief The MpReflectionEffect class provides a reflection effect. + + Renders the source with a reflection. +*/ + +/*! + Constructs a new MpReflectionEffect instance. + The \a parent parameter is passed to QGraphicsEffect's constructor. +*/ +MpReflectionEffect::MpReflectionEffect(QObject *parent) + : QGraphicsEffect( parent ) +{ +} + +/*! + Destroys the effect. +*/ +MpReflectionEffect::~MpReflectionEffect() +{ +} + +/*! + \reimp +*/ +QRectF MpReflectionEffect::boundingRectFor(const QRectF &rect) const +{ + QRectF retRect = rect; + //this bounding rect is in device cordinates, correcting based on current transform. + if ( hbInstance->allMainWindows()[0]->orientation() == Qt::Horizontal ) { +#ifdef __WINS__ + retRect.adjust(0,0,retRect.width(),0); //wincw with forced rotation is to the right. +#else + retRect.adjust(-retRect.width(),0,0,0);//currently hardware rotations is to the left. +#endif + } else { + retRect.adjust(0,0,0,retRect.height()); + } + + return retRect; +} + +/*! + \reimp +*/ +void MpReflectionEffect::draw(QPainter *painter) +{ + //currently sourceBoundingRect returns somehing like boundingRectFor and + //wrong rect for widgets with scroll area. As a workaround we can get the + //original bounding rect assuming that the widget using the effect is the + //effect parent. + QGraphicsItem * sourceItem; + sourceItem = qobject_cast( parent() ); + QPixmap pixmap; + QPoint offset; + pixmap = sourcePixmap( Qt::LogicalCoordinates,&offset, QGraphicsEffect::NoPad ); + painter->drawPixmap( offset, pixmap ); + if ( sourceItem ) { + painter->save(); + painter->scale( 1, -1 ); + //for some reson tranlation does not work, translating cordinates by hand. + QPointF reflectionOffset( 0.0, - 2.0 * sourceItem->boundingRect().height() ); + painter->drawPixmap( offset + reflectionOffset, pixmap ); + QRectF reflectionRect; + reflectionRect.setTopLeft( reflectionOffset ); + reflectionRect.setHeight ( sourceItem->boundingRect().height() ); + reflectionRect.setWidth( pixmap.width() ); + painter->fillRect( reflectionRect, QColor::fromRgbF( 0, 0, 0, 0.5f ) ); + painter->restore(); + } +} + +// EOF diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpmediawallviewplugin/src/mptracklistwidget.cpp --- a/mpviewplugins/mpmediawallviewplugin/src/mptracklistwidget.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpmediawallviewplugin/src/mptracklistwidget.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -16,73 +16,65 @@ */ -#include #include -#include +#include +#include #include -#include #include +#include #include "mptracklistwidget.h" +#include "mpreflectioneffect.h" const int swipeAngleTolerance = 30; // angle is from 0 to 360 +/*! + \class MpTrackListWidget + \brief Widget with a list of tracks for Media Wall. + + This widget provides a list with custom style and a background. +*/ + +/*! + \fn void closed() + + This signal is emitted when the track list is closed by the user with a + left swipe gesture. + */ + + +/*! + Creates the MpTrackListWidget. + */ MpTrackListWidget::MpTrackListWidget( QGraphicsItem *parent ) : HbWidget( parent ) { - mList = new HbListView( ); - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout( ); - layout->addItem( mList ); - setLayout( layout ); + // Register the custorm css path for the list items. + HbStyleLoader::registerFilePath(":/css/mpcustomlistitem.css"); + HbStyleLoader::registerFilePath(":/css/mpcustomlistitem.hblistviewitem.widgetml"); + mList = new HbListView( this ); + // set layout name that matches the custom list item layout. + mList->setLayoutName("mpmwtracklist"); + //grab the gesture for close. grabGesture(Qt::SwipeGesture); + mFrameItem = new HbFrameItem( this ); mFrameItem->frameDrawer().setFrameType( HbFrameDrawer::NinePieces ); + mFrameItem->frameDrawer().setFrameGraphicsName( "qtg_fr_multimedia_trans" ); + mFrameItem->setZValue(-1); - //TODO: REMOVE PAINT and enable frame drawer when graphic is delibered. - //mFrameItem->frameDrawer().setFrameGraphicsName( "qtg_fr_popup" ); - mFrameItem->setZValue(-1); + MpReflectionEffect *effect = new MpReflectionEffect(this); + setGraphicsEffect(effect); } /*! - \reimp + Destructs the track list widget. */ -void MpTrackListWidget::resizeEvent(QGraphicsSceneResizeEvent *event) -{ - mFrameItem->setGeometry( rect() ); - HbWidget::resizeEvent( event ); -} - - -/*! - \reimp - */ -void MpTrackListWidget::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget ) +MpTrackListWidget::~MpTrackListWidget() { - Q_UNUSED( widget ) - Q_UNUSED( option ) - painter->setPen(Qt::darkGray); - painter->setBrush(QBrush(Qt::gray )); - painter->drawRoundedRect( rect(), 4.0 , 4.0 ); -} - -/*! - \reimp - */ -void MpTrackListWidget::gestureEvent(QGestureEvent *event) -{ - QGesture* gesture = event->gesture(Qt::SwipeGesture); - if (gesture) { - QSwipeGesture* swipe = static_cast(gesture); - if (swipe->state() == Qt::GestureFinished && - swipeAngleToDirection (swipe->swipeAngle()) == QSwipeGesture::Left ) { - //Left gesture is the direction in wich the track list slides to close. - emit close(); - event->accept(Qt::SwipeGesture); - } - } } /*! @@ -94,28 +86,15 @@ } /*! - Maps swipe angle to SwipeDirection based on a tolerance parameter and orientation. + \reimp */ -QSwipeGesture::SwipeDirection MpTrackListWidget::swipeAngleToDirection( - int angle) +void MpTrackListWidget::resizeEvent(QGraphicsSceneResizeEvent *event) { - int delta = swipeAngleTolerance; - if ( hbInstance->allMainWindows()[0]->orientation() == Qt::Horizontal ) { - //correction for transformation on rotation. - angle += ( angle < 90 ) ? 270 : -90; - } - QSwipeGesture::SwipeDirection direction(QSwipeGesture::NoDirection); - if ((angle > 90-delta) && (angle < 90+delta)) { - direction = QSwipeGesture::Up; - } else if ((angle > 270-delta) && (angle < 270+delta)) { - direction = QSwipeGesture::Down; - } else if (((angle >= 0) && (angle < delta)) - || ((angle > 360-delta) && (angle <= 360))) { - direction = QSwipeGesture::Right; - } else if ((angle > 180-delta) && (angle < 180+delta)) { - direction = QSwipeGesture::Left; - } - return direction; + mFrameItem->setGeometry( rect() ); + qreal margin = 0.0; + style()->parameter(QString("var(hb-param-margin-gene-middle-vertical)"), margin); + mList->setGeometry( rect().adjusted( margin, margin, -margin, -margin ) ); + HbWidget::resizeEvent( event ); } /*! @@ -144,4 +123,60 @@ } } +/*! + \reimp + */ +void MpTrackListWidget::gestureEvent(QGestureEvent *event) +{ + QGesture* gesture = event->gesture(Qt::SwipeGesture); + if (gesture) { + QSwipeGesture* swipe = static_cast(gesture); + if (swipe->state() == Qt::GestureFinished && + swipeAngleToDirection (swipe->swipeAngle()) == QSwipeGesture::Left ) { + //Left gesture is the direction in wich the track list slides to close. + emit closed(); + event->accept(Qt::SwipeGesture); + } + } +} +/*! + Maps swipe \a angle to QSwipeGesture::SwipeDirection based on a tolerance + parameter and orientation. This funtions helps to identify a swipe even + if it is not sharp movement from 180 to 0 degrees on the righ swipe + gesture for instance. Since gesture events are mesured on device + cordinates this also helps to correct the gesture to local cordinates + bases on device orientation, wich is done using QT transformations, + meaning local cordinates and device cordinates are not always aligned. + */ +QSwipeGesture::SwipeDirection MpTrackListWidget::swipeAngleToDirection( + int angle ) +{ + int delta = swipeAngleTolerance; + if ( hbInstance->allMainWindows()[0]->orientation() == Qt::Horizontal ) { + //correction for transformation on rotation. +#ifdef __WINS__ //wincw with forced rotation is to the right. + angle += ( angle < 90 ) ? 270 : -90; +#else//currently hardware rotations is to the left. + angle += 90; + if ( angle > 360 ) { + angle -= 360; + } +#endif + + } + QSwipeGesture::SwipeDirection direction( QSwipeGesture::NoDirection ); + if ( ( angle > 90 - delta) && ( angle < 90 + delta ) ) { + direction = QSwipeGesture::Up; + } else if ( ( angle > 270 - delta ) && (angle < 270 + delta ) ) { + direction = QSwipeGesture::Down; + } else if ( ( ( angle >= 0 ) && ( angle < delta ) ) + || ( ( angle > 360 - delta ) && ( angle <= 360 ) ) ) { + direction = QSwipeGesture::Right; + } else if ( ( angle > 180 - delta ) && ( angle < 180 + delta ) ) { + direction = QSwipeGesture::Left; + } + return direction; +} + +//EOF diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/inc/mpplaybackview.h --- a/mpviewplugins/mpplaybackviewplugin/inc/mpplaybackview.h Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpplaybackviewplugin/inc/mpplaybackview.h Fri Jun 11 19:36:32 2010 -0500 @@ -27,12 +27,14 @@ class MpPlaybackData; class MpPlaybackWidget; class MpEqualizerWidget; -class QTranslator; class MpPlaybackView : public MpViewBase { Q_OBJECT + Q_PROPERTY(QString PlaybackStatus READ playbackStatus) + Q_PROPERTY(bool Shuffle READ shuffleEnabled) + Q_PROPERTY(bool Repeat READ repeatEnabled) public: @@ -43,6 +45,10 @@ void activateView(); void deactivateView(); + QString playbackStatus(); + bool shuffleEnabled(); + bool repeatEnabled(); + signals: void command( int aCommand ); @@ -64,6 +70,7 @@ void handleSongSelected(); void showEqualizerDialog(); + void closeEqualizerDialog(); void startRewindTimer(); void startForwardTimer(); @@ -99,10 +106,7 @@ HbAction *mPlayPauseAction; // Not own HbAction *mRepeatAction; // Not own HbAction *mShuffleAction; // Not own - - QTranslator *mMpTranslator; // Own - QTranslator *mCommonTranslator; // Own - + QTimer *mTimer; bool mShuffle; diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/inc/mpplaybackwidget.h --- a/mpviewplugins/mpplaybackviewplugin/inc/mpplaybackwidget.h Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpplaybackviewplugin/inc/mpplaybackwidget.h Fri Jun 11 19:36:32 2010 -0500 @@ -43,6 +43,7 @@ signals: void setPlaybackPosition( int value ); + void signalPlaybackInfoChanged(); public slots: diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/mpplaybackviewplugin.pro --- a/mpviewplugins/mpplaybackviewplugin/mpplaybackviewplugin.pro Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpplaybackviewplugin/mpplaybackviewplugin.pro Fri Jun 11 19:36:32 2010 -0500 @@ -14,44 +14,44 @@ # Description: # -symbian:TARGET.UID3 = 0x10207C64 - TEMPLATE = lib CONFIG += hb qt ecomplugin TARGET = mpplaybackviewplugin +symbian: { + TARGET.UID3 = 0x10207C64 + TARGET.CAPABILITY = All -TCB + TARGET.EPOCALLOWDLLDATA = 1 +} SERVICE.INTERFACE_NAME = org.nokia.mmdt.MpxViewPlugin/1.0 SERVICE.CONFIGURATION = "0x101FFCA0

0x101FFC06;0x101FFC3A;0xE419BEEE

EMPXViewPluginPriorityNormal0x00000002" -TARGET.CAPABILITY = All -TCB - DEPENDPATH += . INCLUDEPATH += . \ - inc \ - ../../inc + inc \ + ../../inc INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -LIBS += -lmpxplaybackutility.dll \ - -lmpxcommon.dll \ - -lestor.dll \ - -lmpxviewframeworkqt.dll \ - -laudioequalizerutility.dll \ - -lmpsettingsmanager \ - -lmpengine \ - -lmpdata.dll - -symbian:TARGET.EPOCALLOWDLLDATA = 1 +LIBS += -lmpxplaybackutility \ + -lmpxcommon \ + -lestor \ + -lmpxviewframeworkqt \ + -laudioequalizerutility \ + -lmpsettingsmanager \ + -lmpengine \ + -lmpdata -HEADERS = ../../inc/mpviewbase.h \ - inc/mpplaybackviewplugin.h \ - inc/mpplaybackview.h \ - inc/mpplaybackwidget.h \ - inc/mpequalizerwidget.h +# Input +HEADERS += ../../inc/mpviewbase.h \ + inc/mpplaybackviewplugin.h \ + inc/mpplaybackview.h \ + inc/mpplaybackwidget.h \ + inc/mpequalizerwidget.h SOURCES += src/mpplaybackviewplugin.cpp \ - src/mpplaybackview.cpp \ - src/mpplaybackwidget.cpp \ - src/mpequalizerwidget.cpp + src/mpplaybackview.cpp \ + src/mpplaybackwidget.cpp \ + src/mpequalizerwidget.cpp RESOURCES += resources/mpplaybackviewpluginresources.qrc diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/src/mpplaybackview.cpp --- a/mpviewplugins/mpplaybackviewplugin/src/mpplaybackview.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpplaybackviewplugin/src/mpplaybackview.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include "mpplaybackview.h" #include "mpplaybackwidget.h" @@ -68,8 +66,6 @@ mPauseIcon( 0 ), mShuffleOnIcon( 0 ), mShuffleOffIcon( 0 ), - mMpTranslator( 0 ), - mCommonTranslator( 0 ), mTimer(0), mSeeking(false) @@ -89,8 +85,6 @@ delete mShuffleOnIcon; delete mShuffleOffIcon; delete mEqualizerWidget; - delete mMpTranslator; - delete mCommonTranslator; TX_EXIT } @@ -102,25 +96,6 @@ { 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 ); - } - - mCommonTranslator = new QTranslator( this ); - translatorLoaded = mCommonTranslator->load( path + "common_" + lang ); - TX_LOG_ARGS( "Loading common translator ok=" << translatorLoaded ); - if ( translatorLoaded ) { - qApp->installTranslator( mCommonTranslator ); - } - mWindow = mainWindow(); mSoftKeyBack = new HbAction( Hb::BackNaviAction, this ); @@ -151,6 +126,7 @@ this, SLOT( shuffleChanged( bool ) ) ); connect( MpSettingsManager::instance(), SIGNAL( repeatChanged( bool ) ), this, SLOT( repeatChanged( bool ) ) ); + connect( mMpEngine, SIGNAL( libraryUpdated() ), this, SLOT( closeEqualizerDialog() ) ); } TX_EXIT @@ -173,18 +149,64 @@ void MpPlaybackView::deactivateView() { TX_ENTRY - if ( mEqualizerWidget && mEqualizerWidget->isActive() ) { - mEqualizerWidget->close(); - } - menu()->close(); - setNavigationAction( 0 ); mActivated = false; TX_EXIT } /*! + Gets the current status of the view in a form of string + */ +QString MpPlaybackView::playbackStatus() +{ + TX_ENTRY + QString currentStatus; + + switch ( mPlaybackData->playbackState() ) { + case MpPlaybackData::NotPlaying: + TX_LOG_ARGS( "playbackStatus: NotPlaying" ) + currentStatus = "NotPlaying"; + break; + case MpPlaybackData::Playing: + TX_LOG_ARGS( "playbackStatus: Playing" ) + currentStatus = "Playing"; + break; + case MpPlaybackData::Paused: + TX_LOG_ARGS( "playbackStatus: Paused" ) + currentStatus ="Paused"; + break; + case MpPlaybackData::Stopped: + TX_LOG_ARGS( "playbackStatus: Stopped" ) + currentStatus = "Stopped"; + break; + default: + break; + } + TX_EXIT + return currentStatus; + +} + +/*! + Gets the current Shuffle setting value + */ +bool MpPlaybackView::shuffleEnabled() +{ + TX_ENTRY + return mShuffle; +} + +/*! + Gets the current Repeat setting value + */ +bool MpPlaybackView::repeatEnabled() +{ + TX_ENTRY + return mRepeat; +} + +/*! Slot to be called to activate settings view. */ void MpPlaybackView::startSettingsView() @@ -324,6 +346,7 @@ { TX_ENTRY HbToolBar *myToolBar = toolBar(); + myToolBar->setObjectName("PlaybackToolbar"); myToolBar->setOrientation( Qt::Horizontal ); QActionGroup *actionsGroup = new QActionGroup( myToolBar ); @@ -539,6 +562,7 @@ } } } + /*! Slot to be called to activate equalizer dialog. */ @@ -553,3 +577,17 @@ TX_EXIT } + +/*! + Slot to be called when library has been updated + */ +void MpPlaybackView::closeEqualizerDialog() +{ + TX_ENTRY + + if ( mEqualizerWidget ) { + mEqualizerWidget->close(); + } + + TX_EXIT +} diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/src/mpplaybackwidget.cpp --- a/mpviewplugins/mpplaybackviewplugin/src/mpplaybackwidget.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpplaybackviewplugin/src/mpplaybackwidget.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -143,6 +143,7 @@ mArtistName->setPlainText( mPlaybackData->artist() ); mAlbumName->setPlainText( mPlaybackData->album() ); mRealAudioIndicator->setVisible( mPlaybackData->realAudio() ); + emit signalPlaybackInfoChanged(); TX_EXIT } diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/tsrc/MATTI/feature_test_folder/QTMusicPlayer_BAT_playbackview.feature --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpplaybackviewplugin/tsrc/MATTI/feature_test_folder/QTMusicPlayer_BAT_playbackview.feature Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,114 @@ +Feature: As a test engineer I want to run BAT test cases for QT Music Player + + Scenario: Equalizer_Select a preset from list + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I Tap on Navi pane text area Music + When I select Equaliser from the Options menu + Then the Equaliser pop up is displayed + And Equaliser preset 1 is selected + When I select the Equaliser preset number 3 from the list + And I Tap on Navi pane text area Music + And I select Exit from the Options menu + Then the MusicPlayer application is not active + When the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I Tap on Navi pane text area Music + When I select Equaliser from the Options menu + Then the Equaliser preset 3 is selected + + Scenario: Repeat + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + And Repeat is set to ON + Then all songs are played and at the end it goes to the first one and stays in Playing + When I Tap on Navi pane text area Music + And I select Repeat off from the Options menu + And all songs are played and at the end it goes to the first one and stays in Paused + When the application is closed + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + And Repeat is set to OFF + + + + + + + + + + + + Scenario: Audio Effects view - Change settings and Exit + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I Tap on Navi pane text area Music + When I select Audio effects from the Options menu + Then the Audio effects pop up is displayed + And Audio effects settings are Balance 0 and Loudness Off + When I drag the slider to the Right 40 pixels + And I tap the Loudness toggle + Then Audio effects settings are Balance 25 and Loudness On + When the application is closed + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I Tap on Navi pane text area Music + When I select Audio effects from the Options menu + Then the Audio effects pop up is displayed + And Audio effects settings are Balance 25 and Loudness On + + Scenario: Playbackview options menu + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I Tap on Navi pane text area Music + Then the playback view options menu list is shown correctly + + Scenario: Now Playing View Q4- Activate shuffle- go back to Songs view and play another song - check shuffle is ON + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I set shuffle to ON + Then musicplayer plays the following songs after song 1 randomly + When I press the back button + And I select the song number 4 of the list + Then The song number 4 of the library is shown in playback view + And shuffle is set to ON + + Scenario: Now playing view H1- Shuffle OFF + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + When I set shuffle to OFF + And I wait until the song change + Then The song number 2 of the library is shown in playback view + And I wait until the song change + Then The song number 3 of the library is shown in playback view + Then the application is closed + + Scenario: Playback view control bar to FW,RW,Play-pause. + Given the MusicPlayer application is active + And I select the song number 1 of the list + Then The song number 1 of the library is shown in playback view + And the song in the playback view is Playing + When I press the button FW in the PlaybackToolbar + Then The song number 2 of the library is shown in playback view + And the song in the playback view is Playing + When I press the button RW in the PlaybackToolbar twice + Then The song number 1 of the library is shown in playback view + When I single press the button RW in the PlaybackToolbar and it is playing it starts from the beginning + When I press the button Pause in the PlaybackToolbar + Then the song in the playback view is Paused + When I press the button FW in the PlaybackToolbar + Then The song number 2 of the library is shown in playback view + Then the song in the playback view is Paused + When I press the button RW in the PlaybackToolbar + Then The song number 1 of the library is shown in playback view + Then the song in the playback view is Paused \ No newline at end of file diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpplaybackviewplugin/tsrc/MATTI/feature_test_folder/step_definitions/MusicPlayerSteps.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpviewplugins/mpplaybackviewplugin/tsrc/MATTI/feature_test_folder/step_definitions/MusicPlayerSteps.rb Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,282 @@ +def mda(width,height) +a = Array.new(width) +a.map! { Array.new(height) } +return a +end + +def create_mp_constants +@Library = mda(4,3) +@Library[0] = ["Amen and Boys", "Stop It!!","Self Made Maps"] +@Library[1] = ["Emancipated Minor", "Ani Difranco","Red Letter Year"] +@Library[2] = ["Slowly", "Fauna","Dreamless"] +@Library[3] = ["Turkish March", "Daniel Bautista","Classics And Soundtracks"] + +@PlaybackToolBarOrder = {"Shuffle"=>0,"RW"=>1,"Pause"=>2,"Play"=>2,"FW"=>3,"Flip"=>4} + +@PlaybackViewOptionsMenu = {"Equaliser"=>0, "Audio effects"=>1, "Repeat off" =>2, "Exit" => 3} + +@EquiliserPresetsList = {"Off"=>0, "Bass booster"=>1, "Classical" =>2, "Jazz" => 3, "Pop"=>4 , "Rock"=> 5} + +@ShuffleOffIconConst = 'qtg_mono_shuffle_off' +@ShuffleOnIconConst = 'qtg_mono_shuffle' +@RWIconConst = 'qtg_mono_seek_previous' +@PauseIconConst = 'qtg_mono_pause' +@FWIconConst = 'qtg_mono_seek_next' +@InfoIconConst = 'qtg_mono_info' +@PlayIconConst = 'qtg_mono_play' + + +end + +require 'matti' +require 'spec/expectations' +require 'nokogiri' +require 'date' + +Before do + create_mp_constants + @sut = MATTI.sut(:Id=>'sut_s60_qt') +end + +After do + begin + @MPapp.close + rescue + end +end + +Given("the MusicPlayer application is active") do + @MPapp = @sut.run(:name => "musicplayer") +end + +Then("the MusicPlayer application is not active") do + verify_true(1, 'Music Player still running') {@sut.application.name != "musicplayer"} #Verify that the app that is in the foreground is not music player, if it is that means musicplayer is still running. +end + +When("I Tap on Navi pane text area Music") do + @MPapp.HbTitleBar.HbTitlePane.HbFrameItem.tap + @MenuContainer = @MPapp.HbMenu.HbMenuContainer +end + +When("I select the song number $element_num of the list") do |element_num| + @MPapp.HbListView(:name=>'allSongsList').HbListViewItem(:__index=>element_num.to_i-1).tap +end + +Then("The song with the title $song_title and artist $song_artist and album $song_album is shown in playback view") do |song_title, song_artist, song_album| + verify(10, "The song title is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem(:text => song_title)} + verify(10, "The song artist is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem( :text => song_artist)} + verify(10, "The song album is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem( :text => song_album)} +end + +Then("The song number $num of the library is shown in playback view") do |num| + verify(10, "The song title is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem(:text => @Library[num.to_i-1][0])} + verify(10, "The song artist is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem( :text => @Library[num.to_i-1][1])} + verify(10, "The song album is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem( :text => @Library[num.to_i-1][2])} +end + +Then ("musicplayer plays the following songs after song $num randomly") do |num| + @MPapp.MpPlaybackWidget.wait_for_signal(600, "signalPlaybackInfoChanged()") + title=@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem.attribute("Text") + artist=@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem.attribute("Text") + album=@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem.attribute("Text") + if title != @Library[num.to_i][0] or artist != @Library[num.to_i][1] or album != @Library[num.to_i][2] + else + @MPapp.MpPlaybackWidget.wait_for_signal(600, "signalPlaybackInfoChanged()") + verify_not(10, "The song title is being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem(:text => @Library[num.to_i+1][0])} + verify_not(10, "The song artist is being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem( :text => @Library[num.to_i+1][1])} + verify_not(10, "The song album is being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem( :text => @Library[num.to_i+1][2])} + end +end + +Then("the song in the playback view is $playback_status") do |playback_status| + verify(5, "The status of the playback view is not the spected"){@MPapp.MpPlaybackView(:PlaybackStatus => playback_status)} + lb_init = @MPapp.HbProgressSlider( :name => 'progressBar' ).HbTextItem(:__index => 0).attribute("Text") + sleep 5 + lb_fin = @MPapp.HbProgressSlider( :name => 'progressBar' ).HbTextItem(:__index => 0).attribute("Text") + if playback_status == 'Playing' + verify_true(1,"Time label didn't change") {lb_init != lb_fin} + end + if playback_status == 'Paused' + verify_true(1,"Time label didn't change") {lb_init == lb_fin} + end +end + +When ("I press the button $button in the PlaybackToolbar") do |button| + verify_true(5,"Icon is not correct"){@MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch(button)).HbIconItem.attribute("iconName") == getPlaybackToolbarIconName(button)} + @MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch(button)).tap +end + +When ("I sleep $number $min_sec") do |number, min_sec| + time_to_wait = 0 + if(min_sec == "seconds") + time_to_wait = number.to_i + end + if(min_sec == "minutes") + time_to_wait = number.to_i*60 + end + puts time_to_wait.to_s + sleep time_to_wait +end + +When ("I wait until the song change") do + @MPapp.MpPlaybackWidget.wait_for_signal(600, "signalPlaybackInfoChanged()") +end + +def to_true_false(param) + if param == true or param == "ON" + return "true" + end + if param == false or param == "OFF" + return "false" + end +end + +When ("I set shuffle to $on_off") do |on_off| + if @MPapp.MpPlaybackView.attribute("Shuffle") != to_true_false(on_off) + @MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("Shuffle")).tap + end + verify_true(2,"Shuffle is not the expected value"){@MPapp.MpPlaybackView.attribute("Shuffle") == to_true_false(on_off)} + if on_off == "ON" + verify_true(5,"Shuffle icon is not correct"){@MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("Shuffle")).HbIconItem.attribute("iconName") == @ShuffleOnIconConst} + end + if on_off == "OFF" + verify_true(5,"Shuffle icon is not correct"){@MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("Shuffle")).HbIconItem.attribute("iconName") == @ShuffleOffIconConst} + end + +end + +When("shuffle is set to $on_off") do |on_off| + verify_true(3,"Shuffle is not the expected value"){@MPapp.MpPlaybackView.attribute("Shuffle") == to_true_false(on_off)} + if on_off == "ON" + verify_true(5,"Shuffle icon is not correct"){@MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("Shuffle")).HbIconItem.attribute("iconName") == @ShuffleOnIconConst} + end + if on_off == "OFF" + verify_true(5,"Shuffle icon is not correct"){@MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("Shuffle")).HbIconItem.attribute("iconName") == @ShuffleOffIconConst} + end +end + +When ("I press the button $button in the PlaybackToolbar twice") do |button| + @MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch(button)).tap(2) +end + +When("I press the back button") do + @MPapp.HbTitleBar.HbNavigationButton.tap +end + +When ("I single press the button RW in the PlaybackToolbar and it is playing it starts from the beginning") do + lb_init = @MPapp.HbProgressSlider( :name => 'progressBar' ).HbTextItem(:__index => 0).attribute("Text") + @MPapp.HbToolBar( :name => 'PlaybackToolbar' ).HbToolButton(:__index => @PlaybackToolBarOrder.fetch("RW")).tap + lb_fin = @MPapp.HbProgressSlider( :name => 'progressBar' ).HbTextItem(:__index => 0).attribute("Text") + verify_true(1,"It didn't start from the beginning"){lb_init > lb_fin} +end + +When("I select $item from the Options menu") do |item| + @MenuContainer.HbMenuItem(:__index=> @PlaybackViewOptionsMenu.fetch(item)).tap +end + +Then ("the playback view options menu list is shown correctly") do + i = 0 + while i < @PlaybackViewOptionsMenu.length do + verify_true(2,"Menu item is incorrect"){@MenuContainer.HbMenuItem(:__index=> i).HbTextItem.attribute("Text") == @PlaybackViewOptionsMenu.index(i)} + i = i +1 + end + + # @PlaybackViewOptionsMenu.each{|key, value| verify_true(2,"Menu item is incorrect"){@MenuContainer.HbMenuItem(:__index=> value).HbTextItem.attribute("Text") == key} } +end + +Then ("the Equaliser pop up is displayed") do + verify(3, "Equiliser pop up is not displayed"){@MPapp.MpEqualizerWidget} + i = 0 + while i < @EquiliserPresetsList.length do + puts i.to_s + puts @MPapp.MpEqualizerWidget.HbRadioButtonList.HbListViewItem(:__index=> i).HbTextItem.attribute("Text") + puts @EquiliserPresetsList.index(i) + verify_true(2,"Menu item is incorrect"){@MPapp.MpEqualizerWidget.HbRadioButtonList.HbListViewItem(:__index=> i).HbTextItem.attribute("Text") == @EquiliserPresetsList.index(i)} + i = i+1 + end +end + +Then ("Equaliser preset $num is selected") do |num| + + verify_true(3, "Item is not selected"){@MPapp.MpEqualizerWidget.HbRadioButtonList.HbListViewItem(:__index=> num.to_i-1).HbIconItem.attribute("iconName") == "qtg_small_radio_selected"} +end + +When ("I select the Equaliser preset number $num from the list") do |num| + @MPapp.MpEqualizerWidget.HbRadioButtonList.HbListViewItem(:__index=>num.to_i - 1).tap + @MPapp.MpEqualizerWidget.HbToolBar.HbTextItem( :text => 'OK' ).tap +end + +Then ("the Audio effects pop up is displayed") do + verify(3, "Audio effects pop up is not displayed"){@MPapp.MpSettingsAudioEffectsWidget} + verify(3, "Balance slider is not present") {@MPapp.MpSettingsAudioEffectsWidget.HbSlider} + verify(3, "Loudness toggle is not present"){@MPapp.MpSettingsAudioEffectsWidget.HbToggleItem} +end + +Then ("Audio effects settings are Balance $balance_value and Loudness $loudness_value") do |balance_value, loudness_value| + verify_true(3,"Balance value is not the expected"){@MPapp.MpSettingsAudioEffectsWidget.HbSlider.attribute("sliderPosition").to_i == balance_value.to_i} + verify_true(3,"Loudness value is not the expected"){@MPapp.MpSettingsAudioEffectsWidget.HbToggleItem.attribute("Text") == loudness_value} +end + +When("I drag the slider to the $dir $num_pix pixels") do |dir, num_pix| + @MPapp.MpSettingsAudioEffectsWidget.HbSliderHandle.drag(to_direction(dir), num_pix, :Left) +end + +When("the application is closed") do + @MPapp.close +end + +When("I tap the Loudness toggle") do + @MPapp.MpSettingsAudioEffectsWidget.HbToggleItem.tap +end + +When("Repeat is set to $on_off") do |on_off| + verify_true(3,"Repeat is not the expected value"){@MPapp.MpPlaybackView.attribute("Repeat") == to_true_false(on_off)} +end + +Then ("all songs are played and at the end it goes to the first one and stays in $playback_status") do |playback_status| + i = 0 + while i < @Library.length do + verify(10, "The song title is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem(:text => @Library[i][0])} + verify(10, "The song artist is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem( :text => @Library[i][1])} + verify(10, "The song album is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem( :text => @Library[i][2])} + + @MPapp.MpPlaybackWidget.wait_for_signal(720, "signalPlaybackInfoChanged()") + i = i+1 + end + verify(10, "The song title is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'songText').HbTextItem(:text => @Library[0][0])} + verify(10, "The song artist is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'artistText').HbTextItem( :text => @Library[0][1])} + verify(10, "The song album is not being displayed") {@MPapp.HbLabel(:visibleOnScreen => 'true', :name => 'albumText').HbTextItem( :text => @Library[0][2])} + verify_true(5, "The status of the playback view is not the spected"){@MPapp.MpPlaybackView.attribute("PlaybackStatus") == playback_status or @MPapp.MpPlaybackView.attribute("PlaybackStatus") == "Stopped"} +end + +def to_direction(string) + case string + when "Right" + return :Right + when "Left" + return :Left + when "Up" + return :Up + when "Down" + return :Down + end +end + +def getPlaybackToolbarIconName(button) + case button + when "RW" + return @RWIconConst + when "Pause" + return @PauseIconConst + when "FW" + return @FWIconConst + when "Info" + return @InfoIconConst + when "Play" + return @PlayIconConst + end + +end + + + diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpsettingsviewplugin/mpsettingsviewplugin.pro --- a/mpviewplugins/mpsettingsviewplugin/mpsettingsviewplugin.pro Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpsettingsviewplugin/mpsettingsviewplugin.pro Fri Jun 11 19:36:32 2010 -0500 @@ -14,40 +14,38 @@ # Description: # -symbian:TARGET.UID3 = 0x10207C66 - TEMPLATE = lib CONFIG += hb qt ecomplugin TARGET = mpsettingsviewplugin +symbian: { + TARGET.UID3 = 0x10207C66 + TARGET.CAPABILITY = All -TCB + TARGET.EPOCALLOWDLLDATA = 1 +} SERVICE.INTERFACE_NAME = org.nokia.mmdt.MpxViewPlugin/1.0 SERVICE.CONFIGURATION = "0x101FFCA2EMPXViewPluginPriorityLowest" -TARGET.CAPABILITY = All -TCB - DEPENDPATH += . INCLUDEPATH += . \ - inc \ - ../../inc \ - ../../mpserviceplugins/inc - + inc \ + ../../inc INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -LIBS += -lmpxplaybackutility.dll \ - -lestor.dll \ - -lmpxviewframeworkqt.dll \ - -lmpengine.dll - -symbian:TARGET.EPOCALLOWDLLDATA = 1 +LIBS += -lmpxplaybackutility \ + -lestor \ + -lmpxviewframeworkqt \ + -lmpengine +# Input HEADERS += ../../inc/mpviewbase.h \ - inc/mpsettingsviewplugin.h \ - inc/mpsettingsview.h \ - inc/mpsettingsaudioeffectswidget.h + inc/mpsettingsviewplugin.h \ + inc/mpsettingsview.h \ + inc/mpsettingsaudioeffectswidget.h SOURCES += src/mpsettingsviewplugin.cpp \ - src/mpsettingsview.cpp \ - src/mpsettingsaudioeffectswidget.cpp + src/mpsettingsview.cpp \ + src/mpsettingsaudioeffectswidget.cpp RESOURCES += resources/mpsettingsview.qrc diff -r a0afa279b8fe -r eb79a7c355bf mpviewplugins/mpsettingsviewplugin/src/mpsettingsview.cpp --- a/mpviewplugins/mpsettingsviewplugin/src/mpsettingsview.cpp Fri May 28 19:46:01 2010 -0500 +++ b/mpviewplugins/mpsettingsviewplugin/src/mpsettingsview.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -18,8 +18,6 @@ #include #include #include -#include -#include #include "mpsettingsview.h" #include "mpsettingsaudioeffectswidget.h" @@ -68,19 +66,6 @@ { TX_ENTRY - //Load musicplayer translator - QTranslator translator; - QString lang = QLocale::system().name(); - QString path = QString("z:/resource/qt/translations/"); - - bool translatorLoaded = false; - translatorLoaded = translator.load(path + "musicplayer_" + lang); - TX_LOG_ARGS("Loading musicplayer translator ok=" << translatorLoaded); - if ( translatorLoaded ) { - qApp->installTranslator( &translator ); - - } - mWindow = mainWindow(); mSoftKeyBack = new HbAction(Hb::BackNaviAction, this); mAudioEffectsWidget = new MpSettingsAudioEffectsWidget(this); diff -r a0afa279b8fe -r eb79a7c355bf musicservices/bwins/musicservices.def --- a/musicservices/bwins/musicservices.def Fri May 28 19:46:01 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -EXPORTS - ?currentService@MusicServices@@QAE?AW4MusicService@1@XZ @ 1 NONAME ; enum MusicServices::MusicService MusicServices::currentService(void) - ?trUtf8@MusicServices@@SA?AVQString@@PBD0@Z @ 2 NONAME ; class QString MusicServices::trUtf8(char const *, char const *) - ?qt_metacast@MusicServices@@UAEPAXPBD@Z @ 3 NONAME ; void * MusicServices::qt_metacast(char const *) - ?trUtf8@MusicServices@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString MusicServices::trUtf8(char const *, char const *, int) - ?qt_metacall@MusicServices@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int MusicServices::qt_metacall(enum QMetaObject::Call, int, void * *) - ?contextTitle@MusicServices@@QBE?AVQString@@XZ @ 6 NONAME ; class QString MusicServices::contextTitle(void) const - ??0MusicServices@@QAE@XZ @ 7 NONAME ; MusicServices::MusicServices(void) - ??_EMusicServices@@UAE@I@Z @ 8 NONAME ; MusicServices::~MusicServices(unsigned int) - ?itemSelected@MusicServices@@QAEXVQString@@@Z @ 9 NONAME ; void MusicServices::itemSelected(class QString) - ?playReady@MusicServices@@IAEXABVXQSharableFile@@@Z @ 10 NONAME ; void MusicServices::playReady(class XQSharableFile const &) - ?tr@MusicServices@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString MusicServices::tr(char const *, char const *, int) - ?tr@MusicServices@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString MusicServices::tr(char const *, char const *) - ?getStaticMetaObject@MusicServices@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & MusicServices::getStaticMetaObject(void) - ?serviceActive@MusicServices@@IAEXVTUid@@@Z @ 14 NONAME ; void MusicServices::serviceActive(class TUid) - ?metaObject@MusicServices@@UBEPBUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const * MusicServices::metaObject(void) const - ?setCurrentService@MusicServices@@QAEXW4MusicService@1@@Z @ 16 NONAME ; void MusicServices::setCurrentService(enum MusicServices::MusicService) - ?staticMetaObject@MusicServices@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const MusicServices::staticMetaObject - ??1MusicServices@@UAE@XZ @ 18 NONAME ; MusicServices::~MusicServices(void) - ?playReady@MusicServices@@IAEXABVQString@@@Z @ 19 NONAME ; void MusicServices::playReady(class QString const &) - diff -r a0afa279b8fe -r eb79a7c355bf musicservices/bwins/musicservicesu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/musicservices/bwins/musicservicesu.def Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,21 @@ +EXPORTS + ?currentService@MusicServices@@QAE?AW4MusicService@1@XZ @ 1 NONAME ; enum MusicServices::MusicService MusicServices::currentService(void) + ?trUtf8@MusicServices@@SA?AVQString@@PBD0@Z @ 2 NONAME ; class QString MusicServices::trUtf8(char const *, char const *) + ?qt_metacast@MusicServices@@UAEPAXPBD@Z @ 3 NONAME ; void * MusicServices::qt_metacast(char const *) + ?trUtf8@MusicServices@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString MusicServices::trUtf8(char const *, char const *, int) + ?qt_metacall@MusicServices@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int MusicServices::qt_metacall(enum QMetaObject::Call, int, void * *) + ?contextTitle@MusicServices@@QBE?AVQString@@XZ @ 6 NONAME ; class QString MusicServices::contextTitle(void) const + ??0MusicServices@@QAE@XZ @ 7 NONAME ; MusicServices::MusicServices(void) + ??_EMusicServices@@UAE@I@Z @ 8 NONAME ; MusicServices::~MusicServices(unsigned int) + ?itemSelected@MusicServices@@QAEXVQString@@@Z @ 9 NONAME ; void MusicServices::itemSelected(class QString) + ?playReady@MusicServices@@IAEXABVXQSharableFile@@@Z @ 10 NONAME ; void MusicServices::playReady(class XQSharableFile const &) + ?tr@MusicServices@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString MusicServices::tr(char const *, char const *, int) + ?tr@MusicServices@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString MusicServices::tr(char const *, char const *) + ?getStaticMetaObject@MusicServices@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & MusicServices::getStaticMetaObject(void) + ?serviceActive@MusicServices@@IAEXVTUid@@@Z @ 14 NONAME ; void MusicServices::serviceActive(class TUid) + ?metaObject@MusicServices@@UBEPBUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const * MusicServices::metaObject(void) const + ?setCurrentService@MusicServices@@QAEXW4MusicService@1@@Z @ 16 NONAME ; void MusicServices::setCurrentService(enum MusicServices::MusicService) + ?staticMetaObject@MusicServices@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const MusicServices::staticMetaObject + ??1MusicServices@@UAE@XZ @ 18 NONAME ; MusicServices::~MusicServices(void) + ?playReady@MusicServices@@IAEXABVQString@@@Z @ 19 NONAME ; void MusicServices::playReady(class QString const &) + diff -r a0afa279b8fe -r eb79a7c355bf musicservices/eabi/musicservices.def --- a/musicservices/eabi/musicservices.def Fri May 28 19:46:01 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -EXPORTS - _ZN13MusicServices11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME - _ZN13MusicServices11qt_metacastEPKc @ 2 NONAME - _ZN13MusicServices12itemSelectedE7QString @ 3 NONAME - _ZN13MusicServices13serviceActiveE4TUid @ 4 NONAME - _ZN13MusicServices14currentServiceEv @ 5 NONAME - _ZN13MusicServices16staticMetaObjectE @ 6 NONAME DATA 16 - _ZN13MusicServices17setCurrentServiceENS_12MusicServiceE @ 7 NONAME - _ZN13MusicServices19getStaticMetaObjectEv @ 8 NONAME - _ZN13MusicServices9playReadyERK14XQSharableFile @ 9 NONAME - _ZN13MusicServices9playReadyERK7QString @ 10 NONAME - _ZN13MusicServicesC1Ev @ 11 NONAME - _ZN13MusicServicesC2Ev @ 12 NONAME - _ZN13MusicServicesD0Ev @ 13 NONAME - _ZN13MusicServicesD1Ev @ 14 NONAME - _ZN13MusicServicesD2Ev @ 15 NONAME - _ZNK13MusicServices10metaObjectEv @ 16 NONAME - _ZNK13MusicServices12contextTitleEv @ 17 NONAME - _ZTI13MusicServices @ 18 NONAME - _ZTV13MusicServices @ 19 NONAME - diff -r a0afa279b8fe -r eb79a7c355bf musicservices/eabi/musicservicesu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/musicservices/eabi/musicservicesu.def Fri Jun 11 19:36:32 2010 -0500 @@ -0,0 +1,21 @@ +EXPORTS + _ZN13MusicServices11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN13MusicServices11qt_metacastEPKc @ 2 NONAME + _ZN13MusicServices12itemSelectedE7QString @ 3 NONAME + _ZN13MusicServices13serviceActiveE4TUid @ 4 NONAME + _ZN13MusicServices14currentServiceEv @ 5 NONAME + _ZN13MusicServices16staticMetaObjectE @ 6 NONAME DATA 16 + _ZN13MusicServices17setCurrentServiceENS_12MusicServiceE @ 7 NONAME + _ZN13MusicServices19getStaticMetaObjectEv @ 8 NONAME + _ZN13MusicServices9playReadyERK14XQSharableFile @ 9 NONAME + _ZN13MusicServices9playReadyERK7QString @ 10 NONAME + _ZN13MusicServicesC1Ev @ 11 NONAME + _ZN13MusicServicesC2Ev @ 12 NONAME + _ZN13MusicServicesD0Ev @ 13 NONAME + _ZN13MusicServicesD1Ev @ 14 NONAME + _ZN13MusicServicesD2Ev @ 15 NONAME + _ZNK13MusicServices10metaObjectEv @ 16 NONAME + _ZNK13MusicServices12contextTitleEv @ 17 NONAME + _ZTI13MusicServices @ 18 NONAME + _ZTV13MusicServices @ 19 NONAME + diff -r a0afa279b8fe -r eb79a7c355bf musicservices/musicservices.pro --- a/musicservices/musicservices.pro Fri May 28 19:46:01 2010 -0500 +++ b/musicservices/musicservices.pro Fri Jun 11 19:36:32 2010 -0500 @@ -14,38 +14,32 @@ # Description: Project file for Music Services. # -symbian:TARGET.UID3 = 0x10207C69 - TEMPLATE = lib CONFIG += hb TARGET = musicservices - -TARGET.CAPABILITY = CAP_GENERAL_DLL +symbian: { + TARGET.UID3 = 0x10207C69 + MMP_RULES += "DEFFILE musicservices.def" + defFilePath = . + TARGET.CAPABILITY = CAP_GENERAL_DLL + TARGET.EPOCALLOWDLLDATA = 1 +} +DEFINES += BUILD_MUSICSERVICES_LIB INCLUDEPATH += . \ - inc \ - ../inc + inc \ + ../inc INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE LIBS += -lxqservice \ -lxqserviceutil -symbian:TARGET.EPOCALLOWDLLDATA = 1 - +# Input HEADERS += inc/musicservices.h \ - inc/getmusicservice.h \ - inc/playmusicservice.h + inc/getmusicservice.h \ + inc/playmusicservice.h SOURCES += src/musicservices.cpp \ - src/getmusicservice.cpp \ - src/playmusicservice.cpp - -DEFINES += BUILD_MUSICSERVICES_LIB + src/getmusicservice.cpp \ + src/playmusicservice.cpp -myDefInclude = "NOSTRICTDEF" \ -"$${LITERAL_HASH}if defined(WINS)"\ -"DEFFILE bwins/musicservices.def "\ -"$${LITERAL_HASH}else "\ -"DEFFILE eabi/musicservices.def "\ -"$${LITERAL_HASH}endif" -MMP_RULES += myDefInclude diff -r a0afa279b8fe -r eb79a7c355bf qtmusicplayer.pro --- a/qtmusicplayer.pro Fri May 28 19:46:01 2010 -0500 +++ b/qtmusicplayer.pro Fri Jun 11 19:36:32 2010 -0500 @@ -38,11 +38,11 @@ include(mpserviceplugins/m3uplaylistplugin/rom/rom.pri) } -SUBDIRS = utilities \ +SUBDIRS = mpdata \ + mpengine \ + utilities \ musicservices \ app \ - mpdata \ - mpengine \ mpviewplugins \ musicwidgetplugin diff -r a0afa279b8fe -r eb79a7c355bf tsrc/tsrc.pro --- a/tsrc/tsrc.pro Fri May 28 19:46:01 2010 -0500 +++ b/tsrc/tsrc.pro Fri Jun 11 19:36:32 2010 -0500 @@ -18,6 +18,7 @@ SUBDIRS += ..\mpdata\tsrc SUBDIRS += ..\mpengine\tsrc +SUBDIRS += ..\app\tsrc SUBDIRS += ..\mpviewplugins\mpcollectionviewplugin\tsrc SUBDIRS += ..\mpviewplugins\mpmediawallviewplugin\tsrc SUBDIRS += ..\mpviewplugins\mpplaybackviewplugin\tsrc diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpnowplayingbanner/mpnowplayingbanner.pro --- a/utilities/mpnowplayingbanner/mpnowplayingbanner.pro Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpnowplayingbanner/mpnowplayingbanner.pro Fri Jun 11 19:36:32 2010 -0500 @@ -14,41 +14,34 @@ # Description: # -symbian:TARGET.UID3 = 0x10207C67 - TEMPLATE = lib CONFIG += hb qt HB += hbfeedback TARGET = mpnowplayingbanner - -TARGET.CAPABILITY = All -TCB +symbian: { + TARGET.UID3 = 0x10207C67 + MMP_RULES += "DEFFILE mpnowplayingbanner.def" + defFilePath = . + TARGET.CAPABILITY = CAP_GENERAL_DLL + TARGET.EPOCALLOWDLLDATA = 1 +} +DEFINES += BUILD_MPNOWPLAYINGBANNER INCLUDEPATH += . \ inc \ ../../inc INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -LIBS += -lmpengine \ - -lmpdata.dll \ - -lmpxcommon.dll +LIBS += -lmpengine \ + -lmpdata \ + -lmpxcommon -symbian:TARGET.EPOCALLOWDLLDATA = 1 - -HEADERS = ../../inc/mpnowplayingwidget.h \ - inc/mpnowplayingwidget_p.h +# Input +HEADERS += ../../inc/mpnowplayingwidget.h \ + inc/mpnowplayingwidget_p.h SOURCES += src/mpnowplayingwidget.cpp \ - src/mpnowplayingwidget_p.cpp \ - - + src/mpnowplayingwidget_p.cpp + RESOURCES += resources/mpnowplayingbanner.qrc -DEFINES += BUILD_MPNOWPLAYINGBANNER - -myDefInclude = "NOSTRICTDEF" \ -"$${LITERAL_HASH}if defined(WINS)"\ -"DEFFILE bwins/mpnowplayingbanneru.def "\ -"$${LITERAL_HASH}else "\ -"DEFFILE eabi/mpnowplayingbanneru.def "\ -"$${LITERAL_HASH}endif" -MMP_RULES += myDefInclude diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/bwins/mpsettingsmanageru.def --- a/utilities/mpsettingsmanager/bwins/mpsettingsmanageru.def Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/bwins/mpsettingsmanageru.def Fri Jun 11 19:36:32 2010 -0500 @@ -29,4 +29,7 @@ ?setSongDetailsGb@MpSettingsManager@@SAX_N@Z @ 28 NONAME ; void MpSettingsManager::setSongDetailsGb(bool) ?SongDetailsGbChanged@MpSettingsManager@@IAEX_N@Z @ 29 NONAME ; void MpSettingsManager::SongDetailsGbChanged(bool) ?songDetailsGb@MpSettingsManager@@SA_NXZ @ 30 NONAME ; bool MpSettingsManager::songDetailsGb(void) + ?mtpInfoUrl@MpSettingsManager@@SA?AVQString@@XZ @ 31 NONAME ; class QString MpSettingsManager::mtpInfoUrl(void) + ?showMtpInfo@MpSettingsManager@@SA_NXZ @ 32 NONAME ; bool MpSettingsManager::showMtpInfo(void) + ?stopShowingMtpInfo@MpSettingsManager@@SAXXZ @ 33 NONAME ; void MpSettingsManager::stopShowingMtpInfo(void) diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/conf/musicplayer.confml Binary file utilities/mpsettingsmanager/conf/musicplayer.confml has changed diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/conf/musicplayer_10207C92.crml Binary file utilities/mpsettingsmanager/conf/musicplayer_10207C92.crml has changed diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/eabi/mpsettingsmanageru.def --- a/utilities/mpsettingsmanager/eabi/mpsettingsmanageru.def Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/eabi/mpsettingsmanageru.def Fri Jun 11 19:36:32 2010 -0500 @@ -29,4 +29,7 @@ _ZN17MpSettingsManager13songDetailsGbEv @ 28 NONAME _ZN17MpSettingsManager16setSongDetailsGbEb @ 29 NONAME _ZN17MpSettingsManager20SongDetailsGbChangedEb @ 30 NONAME + _ZN17MpSettingsManager10mtpInfoUrlEv @ 31 NONAME + _ZN17MpSettingsManager11showMtpInfoEv @ 32 NONAME + _ZN17MpSettingsManager18stopShowingMtpInfoEv @ 33 NONAME diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/inc/mpsettingsmanagerdefs.h --- a/utilities/mpsettingsmanager/inc/mpsettingsmanagerdefs.h Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/inc/mpsettingsmanagerdefs.h Fri Jun 11 19:36:32 2010 -0500 @@ -26,7 +26,9 @@ const qint32 KMPCenRepSettingPresetIdKey = {0x00000004}; const qint32 KMPCenRepSettingRamdiskEnabled = {0x00000005}; const qint32 KMPCenRepSettingRamdiskMaxDiskSpace = {0x00000006}; - const qint32 KMPCenRepSettingInspireMeKey = {0x00000007}; - const qint32 KMPCenRepSettingSongDetailsGBKey = {0x00000008}; - + const qint32 KMPCenRepSettingInspireMeKey = {0x00000007}; + const qint32 KMPCenRepSettingSongDetailsGBKey = {0x00000008}; + const qint32 KMusicPlayerShowMtpInfoKey = {0x00000009}; + const qint32 KMusicPlayerMtpInfoUrlKey = {0x0000000A}; + #endif // MPSETTINGSMANAGERDEFS_H diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/mpsettingsmanager.pro --- a/utilities/mpsettingsmanager/mpsettingsmanager.pro Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/mpsettingsmanager.pro Fri Jun 11 19:36:32 2010 -0500 @@ -19,34 +19,28 @@ TEMPLATE = lib CONFIG += hb qt TARGET = mpsettingsmanager - -TARGET.CAPABILITY = All -TCB +symbian: { + TARGET.UID3 = 0x10207C68 + MMP_RULES += "DEFFILE mpsettingsmanager.def" + defFilePath = . + TARGET.CAPABILITY = CAP_GENERAL_DLL + TARGET.EPOCALLOWDLLDATA = 1 + BLD_INF_RULES.prj_exports += \ + "$${LITERAL_HASH}include " \ + "conf/musicplayer.confml APP_LAYER_CONFML(musicplayer.confml)" \ + "conf/musicplayer_10207C92.crml APP_LAYER_CRML(musicplayer_10207C92.crml)" +} +DEFINES += BUILD_MPSETTINGSMANAGER INCLUDEPATH += . \ inc \ ../../inc - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -LIBS+= -lxqsettingsmanager - -symbian:TARGET.EPOCALLOWDLLDATA = 1 - -HEADERS = ../../inc/mpsettingsmanager.h - -SOURCES += src/mpsettingsmanager.cpp -DEFINES += BUILD_MPSETTINGSMANAGER - +LIBS += -lxqsettingsmanager.dll -myDefInclude = "NOSTRICTDEF" \ -"$${LITERAL_HASH}if defined(WINS)"\ -"DEFFILE bwins/mpsettingsmanageru.def "\ -"$${LITERAL_HASH}else "\ -"DEFFILE eabi/mpsettingsmanageru.def "\ -"$${LITERAL_HASH}endif" -MMP_RULES += myDefInclude +# Input +HEADERS += ../../inc/mpsettingsmanager.h -BLD_INF_RULES.prj_exports += \ - "$${LITERAL_HASH}include " \ - "conf/musicplayer.confml APP_LAYER_CONFML(musicplayer.confml)" \ - "conf/musicplayer_10207C92.crml APP_LAYER_CRML(musicplayer_10207C92.crml)" +SOURCES += src/mpsettingsmanager.cpp + diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/src/mpsettingsmanager.cpp --- a/utilities/mpsettingsmanager/src/mpsettingsmanager.cpp Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/src/mpsettingsmanager.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -93,6 +93,17 @@ KMPCenRepSettingSongDetailsGBKey); mSongDetailsGb = mSettingsManager->readItemValue(SongDetailsGbKey).toInt(); mSettingsManager->startMonitoring(SongDetailsGbKey); + + XQSettingsKey showMtpInfo(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMusicPlayerShowMtpInfoKey); + mShowMtpInfo = mSettingsManager->readItemValue(showMtpInfo).toInt(); + mSettingsManager->startMonitoring(showMtpInfo); + + XQSettingsKey mtpInfoUrl(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMusicPlayerMtpInfoUrlKey); + mMtpInfoUrl = mSettingsManager->readItemValue(mtpInfoUrl, XQSettingsManager::TypeString).toString(); TX_EXIT } @@ -161,6 +172,22 @@ return instance()->mSongDetailsGb; } +/*! + Returns wheter mtp info should be showed. + */ +bool MpSettingsManager::showMtpInfo() +{ + return instance()->mShowMtpInfo; +} + +/*! + Returns mtp info url. + */ +QString MpSettingsManager::mtpInfoUrl() +{ + return instance()->mMtpInfoUrl; +} + /*! Slot to be called when a setting is changed. @@ -195,6 +222,10 @@ TX_LOG_ARGS("SongDetailsGB changed to "<< mSongDetailsGb); emit SongDetailsGbChanged( mSongDetailsGb ); break; + case KMusicPlayerShowMtpInfoKey: + mShowMtpInfo = value.toInt(); + TX_LOG_ARGS("Show MTP info changed to "<< mShowMtpInfo); + break; default : TX_LOG_ARGS(" unhandled cenrep key: " << key.key() << "; should never get here."); @@ -277,3 +308,16 @@ TX_EXIT } +/*! + Slot to be called to stop showing mtp info. + */ +void MpSettingsManager::stopShowingMtpInfo() +{ + TX_STATIC_ENTRY_ARGS("preset=" << preset); + XQSettingsKey showMtpInfo(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMusicPlayerShowMtpInfoKey); + instance()->mSettingsManager->writeItemValue(showMtpInfo, 0); + TX_EXIT +} + diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/inc/unittest_mpsettingsmanager.h --- a/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/inc/unittest_mpsettingsmanager.h Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/inc/unittest_mpsettingsmanager.h Fri Jun 11 19:36:32 2010 -0500 @@ -41,13 +41,20 @@ private slots: void testConstructor(); //don't change the order, this should be the first test. void testInstanceConstruction(); + void testFirstStartupGet(); void testShuffleGetAndSet(); void testRepeatGetAndSet(); void testPresetGetAndSet(); + void testInspireMeGetAndSet(); + void testSongDetailsGbGetAndSet(); + void testShowMtpInfoGetAndStop(); + void testMtpInfoUrlGet(); void testValueChangedShuffleCase(); void testValueChangedRepeatCase(); void testValueChangedPresetCase(); - + void testValueChangedInspireMe(); + void testValueChangedSongDetailsGb(); + void testValueChangedShowMtpInfo(); }; diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/src/unittest_mpsettingsmanager.cpp --- a/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/src/unittest_mpsettingsmanager.cpp Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/src/unittest_mpsettingsmanager.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -51,7 +51,7 @@ pass[2] = "c:\\data\\unittest_mpsettingsmanager.txt"; return QTest::qExec(&tv, 3, pass); - } + } } TestMpSettingsManager::TestMpSettingsManager() @@ -102,15 +102,40 @@ test = new MpSettingsManager(); QVERIFY(test); QVERIFY(test->mSettingsManager); - + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingFirstStartupKey),1); + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingFirstStartupKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingFirstStartupKey),0); + QCOMPARE(test->mFirstStartup, true); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingShuffleKey),1); QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingShuffleKey), 1); QCOMPARE(test->mShuffle, true); - + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingRepeatKey),1); QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingRepeatKey),1); QCOMPARE(test->mRepeat, true); - + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingPresetIdKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingPresetIdKey),1); + QCOMPARE(test->mPreset, 1); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingInspireMeKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingInspireMeKey),1); + QCOMPARE(test->mInspireMe, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingSongDetailsGBKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingSongDetailsGBKey),1); + QCOMPARE(test->mSongDetailsGb, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerShowMtpInfoKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerShowMtpInfoKey),1); + QCOMPARE(test->mShowMtpInfo, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerMtpInfoUrlKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerMtpInfoUrlKey),0); + QCOMPARE(test->mMtpInfoUrl, QString("testText")); + delete test; test = 0; } @@ -124,19 +149,56 @@ test = MpSettingsManager::instance(); QVERIFY(test); QVERIFY(test->mSettingsManager); - + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingFirstStartupKey),1); + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingFirstStartupKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingFirstStartupKey),0); + QCOMPARE(test->mFirstStartup, true); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingShuffleKey),1); QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingShuffleKey), 1); QCOMPARE(test->mShuffle, true); - + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingRepeatKey),1); QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingRepeatKey),1); QCOMPARE(test->mRepeat, true); - + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingPresetIdKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingPresetIdKey),1); + QCOMPARE(test->mPreset, 1); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingInspireMeKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingInspireMeKey),1); + QCOMPARE(test->mInspireMe, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingSongDetailsGBKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingSongDetailsGBKey),1); + QCOMPARE(test->mSongDetailsGb, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerShowMtpInfoKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerShowMtpInfoKey),1); + QCOMPARE(test->mShowMtpInfo, true); + + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerMtpInfoUrlKey),1); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerMtpInfoUrlKey),0); + QCOMPARE(test->mMtpInfoUrl, QString("testText")); + QCOMPARE(test, MpSettingsManager::instance()); // test that instance returns the singleton } /*! +testFirstStartupGet + */ +void TestMpSettingsManager::testFirstStartupGet() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + + QCOMPARE(test->firstStartup(), true); + +} + +/*! testShuffleGetAndSet */ void TestMpSettingsManager::testShuffleGetAndSet() @@ -148,13 +210,13 @@ test->mShuffle = true; MpSettingsManager::setShuffle(false); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingShuffleKey),QVariant(false)); - QCOMPARE(test->mShuffle, true); //should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::shuffle(), true); //should not chaqnge until stored in cenrep test->mShuffle = false; test->setShuffle(true); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingShuffleKey),QVariant(true)); - QCOMPARE(test->mShuffle, false);//should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::shuffle(), false);//should not chaqnge until stored in cenrep //make sure there are not unecesary request to cenrep. QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingShuffleKey),2); @@ -174,13 +236,13 @@ test->mRepeat = true; MpSettingsManager::setRepeat(false); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingRepeatKey),QVariant(false)); - QCOMPARE(test->mRepeat, true); //should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::repeat(), true); //should not chaqnge until stored in cenrep test->mRepeat = false; test->setRepeat(true); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingRepeatKey),QVariant(true)); - QCOMPARE(test->mRepeat, false);//should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::repeat(), false);//should not chaqnge until stored in cenrep //make sure there are not unecesary request to cenrep. QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingRepeatKey),2); @@ -200,13 +262,13 @@ test->mPreset = 1; MpSettingsManager::setPreset(0); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingPresetIdKey),QVariant(0)); - QCOMPARE(test->mPreset, 1); //should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::preset(), 1); //should not chaqnge until stored in cenrep test->mPreset = 0; test->setPreset(1); QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingPresetIdKey),QVariant(1)); - QCOMPARE(test->mPreset, 0);//should not chaqnge until stored in cenrep + QCOMPARE(MpSettingsManager::preset(), 0);//should not chaqnge until stored in cenrep //make sure there are not unecesary request to cenrep. QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingPresetIdKey),2); @@ -215,6 +277,100 @@ } /*! +testInspireMeGetAndSet + */ +void TestMpSettingsManager::testInspireMeGetAndSet() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + test->mSettingsManager->clear(); + + test->mInspireMe = true; + MpSettingsManager::setInspireMe(false); + QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingInspireMeKey),QVariant(false)); + QCOMPARE(MpSettingsManager::inspireMe(), true); //should not chaqnge until stored in cenrep + + + test->mInspireMe = false; + test->setInspireMe(true); + QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingInspireMeKey),QVariant(true)); + QCOMPARE(MpSettingsManager::inspireMe(), false);//should not chaqnge until stored in cenrep + + //make sure there are not unecesary request to cenrep. + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingInspireMeKey), 2); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingInspireMeKey), 0); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingInspireMeKey), 0); +} + +/*! +testSongDetailsGbGetAndSet + */ +void TestMpSettingsManager::testSongDetailsGbGetAndSet() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + test->mSettingsManager->clear(); + + test->mSongDetailsGb = true; + MpSettingsManager::setSongDetailsGb(false); + QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingSongDetailsGBKey),QVariant(false)); + QCOMPARE(MpSettingsManager::songDetailsGb(), true); //should not chaqnge until stored in cenrep + + + test->mSongDetailsGb = false; + test->setSongDetailsGb(true); + QCOMPARE(test->mSettingsManager->writeRequestValue(KMPCenRepSettingSongDetailsGBKey),QVariant(true)); + QCOMPARE(MpSettingsManager::songDetailsGb(), false);//should not chaqnge until stored in cenrep + + //make sure there are not unecesary request to cenrep. + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMPCenRepSettingSongDetailsGBKey), 2); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMPCenRepSettingSongDetailsGBKey), 0); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMPCenRepSettingSongDetailsGBKey), 0); +} + +/*! +testShowMtpInfoGetAndStop + */ +void TestMpSettingsManager::testShowMtpInfoGetAndStop() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + test->mSettingsManager->clear(); + + test->mShowMtpInfo = true; + MpSettingsManager::stopShowingMtpInfo(); + QCOMPARE(test->mSettingsManager->writeRequestValue(KMusicPlayerShowMtpInfoKey),QVariant(false)); + QCOMPARE(MpSettingsManager::showMtpInfo(), true); //should not chaqnge until stored in cenrep + + + test->mShowMtpInfo = false; + QCOMPARE(MpSettingsManager::showMtpInfo(), false); + + //make sure there are not unecesary request to cenrep. + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMusicPlayerShowMtpInfoKey), 1); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerShowMtpInfoKey), 0); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerShowMtpInfoKey), 0); +} + +/*! +testMtpInfoUrlGet + */ +void TestMpSettingsManager::testMtpInfoUrlGet() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + test->mSettingsManager->clear(); + + test->mMtpInfoUrl = QString("http:\\nokia.com"); + QCOMPARE(MpSettingsManager::mtpInfoUrl(), QString("http:\\nokia.com")); + + //make sure there are not unecesary request to cenrep. + QCOMPARE(test->mSettingsManager->writeItemValueRequestCount(KMusicPlayerMtpInfoUrlKey), 0); + QCOMPARE(test->mSettingsManager->readItemValueRequestCount(KMusicPlayerMtpInfoUrlKey), 0); + QCOMPARE(test->mSettingsManager->startMonitoringRequestCount(KMusicPlayerMtpInfoUrlKey), 0); +} + +/*! testValueChangedShuffleCase. */ void TestMpSettingsManager::testValueChangedShuffleCase() @@ -286,5 +442,70 @@ } +/*! + testValueChangedInspireMe. + */ +void TestMpSettingsManager::testValueChangedInspireMe() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + + XQSettingsKey InspireMeKey(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMPCenRepSettingInspireMeKey); + test->mInspireMe = true; + test->valueChanged(InspireMeKey, QVariant(0)); + QCOMPARE(test->mInspireMe, false); + + test->mInspireMe = false; + QSignalSpy spy( test, SIGNAL(InspireMeChanged(bool) ) ); + test->mSettingsManager->emitValueChanged(InspireMeKey, QVariant(1)); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).at(0), QVariant(true) ); + QCOMPARE(test->mInspireMe, true); +} + +/*! + testValueChangedSongDetailsGb. + */ +void TestMpSettingsManager::testValueChangedSongDetailsGb() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + + XQSettingsKey SongDetailsGbKey(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMPCenRepSettingSongDetailsGBKey); + test->mSongDetailsGb = true; + test->valueChanged(SongDetailsGbKey, QVariant(0)); + QCOMPARE(test->mSongDetailsGb, false); + + test->mSongDetailsGb = false; + QSignalSpy spy( test, SIGNAL(SongDetailsGbChanged(bool) ) ); + test->mSettingsManager->emitValueChanged(SongDetailsGbKey, QVariant(1)); + QCOMPARE(spy.count(), 1); + QCOMPARE(spy.at(0).at(0), QVariant(true) ); + QCOMPARE(test->mSongDetailsGb, true); +} + +/*! + testValueChangedShowMtpInfo. + */ +void TestMpSettingsManager::testValueChangedShowMtpInfo() +{ + MpSettingsManager *test; + test = MpSettingsManager::instance(); + + XQSettingsKey showMtpInfo(XQSettingsKey::TargetCentralRepository, + KMPCenRepSettingsFeature, + KMusicPlayerShowMtpInfoKey); + test->mShowMtpInfo = true; + test->valueChanged(showMtpInfo, QVariant(0)); + QCOMPARE(test->mShowMtpInfo, false); + + test->mShowMtpInfo = false; + test->mSettingsManager->emitValueChanged(showMtpInfo, QVariant(1)); + QCOMPARE(test->mShowMtpInfo, true); +} // End of file diff -r a0afa279b8fe -r eb79a7c355bf utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/stub/src/xqsettingsmanager.cpp --- a/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/stub/src/xqsettingsmanager.cpp Fri May 28 19:46:01 2010 -0500 +++ b/utilities/mpsettingsmanager/tsrc/unittest_mpsettingsmanager/stub/src/xqsettingsmanager.cpp Fri Jun 11 19:36:32 2010 -0500 @@ -38,15 +38,24 @@ */ QVariant XQSettingsManager::readItemValue(const XQSettingsKey& key, XQSettingsManager::Type type) { - Q_UNUSED(type); + if ( mReadCount.contains( key.key() ) ) { mReadCount.insert(key.key(), mReadCount.take ( key.key() ) + 1 ); } else { mReadCount.insert(key.key(), 1); } - // 1 seems compatible for int and bool keys, change it if new key types are added. - return QVariant(1); + + QVariant result; + switch ( type ) { + case TypeString : + result = QString("testText") ; + break; + default: + result = int(1); + break; + } + return result; } /*!