diff --git a/src/app/dialogs/app/dialoglayoutprogress.cpp b/src/app/dialogs/app/dialoglayoutprogress.cpp index bdfe9be34..926476ec0 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.cpp +++ b/src/app/dialogs/app/dialoglayoutprogress.cpp @@ -36,15 +36,17 @@ //--------------------------------------------------------------------------------------------------------------------- DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) - :QDialog(parent), ui(new Ui::DialogLayoutProgress) + :QDialog(parent), ui(new Ui::DialogLayoutProgress), maxCount(count) { ui->setupUi(this); qApp->getSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); - ui->progressBar->setMaximum(count); + ui->progressBar->setMaximum(maxCount); ui->progressBar->setValue(0); + ui->labelMessage->setText(tr("Arranged: %1 from %2").arg(0).arg(count)); + QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); SCASSERT(bCancel != nullptr); connect(bCancel, &QPushButton::clicked, this, &DialogLayoutProgress::StopWorking); @@ -69,6 +71,7 @@ void DialogLayoutProgress::Start() void DialogLayoutProgress::Arranged(int count) { ui->progressBar->setValue(count); + ui->labelMessage->setText(tr("Arranged: %1 from %2").arg(count).arg(maxCount)); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialoglayoutprogress.h b/src/app/dialogs/app/dialoglayoutprogress.h index 3d761c3d3..c89944bf5 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.h +++ b/src/app/dialogs/app/dialoglayoutprogress.h @@ -43,7 +43,7 @@ class DialogLayoutProgress : public QDialog Q_OBJECT public: - explicit DialogLayoutProgress(int count, QWidget *parent = 0); + DialogLayoutProgress(int count, QWidget *parent = 0); ~DialogLayoutProgress(); signals: @@ -59,6 +59,7 @@ public slots: private: Q_DISABLE_COPY(DialogLayoutProgress) Ui::DialogLayoutProgress *ui; + int maxCount; }; #endif // DIALOGLAYOUTPROGRESS_H diff --git a/src/app/dialogs/app/dialoglayoutprogress.ui b/src/app/dialogs/app/dialoglayoutprogress.ui index af18268af..f5459a0df 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.ui +++ b/src/app/dialogs/app/dialoglayoutprogress.ui @@ -63,11 +63,22 @@ - - - QDialogButtonBox::Cancel - - + + + + + Arranged: + + + + + + + QDialogButtonBox::Cancel + + + +