FCL/sf/mw/hb: comparison src/hbwidgets/sliders/hbratingslider.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
 #include "hbratingslider_p.h"
+#include "hbrepeatitem_p.h"
 #include <hbratingslider.h>
 #include <hbtooltip.h>
 #include <hbstyleoptionratingslider_p.h>
-#include <QGraphicsItem>
-#include <QGraphicsSceneMouseEvent>
 #include <hbtoucharea.h>
 #include <hbwidgetfeedback.h>
 #ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
 #include "hbeffectinternal_p.h"
 #define HB_RATINGSLIDER_ITEM_TYPE "HB_RATINGSLIDER"
 #endif
+#include <QGraphicsSceneMouseEvent>
 #define MAX_NUMBER_OF_ICONS 10
 HbRatingSliderPrivate::HbRatingSliderPrivate():
 mMousePressed(false),
 mLookupValues(0),
 mReadOnly(false),
 mNumberOfIcons(5),
 mStepCount(5),
 mCurrentValue(0),
-mFrame(0),
+mUnRatedItem(0),
-mTrack(0),
+mRatedItem(0),
-mLayoutItem(0),
+mBackGroundItem(0),
-mUnratedIconName(""),
 mTouchArea(0),
-mRatedIconName("")
+mToolTipArea(0)
 {
 }
 HbRatingSliderPrivate::~HbRatingSliderPrivate()
 {
 if(mLookupValues) {
 delete [] mLookupValues;
 }
 }
+/*
+Initializes widget primitives
+*/
 void HbRatingSliderPrivate::init()
 {
 Q_Q(HbRatingSlider);
-mLayoutItem = q->style()->createPrimitive(HbStyle::P_RatingSlider_layout,q);
-mFrame = q->style()->createPrimitive(HbStyle::P_RatingSlider_frame,mLayoutItem);
+mBackGroundItem = new HbWidgetBase(q);
-mTrack = q->style()->createPrimitive(HbStyle::P_RatingSlider_track,mFrame);
+HbStyle::setItemName(mBackGroundItem, "background");
-mTouchArea = q->style()->createPrimitive(HbStyle::P_RatingSlider_toucharea, q);
+mUnRatedItem = new HbRepeatItem(mBackGroundItem);
-q->updatePrimitives();
+HbStyle::setItemName(mUnRatedItem, "unrated-item");
+mRatedItem = new HbRepeatMaskItem(mUnRatedItem);
+HbStyle::setItemName(mRatedItem, "rated-item");
+mTouchArea =  q->style()->createPrimitive(HbStyle::PT_TouchArea, "toucharea",q);
+mTouchArea->setFlag(QGraphicsItem::ItemIsFocusable);
+q->setHandlesChildEvents(true);
+//q->updatePrimitives();
 #ifdef HB_EFFECTS
 HbEffectInternal::add(HB_RATINGSLIDER_ITEM_TYPE,"ratingslider_appear", "ratingslider_appear");
 HbEffectInternal::add(HB_RATINGSLIDER_ITEM_TYPE,"ratingslider_disappear", "ratingslider_disappear");
 #endif
 #ifdef HB_GESTURE_FW
 q->grabGesture(Qt::TapGesture);
 q->grabGesture(Qt::PanGesture);
-if(QGraphicsObject *touchArea = mTouchArea->toGraphicsObject()) {
+mTouchArea->grabGesture(Qt::TapGesture);
-touchArea->grabGesture(Qt::TapGesture);
+mTouchArea->grabGesture(Qt::PanGesture);
-touchArea->grabGesture(Qt::PanGesture);
-}
 #endif
 }
+/*
+Creates a lookup table which stores the bandwidth calculation for each star.
+Decision will be made based on this LookupTable values for touch
+point/position identification.
+*/
 void HbRatingSliderPrivate::createLookupTable()
 {
 if(mLookupValues) {
 delete [] mLookupValues;
 mLookupValues=0;
 }
 mLookupValues = new int[mStepCount];
-qreal width = mFrame->boundingRect().width();
+qreal width = mUnRatedItem->boundingRect().width();
 int bandWidth =(int) (width/mStepCount);
 for(int i=0;i < mStepCount;i++) {
 mLookupValues[i] = bandWidth*(i+1);
 }
 }
