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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbprogressbar_p.h"
 #include <hbprogressbar.h>
 #include <hbstyleoptionprogressbar_p.h>
-#include "hbprogressbar_p.h"
 #include "hbglobal_p.h"
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
 #include "hbeffectinternal_p.h"
 @beta
 @hbwidgets
 \class HbProgressBar
 \brief HbProgressBar widget provides a vertical and horizontal progress bar.
-An infinite progressbar is also available.
-A progress bar is used to give the user an indication of the progress of an operation and to
-reassure them that the application is still running.
-The progress bar uses the concept of steps. User can set it up by specifying the minimum and
-maximum possible step values, and it will display the percentage of steps that have been completed
-when you later give it the current step value.
-The percentage is calculated by dividing the progress (progressValue() - minimum()) divided by maximum() - minimum().
+\image html progressbar.png  "A Progress Bar with Min-Max text at bottom"
+\image html infiniteprogressbar.png  "An infinite progres bar"
-User can specify the minimum and maximum number of steps with setMinimum() and setMaximum() APIs.
-The current number of steps is set with setProgressValue().
+The HbProgressBar widget provides a horizontal or vertical progress bar.
-If minimum and maximum both are set to 0, the bar shows a busy indicator instead of a percentage of steps.
+A progress bar is used to give the user an indication of the progress of an operation and to reassure them that
-This is useful, for example, when using ftp or http to download items when they are unable to
+the application is still running. The progress bar uses the concept of steps. You set it up by specifying the
-determine the size of the item being downloaded.
+minimum and maximum possible step values, and it will display the percentage of steps that have been completed
+when you later give it the current step value. The percentage is calculated by dividing the
-ProgressBar also supports adding text . min max text pair is also supported which is commonly
+progress (value() - minimum()) divided by maximum() - minimum().
-used for progress indication for music.
-\image html hbprogressbartext.png Left Aligned Text, Min Max Text.
+By default the min value is 0 and max value is 100.If minimum and maximum both are set to 0, the bar shows a busy indicator
+instead of a percentage of steps.The ProgressBar is always non interactive.
+ProgressBar also supports adding text . Min-Max text pair is also supported which is commonly
+used for progress indication for music.
 Progress bar provides below signal.
 \li valueChanged(int value) Emitted when the value of the progressbar is changed.
