diff --git a/src/app/dialogs/app/dialoglayoutprogress.cpp b/src/app/dialogs/app/dialoglayoutprogress.cpp index 926476ec0..f15268cfe 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.cpp +++ b/src/app/dialogs/app/dialoglayoutprogress.cpp @@ -33,10 +33,11 @@ #include #include +#include //--------------------------------------------------------------------------------------------------------------------- DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) - :QDialog(parent), ui(new Ui::DialogLayoutProgress), maxCount(count) + :QDialog(parent), ui(new Ui::DialogLayoutProgress), maxCount(count), movie(nullptr) { ui->setupUi(this); @@ -45,7 +46,11 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) ui->progressBar->setMaximum(maxCount); ui->progressBar->setValue(0); - ui->labelMessage->setText(tr("Arranged: %1 from %2").arg(0).arg(count)); + ui->labelMessage->setText(tr("Arranged workpieces: %1 from %2").arg(0).arg(count)); + + movie = new QMovie("://icon/16x16/progress.gif"); + ui->labelProgress->setMovie (movie); + movie->start (); QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); SCASSERT(bCancel != nullptr); @@ -59,6 +64,7 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) DialogLayoutProgress::~DialogLayoutProgress() { delete ui; + delete movie; } //--------------------------------------------------------------------------------------------------------------------- @@ -71,7 +77,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)); + ui->labelMessage->setText(tr("Arranged workpieces: %1 from %2").arg(count).arg(maxCount)); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialoglayoutprogress.h b/src/app/dialogs/app/dialoglayoutprogress.h index c89944bf5..c1a91b9d2 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.h +++ b/src/app/dialogs/app/dialoglayoutprogress.h @@ -59,7 +59,8 @@ public slots: private: Q_DISABLE_COPY(DialogLayoutProgress) Ui::DialogLayoutProgress *ui; - int maxCount; + const int maxCount; + QMovie *movie; }; #endif // DIALOGLAYOUTPROGRESS_H diff --git a/src/app/dialogs/app/dialoglayoutprogress.ui b/src/app/dialogs/app/dialoglayoutprogress.ui index f5459a0df..ee6d5fa3c 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.ui +++ b/src/app/dialogs/app/dialoglayoutprogress.ui @@ -64,6 +64,13 @@ + + + + + + + diff --git a/src/app/share/resources/icon.qrc b/src/app/share/resources/icon.qrc index 2898d45e8..e14838f16 100644 --- a/src/app/share/resources/icon.qrc +++ b/src/app/share/resources/icon.qrc @@ -59,5 +59,6 @@ icon/24x24/fx.png icon/16x16/fx.png icon/16x16/roll.png + icon/16x16/progress.gif diff --git a/src/app/share/resources/icon/16x16/progress.gif b/src/app/share/resources/icon/16x16/progress.gif new file mode 100644 index 000000000..215f2864d Binary files /dev/null and b/src/app/share/resources/icon/16x16/progress.gif differ