+/*
+Returns the exact count for the touch position based
+on the LookupTable array values.
+*/
 int HbRatingSliderPrivate::calculateProgressValue(qreal pos)
 {
 Q_Q(HbRatingSlider);
-int count=0;
-for(count=0;count< mStepCount ;count++) {
-if(pos <= mLookupValues[count])
-break;
-}
-if(q->layoutDirection() == Qt::RightToLeft) {
-count = mStepCount -count;
-}
-else {
-count++;
-}
 if (pos > mLookupValues[mStepCount-1]) {
 return -1;
 }
-return count;
+int count=0;
+for(;count< mStepCount ;count++) {
+if(pos <= mLookupValues[count])
+break;
+}
+if(q->layoutDirection() == Qt::RightToLeft) {
+count = mStepCount -count;
+}
+else {
+count++;
+}
+return count;
+}
+/*
+updates rated icon item
+*/
+void HbRatingSliderPrivate::updateRatedIconItem()
+{
+Q_Q(HbRatingSlider);
+if (mRatedItem) {
+HbRepeatMaskItem *repeatItem = static_cast<HbRepeatMaskItem*>(mRatedItem);
+repeatItem->setMaskValue(mCurrentValue);
+repeatItem->setMaximum(mStepCount);
+repeatItem->setInverted((q->layoutDirection() == Qt::RightToLeft));
+repeatItem->setRepeatingNumber(mNumberOfIcons);
+if (!mRatedIconName.isEmpty()) {
+repeatItem->setName(mRatedIconName);
+}
+else {
+if(!q->isEnabled()) {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_disabled"));
+}
+else {
+if(mMousePressed) {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_pressed"));
+}
+else {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated"));
+}
+}
+}
+repeatItem->setGeometry(q->boundingRect());
+repeatItem->update();
+}
+}
+/*
+updates unrated icon item
+*/
+void HbRatingSliderPrivate::updateUnRatedIconItem()
+{
+Q_Q(HbRatingSlider);
+if (mUnRatedItem) {
+HbRepeatItem *repeatItem = static_cast<HbRepeatItem*>(mUnRatedItem);
+repeatItem->setRepeatingNumber(mNumberOfIcons);
+if (!mUnratedIconName.isEmpty()) {
+repeatItem->setName(mUnratedIconName);
+}
+else {
+if(!q->isEnabled()) {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_disabled"));
+}
+else {
+if(mMousePressed) {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_pressed"));
+}
+else {
+repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated"));
+}
+}
+}
+repeatItem->setGeometry(q->boundingRect());
+repeatItem->update();
+}
 }
 /*!
 \class HbRatingSlider
 \brief This is a widget that enables a user to rate contents like videos , music etc.
 \image html ratingslider.png  "A Rating Slider with rating done"
-The default version of Rating Slider contains 5 repeated icons drawn side by side, using a single themed graphics.
+The default version of HbRatingSlider contains 5 repeated icons drawn side by side, using a single themed graphics.
 The application can replace the themed graphic with a custom graphic.
 The custom graphics should contain only one icon (eg one star)  which will be multipled by the API \a setNumberOfIcons().
 By default it is 5 and maximum number of icons are 10.
-Along with the rating Rating Slider can be used to show the cumulative rating also.
+Along with the rating HbRatingSlider can be used to show the cumulative rating also.
 To use HbRatingSlider with default settings it just needs to be created.
 example code:
 \code
 HbRatingSlider *object = new HbRatingSlider(parent);
 HbRatingSlider *slider = new HbRatingSlider();
 slider->setStepCount(50); //5 *10//
 slider->setCurrentRating(25); //2.5*10 it shows 25/50 which is same as 2.5/5
 \endcode
-This will show as 2.5/5. Now if on the same ratingslider
+This will show as 2.5/5. Now if on the same HbRatingSlider
 the Application wants to configure a Rating Slider with range 1-5
 on emitting the signal rating changed it can set to 5.
 */
 @beta
 Constructs a Rating Slider bar with the given parent.
 \param parent Parent Item.
 */
 HbRatingSlider::HbRatingSlider(QGraphicsItem *parent) :
 HbWidget(*new HbRatingSliderPrivate,parent)
 {
 Q_D( HbRatingSlider );
 d->q_ptr = this;
 d->init();
 }
 /*!
 @beta
 Protected constructor
 */
 HbRatingSlider::HbRatingSlider(HbRatingSliderPrivate &dd,QGraphicsItem *parent) :
 {
 Q_D( HbRatingSlider );
 d->init();
 }
 /*!
 Destructor
 */
 HbRatingSlider::~HbRatingSlider()
 {
 }
 /*!
 \param value true or false.
 \sa readOnly()
 */
 void HbRatingSlider::setReadOnly(bool value)
 {
 Q_D(HbRatingSlider);
 d->mReadOnly = value;
 }
 \param number. A value between 1 and 10
 \sa numberOfIcons()
 */
 void HbRatingSlider::setNumberOfIcons(int number)
 {
 Q_D(HbRatingSlider);
-if ( (number <= 0) || (number > MAX_NUMBER_OF_ICONS) ){
-return;
+if(number != d->mNumberOfIcons){
-}
+if ( (number <= 0) || (number > MAX_NUMBER_OF_ICONS) ){
-d->mNumberOfIcons = number;
+return;
-updatePrimitives();
+}
-d->createLookupTable();
+d->mNumberOfIcons = number;
-}
+updatePrimitives();
+d->createLookupTable();
+}
+}
 /*!
 @beta
 Returns the number of icons set.
 \sa setNumberOfIcons()
 */
 int HbRatingSlider::numberOfIcons() const
 {
 Q_D(const HbRatingSlider);
 return d->mNumberOfIcons;
 }
 /*!
 @beta
 */
 void HbRatingSlider::setStepCount(int count)
 {
 Q_D(HbRatingSlider);
-if( (count <= 0) || (count > 100) ) {
-return;
+if(count != d->mStepCount){
-}
+if( (count <= 0) || (count > 100) ) {
-d->mStepCount = count;
+return;
-d->createLookupTable();
+}
+d->mStepCount = count;
-HbStyleOptionRatingSlider option;
+d->createLookupTable();
-initStyleOption(&option);
-if (d->mTrack) {
+d->updateRatedIconItem();
-style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
+}
-}
 }
 /*!
 @beta
 Returns the step count.
 */
 int HbRatingSlider::stepCount() const
 {
 Q_D(const HbRatingSlider);
 return d->mStepCount;
 }
 /*!
 @beta
 Returns the read only flag of the Rating slider
 */
 bool HbRatingSlider::isReadOnly() const
 {
 Q_D(const HbRatingSlider);
 return d->mReadOnly;
 }
 /*!
 @beta
 */
 void  HbRatingSlider::setCurrentRating(int rating)
 {
 Q_D(HbRatingSlider);
-if( rating >d->mStepCount ) {
-rating = d->mStepCount;
-}
 if( (rating == d->mCurrentValue) || (rating < 0) ) {
 return;
 }
+if( rating > d->mStepCount ) {
+rating = d->mStepCount;
+}
 d->mCurrentValue = rating;
-HbStyleOptionRatingSlider option;
+d->updateRatedIconItem();
-initStyleOption(&option);
-if (d->mTrack) {
-style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
-}
 }
 /*!
 @beta
 Returns the the current rating value.
 */
 int HbRatingSlider::currentRating() const
 {
 Q_D(const HbRatingSlider);
 return d->mCurrentValue;
 }
 /*!
 @beta
 \sa unRatedIconName()
 */
 void HbRatingSlider::setUnRatedIconName(const QString name)
 {
 Q_D(HbRatingSlider);
-if(d->mUnratedIconName != name) {
+if(name != d->mUnratedIconName) {
 d->mUnratedIconName =name;
-HbStyleOptionRatingSlider option;
-initStyleOption(&option);
 updatePrimitives();
 }
 }
 /*!
 @beta
 Returns the unrated graphics name .
 */
 QString HbRatingSlider::unRatedIconName() const
 {
 Q_D(const HbRatingSlider);
 return d->mUnratedIconName;
 }
 /*!
 @beta
 \sa unRatedIconName()
 */
 void HbRatingSlider::setRatedIconName(const QString name)
 {
 Q_D(HbRatingSlider);
-if(d->mRatedIconName != name) {
+if(name != d->mRatedIconName) {
 d->mRatedIconName = name;
-HbStyleOptionRatingSlider option;
-initStyleOption(&option);
 updatePrimitives();
 }
 }
 /*!
 Returns the rated graphics name .
 */
 QString HbRatingSlider::ratedIconName() const
 {
 Q_D(const HbRatingSlider);
 return d->mRatedIconName;
 }
 #ifndef HB_GESTURE_FW
 /*!
 Q_D(HbRatingSlider);
 if(!d->mMousePressed) {
 return;
 }
-QPointF layoutItemPos = d->mLayoutItem->pos();
+QPointF layoutItemPos = d->mBackGroundItem->pos();
-QPointF frameItemPos = d->mFrame->pos();
+QPointF frameItemPos = d->mUnRatedItem->pos();
 qreal xVal = event->pos().x() - layoutItemPos.x()+ frameItemPos.x();
 if(d->mTouchArea->isUnderMouse()) {
 if(d->mReadOnly) {
 event->ignore();
 QRectF rect = d->mTouchArea->boundingRect();
 int rating=0;
 if(rect.contains(xVal,0 )) {
 rating = d->calculateProgressValue(xVal);
-if(!toolTip().isNull()) {
+if(!mToolTipText.isNull()) {
-HbToolTip::showText(toolTip(),this);
+HbToolTip::showText(mToolTipText,this);
 }
 setCurrentRating(rating);
 emit ratingChanged (d->mCurrentValue);
 event->accept();
 }
 */
 void HbRatingSlider::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
 Q_D(HbRatingSlider);
-QPointF layoutItemPos = d->mLayoutItem->pos();
+QPointF layoutItemPos = d->mBackGroundItem->pos();
-QPointF frameItemPos = d->mFrame->pos();
+QPointF frameItemPos = d->mUnRatedItem->pos();
 qreal xVal = event->pos().x() - layoutItemPos.x()+ frameItemPos.x();
 if(d->mTouchArea->isUnderMouse()) {
 if(d->mReadOnly) {
 QRectF rect = d->mTouchArea->boundingRect();
 int rating=0;
 if(rect.contains(xVal,0 )) {
 rating = d->calculateProgressValue(xVal);
-if(!toolTip().isNull()) {
+if(!mToolTipText.isNull()) {
-HbToolTip::showText(toolTip(),this);
+HbToolTip::showText(mToolTipText,this);
 }
 setCurrentRating(rating);
 if(d->mCurrentValue) {
 emit ratingDone (d->mCurrentValue);
 }
 {
 Q_UNUSED(event)
 }
 #endif
 #ifdef HB_GESTURE_FW
 /*!
 \reimp
 */
 void HbRatingSlider::gestureEvent(QGestureEvent *event)
 {
 Q_D (HbRatingSlider);
-if(event->gesture(Qt::TapGesture)) {
-HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+if ( (!isEnabled()) || (d->mReadOnly)) {
-switch(tap->state()) {
+event->ignore();
+return;
+}
+if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))){
+switch(tap->state()) {
 case Qt::GestureStarted:
 {
 qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
 int rating = d->calculateProgressValue(xVal);
 if(rating == -1) {
-return;
-}
-if(d->mReadOnly) {
 event->ignore();
 return;
 }
 QRectF rect = d->mTouchArea->boundingRect();
 if(rect.contains(xVal,0 )) {
 HbWidgetFeedback::triggered(this, Hb::InstantPressed);
 d->mMousePressed = true;
 updatePrimitives();
 rating = d->calculateProgressValue(xVal);
 setCurrentRating(rating);
+emit ratingChanged (d->mCurrentValue);
+if(!d->mToolTipArea)
+d->mToolTipArea = new HbTouchArea(d->mUnRatedItem);
+d->mToolTipArea->setPos(xVal,0);
+d->mToolTipArea->setSize(QSize(1,1));
+if(!d->mToolTipText.isNull()) {
+HbToolTip::showText(d->mToolTipText,d->mToolTipArea);
+}
 event->accept();
 }
 else {
 event->ignore();
 }
+}
-}
+break;
-break;
 case Qt::GestureFinished: // Reset state
 {
 qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
 QRectF rect = d->mTouchArea->boundingRect();
 int rating=0;
 if(rect.contains(xVal,0 )) {
-if(d->mReadOnly) {
+if(!d->mMousePressed){
 event->ignore();
 return;
 }
+if(xVal <0) {
-if(!d->mMousePressed){
+setCurrentRating(0);
-return;
+emit ratingDone (d->mCurrentValue);
-}
+return;
+}
-if(xVal <0) {
+rating = d->calculateProgressValue(xVal);
-setCurrentRating(0);
+setCurrentRating(rating);
-emit ratingDone (d->mCurrentValue);
+HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-return;
+if(d->mCurrentValue) {
-}
+emit ratingDone (d->mCurrentValue);
+}
-rating = d->calculateProgressValue(xVal);
+event->accept();
+d->mMousePressed = false;
-if(!toolTip().isNull()) {
+updatePrimitives();
-HbToolTip::showText(toolTip(),this);
+}
-}
+else {
-setCurrentRating(rating);
+d->mMousePressed = false;
-HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+updatePrimitives();
-if(d->mCurrentValue) {
+if(xVal <rect.x() )  {
-emit ratingDone (d->mCurrentValue);
+setCurrentRating(0);
-}
+emit ratingDone (d->mCurrentValue);
+}
-event->accept();
-d->mMousePressed = false;
-updatePrimitives();
-}
-else {
-d->mMousePressed = false;
-updatePrimitives();
-if(xVal <rect.x() )  {
-setCurrentRating(0);
-emit ratingDone (d->mCurrentValue);
-}
 }
 }
 break;
 default: break;
 }
-}else if(event->gesture(Qt::PanGesture)) {
+}
-HbPanGesture *pan = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture));
+else if(HbPanGesture *pan = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))){
 switch(pan->state()) {
 case Qt::GestureUpdated:
 {
 if(!d->mMousePressed) {
 return;
+}
+qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+QRectF rect = d->mTouchArea->boundingRect();
+int rating=0;
+if(rect.contains(xVal,0 )) {
+if(xVal <0) {
+setCurrentRating(0);
+return;
+}
+rating = d->calculateProgressValue(xVal);
+if(!d->mToolTipArea)
+d->mToolTipArea = new HbTouchArea(d->mUnRatedItem); //Need to show the tooltip at the touch point
+if(rating!=-1) {
+d->mToolTipArea->setPos(xVal,0);
+d->mToolTipArea->setSize(QSize(1,1));
+if(!d->mToolTipText.isNull()) {
+HbToolTip::showText(d->mToolTipText,d->mToolTipArea);
 }
-qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+}
-QRectF rect = d->mTouchArea->boundingRect();
+setCurrentRating(rating);
-int rating=0;
+HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousDragged);
-if(rect.contains(xVal,0 )) {
+emit ratingChanged (d->mCurrentValue);
-if(d->mReadOnly) {
+event->accept();
-event->ignore();
+}
-return;
+else {
-}
+setCurrentRating(0);
+}
-if(xVal <0) {
+}
-setCurrentRating(0);
+break;
-return;
+case Qt::GestureFinished: // Reset state
-}
+{
+qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
-rating = d->calculateProgressValue(xVal);
+QRectF rect = d->mTouchArea->boundingRect();
+d->mMousePressed = false;
-if(!toolTip().isNull()) {
+updatePrimitives();
-HbToolTip::showText(toolTip(),this);
+int rating=0;
-}
+if(rect.contains(xVal,0 )) {
-setCurrentRating(rating);
+if(xVal <0) {
-HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousDragged);
+setCurrentRating(0);
-emit ratingChanged (d->mCurrentValue);
+emit ratingDone (d->mCurrentValue);
-event->accept();
+return;
 }
-else {
+rating = d->calculateProgressValue(xVal);
-setCurrentRating(0);
+setCurrentRating(rating);
-}
+HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-}
+if(d->mCurrentValue) {
-break;
+emit ratingDone (d->mCurrentValue);
-case Qt::GestureFinished: // Reset state
+}
-{
+event->accept();
-qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+}
-QRectF rect = d->mTouchArea->boundingRect();
-d->mMousePressed = false;
-updatePrimitives();
-int rating=0;
-if(rect.contains(xVal,0 )) {
-if(d->mReadOnly) {
-event->ignore();
-return;
-}
-}
-if(xVal <0) {
-setCurrentRating(0);
-emit ratingDone (d->mCurrentValue);
-return;
-}
-rating = d->calculateProgressValue(xVal);
-setCurrentRating(rating);
-HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-if(d->mCurrentValue) {
-emit ratingDone (d->mCurrentValue);
-}
-event->accept();
 }
+break;
+default:
-					default:
+break;
-break;
+}
-}
 }
 }
 #endif
 /*!
 \reimp
 */
 void HbRatingSlider::setGeometry(const QRectF & rect)
 {
 Q_D(HbRatingSlider);
 HbWidget::setGeometry(rect);
 updatePrimitives();
 d->createLookupTable();
 }
