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

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include <hbprogressbar.h>
 #include <hbstyleoptionprogressbar.h>
 #include "hbprogressbar_p.h"
+#include "hbglobal_p.h"
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
 #include "hbeffectinternal_p.h"
 #define HB_PRGRESSBAR_ITEM_TYPE "HB_PROGRESSBAR"
 mInvertedAppearance(false),
 mMinMaxTextAlignment(Qt::AlignBottom),
 mMinText(QString()),
 mMaxText(QString()),
 mOrientation(Qt::Horizontal),
-mDelayHideInProgress(true)
+mDelayHideInProgress(true),
+mShowEffectInProgress(false)
 {
 }
 /*
 HbProgressBarPrivate
 Q_Q(HbProgressBar);
 mMinTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_mintext,q);
 mMaxTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_maxtext,q);
 }
+void HbProgressBarPrivate::setProgressValue(int value)
-/*!
+{
+Q_Q(HbProgressBar);
+if (mProgressValue == value) {
+return;
+}
+if (value >= mMaximum) {
+value = mMaximum;
+#ifdef HB_EFFECTS
+HbEffect::start(mTrack, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_progress_complete");
+#endif
+}
+else if (value < mMinimum) {
+value = mMinimum;
+}
+mProgressValue=value;
+//redraw track
+HbStyleOptionProgressBar progressBarOption;
+q->initStyleOption(&progressBarOption);
+if(mTrack) {
+q->style()->updatePrimitive(mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
+}
+emit q->valueChanged(value);
+}
+/*
+\internal
+Sets the progressbar enabling/disabling
+*/
+void HbProgressBarPrivate::setEnableFlag(bool flag)
+{
+Q_Q(HbProgressBar);
+if(!flag) {
+q->setProgressValue(q->minimum());
+}
+}
+/*
 \internal
 Sets the progressbar range
 */
 void HbProgressBarPrivate::setRange(int minimum, int maximum)
 {
 if (status.reason != Hb::EffectNotStarted) {
 q->setVisible(false);
 }
 }
