FCL/sf/mw/hb: comparison src/hbwidgets/popups/hbprogressdialog.cpp

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 **
 ****************************************************************************/
 #include <hbprogressdialog.h>
 #include <hbprogressdialog_p.h>
-#include <hbstyleoptionprogressdialog.h>
+#include <hbstyleoptionprogressdialog_p.h>
 #include <hbnamespace_p.h>
 #include <hbaction.h>
 #include <hbpopup.h>
 #include <hbtextitem.h>
 #include <QGraphicsItem>
 /*
-internal
+\internal
 HbProgressDialogContentWidget class
 HbProgressDialogContentWidget is internal to HbProgressDialog and is the content widget to progressDialog
 HbProgressDialogContentWidget holds the text, icon and progressbar.
 repolish();
 }
 };
 /*!
-internal
+\internal
 HbProgressDialogPrivate class constructor
 */
-HbProgressDialogPrivate::HbProgressDialogPrivate() :mAction(0),mTimer(0),mIcon(0),mContentWidget(0),
+HbProgressDialogPrivate::HbProgressDialogPrivate() :mTimer(0),mIcon(0),mContentWidget(0),
 mMinDuration(0),mDelayTime(0),mTextString(QString()),
 mAlign(Qt::AlignTop|Qt::AlignLeft)
 {
 }
 /*!
-internal
+\internal
 HbProgressDialogPrivate class destructor
 */
 HbProgressDialogPrivate::~HbProgressDialogPrivate()
 {
 }
 /*!
-internal
+\internal
-initialises HbProgressDialogPrivate class
+Initializes HbProgressDialogPrivate class
 */
 void HbProgressDialogPrivate::init(HbProgressDialog::ProgressDialogType type)
 {
 Q_Q(HbProgressDialog);
 }
 else{
 mContentWidget->mProgressBar->setRange(0,100);
 }
