equal
deleted
inserted
replaced
636 */ |
636 */ |
637 void HbProgressDialog::showEvent(QShowEvent *event) |
637 void HbProgressDialog::showEvent(QShowEvent *event) |
638 { |
638 { |
639 Q_D(HbProgressDialog); |
639 Q_D(HbProgressDialog); |
640 d->mContentWidget->mProgressBar->show(); |
640 d->mContentWidget->mProgressBar->show(); |
641 d->mAction->setText(hbTrId("txt_common_button_cancel")); |
641 d->mActionText = d->mAction->text(); |
642 HbDialog::showEvent(event); |
642 HbDialog::showEvent(event); |
643 } |
643 } |
644 |
644 |
645 /*! |
645 /*! |
646 \reimp |
646 \reimp |
656 } |
656 } |
657 if(d->flags.testFlag(HbProgressDialogPrivate::Showtimer)){ |
657 if(d->flags.testFlag(HbProgressDialogPrivate::Showtimer)){ |
658 d->mTimer->stop(); |
658 d->mTimer->stop(); |
659 d->flags &= ~HbProgressDialogPrivate::Showtimer; |
659 d->flags &= ~HbProgressDialogPrivate::Showtimer; |
660 } |
660 } |
|
661 d->mAction->setText(d->mActionText); |
661 d->mContentWidget->mProgressBar->close(); |
662 d->mContentWidget->mProgressBar->close(); |
662 HbDialog::closeEvent(event); |
663 HbDialog::closeEvent(event); |
663 } |
664 } |
664 |
665 |
665 /*! |
666 /*! |