+/*!
+\internal
+Private slot which delays the show effect.
+*/
+void HbProgressBarPrivate::_q_delayedShow(HbEffect::EffectStatus status)
+{
+Q_UNUSED(status);
+mShowEffectInProgress = false;
+}
 #endif
 /*!
 Constructs a progressbar of a given \a type and \a parent. The default type is SimpleProgressBar.
 \deprecated HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*)
 is deprecated. Please use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.
 */
 HbProgressBar::HbProgressBar(ProgressBarType type, QGraphicsItem *parent) :
 HbWidget(*new HbProgressBarPrivate, parent)
 {
+HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.");
 Q_D( HbProgressBar );
 d->q_ptr = this;
 d->init();
 d->mType = type;
 }
 /*!
 @beta
-Constructs a progressbar of a given \a parent.
+Constructor of  Progressbar.
+\param parent. Parent widget
 */
 HbProgressBar::HbProgressBar(QGraphicsItem *parent) :
 HbWidget(*new HbProgressBarPrivate, parent)
 {
 Q_D( HbProgressBar );
 }
 /*!
 \deprecated HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*)
 is deprecated. Please use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.
 */
 HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, ProgressBarType type, QGraphicsItem *parent) :
 HbWidget( dd, parent)
 {
+HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.");
 Q_D( HbProgressBar );
 d->init();
 d->mType = type;
 }
 {
 }
 /*!
 @beta
-This property holds whether or not a progress bar shows its progress inverted. The function
+Return the inverted appearence property.
-returns the value of this property.
+\sa setInvertedAppearance()
-Not implemented yet.
+*/
-\sa setInvertedAppearance()
-*/
 bool HbProgressBar::invertedAppearance() const
 {
 Q_D( const HbProgressBar );
 return d->mInvertedAppearance;
 }
 /*!
 @beta
-This property holds whether or not a progress bar shows its progress inverted. The function
+Sets the inverted appearence. If this is true progress grows from right to
-sets the property to the \a inverted value.
+left otherwise left to right.
-Not implemented yet.
+\param inverted true or false.
 \sa invertedAppearance()
 */
 void HbProgressBar::setInvertedAppearance(bool inverted)
 {
 Q_D( HbProgressBar );
 d->mInvertedAppearance=inverted;
 updatePrimitives();
 }
 /*!
 @beta
-Returns the maximum value of the progress bar.
+Returns the maximum value of the progressbar. By default it is 100.
-The default value is \c 100.
 \sa setMaximum()
 */
 int HbProgressBar::maximum() const
 {
 return d->mMaximum;
 }
 /*!
 @beta
-Sets the maximum value of the progress bar.
+Sets the maximum value of the progressbar. By default it is 100.
-when setting this property, the minimum is adjusted to ensure
-that the range remains valid.
+\param maximum the max value
-\sa maximum(),minimum(),setMinimum()
+\sa maximum()
 */
 void HbProgressBar::setMaximum(int maximum)
 {
 Q_D( HbProgressBar );
 d->setRange(qMin(d->mMinimum,maximum),maximum);
 }
 /*!
 @beta
-Returns the minimum value of the progress bar.
+Returns the minimum value of the progressbar. By default it is 0.
-The default value is \c 0.
 \sa setMinimum()
 */
 int HbProgressBar::minimum() const
 {
 return d->mMinimum;
 }
 /*!
 @beta
-Sets the minimum value of the progress bar.
+Sets the minimum value of the progressbar. By default it is 0.
-when setting this property, the maximum is adjusted to ensure
-that the range remains valid.
+\param maximum the max value
-\sa maximum(),minimum(),setMaximum()
+\sa minimum()
 */
 void HbProgressBar::setMinimum(int minimum)
 {
 Q_D( HbProgressBar );
 d->setRange(minimum,qMax(d->mMaximum,minimum));
 }
 /*!
 @beta
 Returns the current value of the progress bar.
+\sa setProgressValue()
-The default progressValue is \c 0.
 */
 int HbProgressBar::progressValue() const
 {
 Q_D( const HbProgressBar );
 return d->mProgressValue;
 }
 /*!
 @beta
-Sets the current value of the progress bar.
+Sets the progress value of the progressbar.
-The progress bar forces the value to be within the legal range: \b
+\param value the progress value
-minimum <= \c value <= \b maximum.
 \sa progressValue()
 */
 void HbProgressBar::setProgressValue(int value)
 {
 Q_D( HbProgressBar );
-if (d->mProgressValue == value) {
+d->setProgressValue(value);
-return;
-}
-if (value >= d->mMaximum) {
-value = d->mMaximum;
-#ifdef HB_EFFECTS
-HbEffect::start(d->mTrack, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_progress_complete");
-#endif
-}
-else if (value<d->mMinimum) {
-value = d->mMinimum;
-}
-d->mProgressValue=value;
-//redraw track
-HbStyleOptionProgressBar progressBarOption;
-initStyleOption(&progressBarOption);
-if(d->mTrack) {
-style()->updatePrimitive(d->mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
-}
-emit valueChanged(value);
 }
 /*!
 @beta
 This function is provided for convenience.
-Sets the progress bar's minimum to \a minimum and its maximum to \a max.
+Sets the progress bar's minimum and its maximum.
-If \a maximum is smaller than minimum, minimum becomes the only valid legal
+If  maximum is smaller than minimum, minimum becomes the only valid legal
 value.
-\sa setMinimum(), setMaximum()
+\param minimum the minimum value
+\param maximum the maximum value
 */
 void HbProgressBar::setRange(int minimum, int maximum)
 {
 Q_D( HbProgressBar );
 d->setRange(minimum , maximum);
 }
 /*!
 @beta
-Set the \a Min text shown on the progressbar.
+Sets the min text string.
-\sa text()
+\param text mintext string
+\sa minText()
 */
 void HbProgressBar::setMinText(const QString &text)
 {
 Q_D(HbProgressBar);
 if (d->mMinText != text) {
 }
 /*!
 @beta
 Returns the Min Text of the progress bar.
+\sa setMinText()
-The default progressValue is \c 0.
 */
 QString HbProgressBar::minText() const
 {
 Q_D( const HbProgressBar );
 return d->mMinText;
 }
 /*!
 @beta
-Set the \a Max text shown on the progressbar.
+Sets the max text string.
-\sa text()
+\param text max text string
+\sa maxText()
 */
 void HbProgressBar::setMaxText(const QString &text)
 {
-	Q_D(HbProgressBar);
+Q_D(HbProgressBar);
 if (d->mMaxText != text) {
 d->mMaxText = text;
 HbStyleOptionProgressBar progressBarOption;
 initStyleOption(&progressBarOption);
 style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);
 }
 /*!
 @beta
 Returns the Max Text of the progress bar.
+\sa setMaxText()
-The default progressValue is \c 0.
 */
 QString HbProgressBar::maxText() const
 {
 Q_D( const HbProgressBar );
 return d->mMaxText;
 }
 /*!
 @beta
-Set the MinMaxtext visibility \a true for showing text,false for hiding the text.
+Set the MinMaxtext visibility. true for showing text,false for hiding the text.
-The default is \c false. Min Max text doesnt have a background and would have a transparent background.
+The default is  false. Min Max text doesnt have a background and would have a transparent background.
+\param visible true or false.
 \sa isMinMaxTextVisible().
 */
 void HbProgressBar::setMinMaxTextVisible(bool visible)
 {
 Q_D(HbProgressBar);
 }
 }
 /*!
 @beta
-This property holds whether the MinMax text should be displayed.
+Returns the MinMax visibility.
-Return the value of this property.
+\sa setMinMaxTextVisible()
-\sa setMinMaxTextVisibile()
 */
 bool HbProgressBar::isMinMaxTextVisible() const
 {
 Q_D(const HbProgressBar);
 return d->mMinMaxTextVisible;
 }
 /*!
 @beta
 Sets the Min-Max text alignment
-	Supportted alignments are (in both horizontal and vertical orientations)
+Supportted alignments are (in both horizontal and vertical orientations)
-	Qt::AlignTop
+Qt::AlignTop
-	Qt::AlignBottom
+Qt::AlignBottom
-	Qt::AlignCenter
+Qt::AlignCenter
 In Vertical orienatation,
 AlignTop is equivalent to Left
 AlignBottom is equivalent to Right
+\param alignment alignement for the min max text
+\sa isMinMaxTextVisible().
 */
 void HbProgressBar::setMinMaxTextAlignment(Qt::Alignment alignment)
 {
-	Q_D(HbProgressBar);
+Q_D(HbProgressBar);
-	if( (alignment != Qt::AlignBottom) && (alignment != Qt::AlignTop) && (alignment != Qt::AlignCenter) ) {
+if( (alignment != Qt::AlignBottom) && (alignment != Qt::AlignTop) && (alignment != Qt::AlignCenter) ) {
-		return;
+return;
-	}
+}
-	if (d->mMinMaxTextAlignment != alignment) {
+if (d->mMinMaxTextAlignment != alignment) {
 d->mMinMaxTextAlignment = alignment;
-		if (d->mMinMaxTextVisible) {
+if (d->mMinMaxTextVisible) {
 repolish();
 }
 updatePrimitives();
 }
 }
 /*!
 @beta
 Returns the minmax Text alignment.
+\sa setMinMaxTextAlignment().
 */
 Qt::Alignment HbProgressBar::minMaxTextAlignment() const
 {
-	Q_D(const HbProgressBar);
+Q_D(const HbProgressBar);
-	return d->mMinMaxTextAlignment;
+return d->mMinMaxTextAlignment;
 }
 /*!
 @beta
 sets the orientation of the progressbar.It can be vertical or horizontal.
+\param orientation Horizontal or Vertical
+\sa orientation().
 */
 void HbProgressBar::setOrientation(Qt::Orientation orientation)
 {
 //TODO: Add vertical slider related info.
 Q_D(HbProgressBar);
 }
 /*!
 @beta
 Returns the orientation of the progressbar.It can be vertical or horizontal.
+\sa setOrientation().
 */
 Qt::Orientation HbProgressBar::orientation() const
 {
 //TODO: Add vertical slider related info.
 Q_D(const HbProgressBar);
 if(isVisible()){
 HbStyleOptionProgressBar progressBarOption;
 initStyleOption(&progressBarOption);
 if (d->mFrame) {
 style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressBar_frame, &progressBarOption);
 }
 if (d->mTrack) {
 style()->updatePrimitive(d->mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
 }
 if (d->mWaitTrack) {
 style()->updatePrimitive(d->mWaitTrack, HbStyle::P_ProgressBar_waittrack, &progressBarOption);
 }
 if(d->mMinTextItem && d->mMinMaxTextVisible) {
 style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&progressBarOption);
 }
 if(d->mMaxTextItem && d->mMinMaxTextVisible) {
 style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);
 }
 }
 HbWidget::updatePrimitives();
 }
 Initializes \a option with the values from this HbProgressBar. This method
 is useful for subclasses when they need a HbStyleOptionProgressBar, but don't
 want to fill in all the information themselves.
 */
-void HbProgressBar::initStyleOption(HbStyleOption *hboption) const
+void HbProgressBar::initStyleOption(HbStyleOptionProgressBar *option) const
 {
 Q_D( const HbProgressBar );
-Q_ASSERT(hboption);
+HbWidget::initStyleOption(option);
-HbWidget::initStyleOption(hboption);
-HbStyleOptionProgressBar *option = 0;
+option->progressValue = d->mProgressValue;
-if ((option = qstyleoption_cast< HbStyleOptionProgressBar *>(hboption)) != 0) {
+option->maximum = d->mMaximum;
+option->minimum = d->mMinimum;
-option->progressValue = d->mProgressValue;
+option->minText = d->mMinText;
-option->maximum = d->mMaximum;
+option->maxText = d->mMaxText;
-option->minimum = d->mMinimum;
+option->orientation = d->mOrientation;
-option->minText = d->mMinText;
+option->isSlider=d->mType == HbProgressBar::RatingProgressBar;
-option->maxText = d->mMaxText;
+option->inverted = d->mInvertedAppearance;
-option->orientation = d->mOrientation;
+option->stopWaitAnimation = false;
-option->isSlider=d->mType == HbProgressBar::RatingProgressBar;
+option->minMaxTextAlignment = d->mMinMaxTextAlignment;
-option->inverted = d->mInvertedAppearance;
+QRect rect((int)d->mFrame->boundingRect().x(),(int)d->mFrame->boundingRect().y(),(int)d->mFrame->boundingRect().width(),
-option->stopWaitAnimation = false;
+(int)d->mFrame->boundingRect().height());
-option->minMaxTextAlignment = d->mMinMaxTextAlignment;
+option->rect = rect;
-		QRect rect(d->mFrame->boundingRect().x(),d->mFrame->boundingRect().y(),d->mFrame->boundingRect().width(),
-		d->mFrame->boundingRect().height());
-		option->rect = rect;
-}
 }
 /*!
 \reimp
 */
 #ifdef HB_EFFECTS
 Q_D(HbProgressBar);
 if(change == QGraphicsItem::ItemVisibleChange){
 if(value.toBool()) {
-HbEffect::start(this, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_appear");
+if(!d->mShowEffectInProgress) {
+HbEffect::start(this, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_appear",this,"_q_delayedShow");
+d->mShowEffectInProgress = true;
+}
 d->mDelayHideInProgress  = false;
 }
 else if(!d->mDelayHideInProgress) {
 //parentItemVisibility check is a hack . Other wise if visibility
 /*!
 \reimp
 */
 void HbProgressBar::changeEvent(QEvent *event)
 {
+Q_D(HbProgressBar);
+switch (event->type()) {
+case QEvent::LayoutDirectionChange:
+if(layoutDirection() == Qt::RightToLeft) {
+setInvertedAppearance(true);
+}
+else {
+setInvertedAppearance(false);
+}
+break;
+case QEvent::EnabledChange:
+{
+if (!isEnabled()) {
+d->setEnableFlag(false);
+}
+else
+{
+d->setEnableFlag(true);
+}
+}
+default:
+break;
+}
 HbWidget::changeEvent(event);
-switch (event->type()) {
-case QEvent::LayoutDirectionChange:
-	    if(layoutDirection() == Qt::RightToLeft) {
-setInvertedAppearance(true);
-}
-else {
-setInvertedAppearance(false);
-}
-break;
-default:
-break;
-}
 }
 #include "moc_hbprogressbar.cpp"

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9