-mAction = new HbAction(q->tr("Cancel"));
+HbAction *action = new HbAction(q->tr("Cancel"), q);
-QObject::connect(mAction, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
+QObject::connect(action, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
-q->setPrimaryAction(mAction);
+q->addAction(action);
 mMinDuration = 1500;
 mDelayTime = 1000;
 mTimer = new QTimeLine(mDelayTime, q);
 mTimer->setFrameRange(0, 100);
 QObject::connect(mTimer, SIGNAL(finished()), q, SLOT(_q_finished()));
 q->setTimeout(HbPopup::NoTimeout);
 q->setDismissPolicy(HbPopup::NoDismiss);
-q->setModal(false);
 q->hide();
 }
 /*
-internal
+\internal
 createPrimitives.
 */
 void HbProgressDialogPrivate::createPrimitives()
 {
 Q_Q(HbProgressDialog);
 if( !mContentWidget->mProgressBar ){
-mContentWidget->mProgressBar = new HbProgressBar(HbProgressBar::SimpleProgressBar,mContentWidget);
+mContentWidget->mProgressBar = new HbProgressBar(mContentWidget);
 HbStyle::setItemName(mContentWidget->mProgressBar, "pbar");
 }
 if ( !mContentWidget->mTextItem ) {
 mContentWidget->mTextItem = q->style()->createPrimitive(HbStyle::P_ProgressDialog_text,mContentWidget);
 mContentWidget->mIconItem = 0;
 }
 }
 /*!
-internal
+\internal
-private slot which stops the timer and
+Private slot for, when user clicks on cancel button. This stops the timer and
-dismisses the dialog
+dismisses the dialog.
 */
 void HbProgressDialogPrivate::_q_userCancel()
 {
 Q_Q(HbProgressDialog);
 mTimer->stop();
 q->cancel();
 }
 /*!
-internal
+\internal
-private slot which stops the timer and
+Private slot which stops the timer and
 dismisses the dialog
 */
 void HbProgressDialogPrivate::_q_finished()
 {
 Q_Q(HbProgressDialog);
 }
 }
 }
 /*!
-internal
+\internal
-private slot which stops the timer and
+Private slot, for when progress value changes. When maximum value, stop the timer and close the dialog.
-dismisses the dialog
 */
 void HbProgressDialogPrivate::_q_progressValueChanged(int value)
 {
 Q_Q(HbProgressDialog);
 @beta
 @hbwidgets
 \class HbProgressDialog
 \brief HbProgressDialog provides feedback on the progress of a slow operation.
-\image html hbprogressnote.png  A progress dialog.
+\image html hbprogressdialog.png  A progress dialog.
 ProgressDialog widget displays that a process is active and also the completion level of the process to the user.
 A progress dialog is used to give the user an indication of how long an operation is going to take, and
 to demonstrate that the application has not frozen. It can also give the user an opportunity to abort the operation.
 d->mContentWidget->mProgressBar->setRange(min,max);
 }
 /*!
 @beta
-Returns the value of the progressbar within the note.
+Returns the value of the progressbar within the dialog.
 This value is constrained as follows:
 \b minimum <= \c value <= \b maximum.
 \sa setValue()
 return d->mContentWidget->mProgressBar->progressValue();
 }
 /*!
 @beta
-Sets the value of the progressbar within the progress dialog.
+Sets the value for the progressbar within the progress dialog.
 After the timeline has been started the value is updated automatically.
 Use this function only if the timer is not used.
 This value is constrained as follows:
 \b minimum <= \c value <= \b maximum.
 }
 /*!
 @beta
 Closes the dialog while emitting the cancelled() signal. This function is called when
-user presses the Cancel button or then the timer expires.
+user presses the Cancel button or when the timer expires.
 */
 void HbProgressDialog::cancel()
 {
 emit cancelled();
 close();
 Sets the progressdialog type.
 The type of the progress dialog can be specified with one of the values:
 \li HbProgressDialog::ProgressDialog
 \li HbProgressDialog::WaitDialog
+\param type type for the progress dialog.
 \sa progressDialogType()
 */
 void HbProgressDialog::setProgressDialogType(HbProgressDialog::ProgressDialogType type)
 {
 Q_D(HbProgressDialog);
 return d->mNoteType;
 }
 /*!
 @beta
-Shows the progress dialog after a delay(say 1sec). This is a convenient slot.
+Shows the progress dialog after a delay, say 1sec. This is a convenient slot for the user.
-if user cancels progress dialog before delay getting expired, then progress dialog wont be shown at all
+if user cancels progress dialog before delay getting expired, then progress dialog wont be shown at all.
 */
 void HbProgressDialog::delayedShow()
 {
 Q_D(HbProgressDialog);
 }
 /*!
 @beta
 Returns the auto close flag.
+\return autoclose flag.
 \sa setAutoClose()
 */
 bool HbProgressDialog::autoClose () const
 {
 Q_D(const HbProgressDialog);
 }
 /*!
 @beta
 Sets the auto close flag.
+\param close based on which autoclose flag is set or reset.
 \sa autoClose()
 */
 void HbProgressDialog::setAutoClose ( bool close )
 {
 Q_D(HbProgressDialog);
 close?d->flags
 |= HbProgressDialogPrivate::Autoclose : d->flags &= ~HbProgressDialogPrivate::Autoclose;
 }
 /*!
-Initializes \a option with the values from this HbProgressDialog.
+\reimp
-This method is useful for subclasses when they need a HbStyleOptionProgressDialog,
-but don't want to fill in all the information themselves.
 */
 void HbProgressDialog::initStyleOption(HbStyleOptionProgressDialog *option) const
 {
 Q_D(const HbProgressDialog);
 /*!
 \reimp
 */
 void HbProgressDialog::closeEvent ( QCloseEvent * event )
 {
 Q_D(HbProgressDialog);
-d->mAction->setToolTip("");
 if(d->flags.testFlag(HbProgressDialogPrivate::Closetimer)){
 d->flags |= HbProgressDialogPrivate::Closepending;
 event->setAccepted(false);
 return;
 }
 return d->mIcon;
 }
-/*!
-\deprecated HbProgressDialog::setTextAlignment( Qt::Alignment )
-is deprecated.
-Sets the text alignment.
-\param align Qt defined alignment options can used.
-The default value is Qt::AlignLeft|Qt::AlignVCenter
-\sa mTextAlignment()
-*/
-void HbProgressDialog::setTextAlignment( Qt::Alignment align )
-{
-Q_D(HbProgressDialog);
-if (align != d->mAlign ){
-d->mAlign = align;
-if(d->mContentWidget->mTextItem)
-{
-HbStyleOptionProgressDialog progressDialogOption;
-initStyleOption(&progressDialogOption);
-style()->updatePrimitive(d->mContentWidget->mTextItem, HbStyle::P_ProgressDialog_text, &progressDialogOption);
-}
-}
-}
-/*!
-\deprecated HbProgressDialog::textAlignment() const
-is deprecated.
-Returns the text alignment.
-\sa setTextAlignment()
-*/
-Qt::Alignment HbProgressDialog::textAlignment() const
-{
-Q_D(const HbProgressDialog);
-return d->mAlign;
-}
-/*!
-\deprecated HbProgressDialog::setIconAlignment( Qt::Alignment )
-is deprecated.
-Sets the icon alignment.
-\param align Qt defined alignment options can used.
-The default value is Qt::AlignCenter.
-\sa mIconAlignment()
-*/
-void HbProgressDialog::setIconAlignment( Qt::Alignment align )
-{
-Q_D(HbProgressDialog);
-if (align != d->mIconAlignment){
-d->mIconAlignment = align;
-if (d->mContentWidget->mIconItem) {
-HbStyleOptionProgressDialog progressDialogOption;
-initStyleOption(&progressDialogOption);
-style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressDialogOption);
-}
-}
-}
-/*!
-\deprecated HbProgressDialog::iconAlignment() const
-is deprecated.
-Returns the icon alignment.
-\sa setIconAlignment()
-*/
-Qt::Alignment HbProgressDialog::iconAlignment() const
-{
-Q_D(const HbProgressDialog);
-return d->mIconAlignment;
-}
 #include "moc_hbprogressdialog.cpp"
 #include "hbprogressdialog.moc"

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 3	11d3954df52a