-/*!
-\reimp
+/*!
-*/
+@beta
+Sets the tooltip for the rating slider.
+By default it shows nothing.
+The application can customize the tooltip text using this API.
+Setting NULL string will disable the tooltip.
+\param tooltip tooltip text
+\sa toolTipText()
+*/
+void HbRatingSlider::setToolTipText(const QString tooltip)
+{
+Q_D(HbRatingSlider);
+d->mToolTipText = tooltip;
+}
+/*!
+@beta
+Returns the current tooltip text value.
+\sa setToolTipText()
+*/
+QString HbRatingSlider::toolTipText() const
+{
+Q_D(const HbRatingSlider);
+return d->mToolTipText;
+}
+/*!
+\reimp
+*/
 void HbRatingSlider::initStyleOption(HbStyleOption *hboption) const
 {
 Q_D( const HbRatingSlider );
 HbWidget::initStyleOption(hboption);
 HbStyleOptionRatingSlider *option = 0;
 if ((option = qstyleoption_cast< HbStyleOptionRatingSlider *>(hboption)) != 0) {
 option->noOfStars = d->mNumberOfIcons;
 option->noOfIntervals = d->mStepCount;
 option->unRatedGraphicsName = d->mUnratedIconName;
 option->ratedGraphicsName = d->mRatedIconName;
 option->progressValue = d->mCurrentValue;
 option->disableState = !isEnabled();
 option->pressedState = d->mMousePressed;
-}
+if(layoutDirection() == Qt::RightToLeft) {
-}
+option->inverted = true;
+}
-/*!
+else {
+option->inverted = false;
-\deprecated HbRatingSlider::primitive(HbStyle::Primitive)
+}
-is deprecated.
+}
+}
-Provides access to primitives of HbRatingSlider.
-\param primitive is the type of the requested primitive. The available
-primitives are P_RatingSlider_frame,P_RatingSlider_track and P_RatingSlider_layout.
-*/
-QGraphicsItem* HbRatingSlider::primitive(HbStyle::Primitive primitive) const
-{
-Q_D(const HbRatingSlider);
-switch (primitive) {
-case HbStyle::P_RatingSlider_frame:
-return d->mFrame;
-case HbStyle::P_RatingSlider_track:
-return d->mTrack;
-case HbStyle::P_RatingSlider_layout:
-return d->mLayoutItem;
-default:
-return 0;
-}
-}
 /*!
 \reimp
 */
 void HbRatingSlider::changeEvent(QEvent *event)
 {
 HbWidget::changeEvent(event);
 switch (event->type()) {
 case QEvent::LayoutDirectionChange:
-updatePrimitives();
+{
+updatePrimitives();
+}
 break;
 case QEvent::EnabledChange:
 updatePrimitives();
 break;
 default:
 break;
 }
 }
 /*!
 \reimp
 */
 void HbRatingSlider::updatePrimitives()
 {
 Q_D(HbRatingSlider);
-HbStyleOptionRatingSlider option;
-initStyleOption(&option);
+// update unrated icon item
-if (d->mFrame) {
+d->updateUnRatedIconItem();
-style()->updatePrimitive(d->mFrame, HbStyle::P_RatingSlider_frame, &option);
-}
+// update rated icon item
+d->updateRatedIconItem();
-if (d->mTrack) {
+}
-style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
-}
-if (d->mTouchArea) {
-style()->updatePrimitive(d->mTouchArea, HbStyle::P_CheckBox_toucharea, &option);
-}
-}
 /*!
 \reimp
 */
 QVariant HbRatingSlider::itemChange(GraphicsItemChange change, const QVariant &value)
 {
 updatePrimitives();
 }
 #ifdef HB_EFFECTS
 if(change == QGraphicsItem::ItemVisibleChange){
 if(value.toBool()) {
 HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_appear");
 }
-else
+else {
-{
+HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_disappear");
-HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_disappear");
+}
 }
-}
 #endif//HB_EFFECTS
 return HbWidget::itemChange(change,value);
 }
+/*!
+\reimp
+*/
+QGraphicsItem *HbRatingSlider::primitive(const QString &itemName) const
+{
+Q_D(const HbRatingSlider);
+if(!itemName.compare(QString("background"))){
+return d->mBackGroundItem;
+}
+if(!itemName.compare(QString("unrated-item"))){
+return d->mUnRatedItem;
+}
+if(!itemName.compare(QString("rated-item"))){
+return d->mRatedItem;
+}
+if(!itemName.compare(QString("toucharea"))){
+return d->mTouchArea;
+}
+return HbWidget::primitive(itemName);
+}

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9