-*/
-/*!
+Example code for creating normal ProgressBar:
-@beta
+\code
-\fn void HbProgressBar::valueChanged(int value)
+HbProgressBar *pb = new HbProgressBar();
+pb->setMinimum(0);
-Emitted when the value of the progressbar is changed.
+pb->setMaximum(500);
-*/
+pb->setProgressValue(175);
+\endcode
-/*!
+Example code for creating infinite ProgressBar:
-@beta
+\code
-\reimp
+HbProgressBar *pb = new HbProgressBar();
-\fn int HbProgressBar::type() const
+pb->setMinimum(0);
-*/
+pb->setMaximum(0);
+\endcode
-/*!
-@beta
+Example code for creating normal ProgressBar with Min-Max text at Top:
-\enum HbProgressBar::ProgressBarType
+\code
+HbProgressBar *pb = new HbProgressBar();
-This enum defines available progress bar types.
+pb->setMinimum(0);
+pb->setMaximum(500);
+pb->setProgressValue(175);
+pb->setMinMaxTextVisible(true);
+pb->setMinMaxTextAlignment(Qt::AlignTop);// The possible options are Qt::AlignTop ,Qt::AlignBottom ,Qt::AlignCenter
+pb->setminText("0");
+pb->setmaxText("500");
+\endcode
+Example code for creating vertical normal ProgressBar:
+\code
+HbProgressBar *pb = new HbProgressBar();
+pb->setOrientation(Qt::Vertical);
+pb->setMinimum(0);
+pb->setMaximum(500);
+pb->setProgressValue(175);
+\endcode
 */
 /*
 HbProgressBarPrivate
 if(mProgressValue > mMaximum){
 mProgressValue = mMaximum;
 }
+// update primitve optimization, update only track primitive
+// incase of normal as well as in infinite progressbar
+HbStyleOptionProgressBar progressBarOption;
+q->initStyleOption(&progressBarOption);
 if( (mMinimum == 0) && (mMaximum == 0) ) {
 mWaitTrack->setVisible(true);
 mTrack->setVisible(false);
+q->style()->updatePrimitive(mWaitTrack, HbStyle::P_ProgressBar_waittrack, &progressBarOption);
 } else {
 mWaitTrack->setVisible(false);
 mTrack->setVisible(true);
-}
-q->updatePrimitives();
+q->style()->updatePrimitive(mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
+}
+//q->updatePrimitives();
 }
 /*!
 \internal
 Sets the progressbar orientation.
 }
 #endif
 /*!
 @beta
-Constructor of  Progressbar.
+Constructs a progress bar with the given parent.
-\param parent. Parent widget
+By default, the minimum step value is set to 0, and the maximum to 100.
+\param parent The parent of ProgressBar
 */
 HbProgressBar::HbProgressBar(QGraphicsItem *parent) :
 HbWidget(*new HbProgressBarPrivate, parent)
 {
 {
 }
 /*!
 @beta
-Return the inverted appearence property.
+Return the inverted appearance property.
 \sa setInvertedAppearance()
 */
 bool HbProgressBar::invertedAppearance() const
 {
 Q_D( const HbProgressBar );
 return d->mInvertedAppearance;
 }
 /*!
 @beta
-Sets the inverted appearence. If this is true progress grows from right to
+Sets the inverted Appearance. If this is true progress grows from right to
 left otherwise left to right.
 \param inverted true or false.
 \sa invertedAppearance()
 /*!
 @beta
 Sets the maximum value of the progressbar. By default it is 100.
-\param maximum the max value
+\param maximum the maximum value
 \sa maximum()
 */
 void HbProgressBar::setMaximum(int maximum)
 {
 /*!
 @beta
 Sets the minimum value of the progressbar. By default it is 0.
-\param maximum the max value
+\param minimum the minimum value
 \sa minimum()
 */
 void HbProgressBar::setMinimum(int minimum)
 {
 }
 /*!
 @beta
 This function is provided for convenience.
 Sets the progress bar's minimum and its maximum.
 If  maximum is smaller than minimum, minimum becomes the only valid legal
 value.
 \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
-Sets the min text string.
+A text can be shown at top,bottom or left-right of the progressbar near minimum and maximum.
+This will set the text near the minimum point.
 \param text mintext string
 \sa minText()
 */
 return d->mMinText;
 }
 /*!
 @beta
-Sets the max text string.
+A text can be shown at top,bottom or left-right of the progressbar near minimum and maximum.
+This will set the text near the minimum point.
 \param text max text string
 \sa maxText()
 */
 }
 /*!
 @beta
 Set the MinMaxtext visibility. true for showing text,false for hiding the text.
-The default is  false. Min Max text doesnt have a background and would have a transparent background.
+The default is  false. Min Max text does not have a background and would have a transparent background.
 \param visible true or false.
 \sa isMinMaxTextVisible().
 */
 void HbProgressBar::setMinMaxTextVisible(bool visible)
 {
 if(d->mMinMaxTextVisible) {
 if(!d->mMinTextItem && !d->mMaxTextItem){
 d->createTextPrimitives();
 }
+// update primitve optimization, update only text primitives
+// incase of with and without min-max text
+HbStyleOptionProgressBar progressBarOption;
+initStyleOption(&progressBarOption);
+style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&progressBarOption);
+style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);
 d->mMinTextItem->show();
 d->mMaxTextItem->show();
 } else {
 if(d->mMinTextItem && d->mMaxTextItem){
 d->mMinTextItem->hide();
 d->mMaxTextItem->hide();
 }
 }
 repolish();
-updatePrimitives();
+//updatePrimitives();
 }
 }
 /*!
 @beta
 In Vertical orienatation,
 AlignTop is equivalent to Left
 AlignBottom is equivalent to Right
-\param alignment alignement for the min max text
+\param alignment alignment for the min max text
 \sa isMinMaxTextVisible().
 */
 void HbProgressBar::setMinMaxTextAlignment(Qt::Alignment alignment)
 {
 if (d->mMinMaxTextAlignment != alignment) {
 d->mMinMaxTextAlignment = alignment;
 if (d->mMinMaxTextVisible) {
 repolish();
 }
-updatePrimitives();
+// no need for primitve updation, only layout change is required
+//updatePrimitives();
 }
 }
 /*!
 @beta
 Q_D(const HbProgressBar);
 return d->mOrientation;
 }
 /*!
-Returns the pointer for \a primitive passed.
+\deprecated HbProgressBar::primitive(HbStyle::Primitive)
-Will return NULL if \a primitive passed is invalid
+is deprecated.
 */
 QGraphicsItem* HbProgressBar::primitive(HbStyle::Primitive primitive) const
 {
 Q_D(const HbProgressBar);
 }
 HbWidget::updatePrimitives();
 }
 /*!
-Initializes \a option with the values from this HbProgressBar. This method
+\reimp
-is useful for subclasses when they need a HbStyleOptionProgressBar, but don't
+*/
-want to fill in all the information themselves.
-*/
 void HbProgressBar::initStyleOption(HbStyleOptionProgressBar *option) const
 {
 Q_D( const HbProgressBar );
 option->maxText = d->mMaxText;
 option->orientation = d->mOrientation;
 option->inverted = d->mInvertedAppearance;
 option->stopWaitAnimation = false;
 option->minMaxTextAlignment = d->mMinMaxTextAlignment;
-QRect rect((int)d->mFrame->boundingRect().x(),(int)d->mFrame->boundingRect().y(),(int)d->mFrame->boundingRect().width(),
-(int)d->mFrame->boundingRect().height());
-option->rect = rect;
 }
 /*!
 \reimp
 */

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55