improve UI feedback when cancelling a task
This commit is contained in:
@@ -30,7 +30,8 @@
|
|||||||
namespace olive {
|
namespace olive {
|
||||||
|
|
||||||
ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) :
|
ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) :
|
||||||
QDialog(parent)
|
QDialog(parent),
|
||||||
|
show_progress_(true)
|
||||||
{
|
{
|
||||||
if (!title.isEmpty()) {
|
if (!title.isEmpty()) {
|
||||||
setWindowTitle(title);
|
setWindowTitle(title);
|
||||||
@@ -56,7 +57,19 @@ ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWi
|
|||||||
cancel_layout->addStretch();
|
cancel_layout->addStretch();
|
||||||
|
|
||||||
QPushButton* cancel_btn = new QPushButton(tr("Cancel"));
|
QPushButton* cancel_btn = new QPushButton(tr("Cancel"));
|
||||||
connect(cancel_btn, &QPushButton::clicked, this, &ProgressDialog::Cancelled);
|
|
||||||
|
// Signal that derivatives can connect to
|
||||||
|
connect(cancel_btn, &QPushButton::clicked, this, &ProgressDialog::Cancelled, Qt::DirectConnection);
|
||||||
|
|
||||||
|
// Stop updating the elapsed/remaining timers
|
||||||
|
connect(cancel_btn, &QPushButton::clicked, elapsed_timer_lbl_, &ElapsedCounterWidget::Stop);
|
||||||
|
|
||||||
|
// Disable the button so that users know they don't need to keep clicking it
|
||||||
|
connect(cancel_btn, &QPushButton::clicked, this, &ProgressDialog::DisableSenderWidget);
|
||||||
|
|
||||||
|
// Prevent the progress bar from continuing to move
|
||||||
|
connect(cancel_btn, &QPushButton::clicked, this, &ProgressDialog::DisableProgressWidgets);
|
||||||
|
|
||||||
cancel_layout->addWidget(cancel_btn);
|
cancel_layout->addWidget(cancel_btn);
|
||||||
|
|
||||||
cancel_layout->addStretch();
|
cancel_layout->addStretch();
|
||||||
@@ -80,6 +93,10 @@ void ProgressDialog::closeEvent(QCloseEvent *e)
|
|||||||
|
|
||||||
void ProgressDialog::SetProgress(double value)
|
void ProgressDialog::SetProgress(double value)
|
||||||
{
|
{
|
||||||
|
if (!show_progress_) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
int percent = qRound(100.0 * value);
|
int percent = qRound(100.0 * value);
|
||||||
|
|
||||||
bar_->setValue(percent);
|
bar_->setValue(percent);
|
||||||
@@ -101,4 +118,14 @@ void ProgressDialog::ShowErrorMessage(const QString &title, const QString &messa
|
|||||||
b.exec();
|
b.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ProgressDialog::DisableSenderWidget()
|
||||||
|
{
|
||||||
|
static_cast<QWidget*>(sender())->setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ProgressDialog::DisableProgressWidgets()
|
||||||
|
{
|
||||||
|
show_progress_ = false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,6 +54,13 @@ private:
|
|||||||
|
|
||||||
ElapsedCounterWidget* elapsed_timer_lbl_;
|
ElapsedCounterWidget* elapsed_timer_lbl_;
|
||||||
|
|
||||||
|
bool show_progress_;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void DisableSenderWidget();
|
||||||
|
|
||||||
|
void DisableProgressWidgets();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,6 +65,11 @@ void ElapsedCounterWidget::Start(qint64 start_time)
|
|||||||
UpdateTimers();
|
UpdateTimers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ElapsedCounterWidget::Stop()
|
||||||
|
{
|
||||||
|
elapsed_timer_.stop();
|
||||||
|
}
|
||||||
|
|
||||||
void ElapsedCounterWidget::UpdateTimers()
|
void ElapsedCounterWidget::UpdateTimers()
|
||||||
{
|
{
|
||||||
int64_t elapsed_ms, remaining_ms;
|
int64_t elapsed_ms, remaining_ms;
|
||||||
|
|||||||
@@ -40,6 +40,9 @@ public:
|
|||||||
void Start();
|
void Start();
|
||||||
void Start(qint64 start_time);
|
void Start(qint64 start_time);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void Stop();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLabel* elapsed_lbl_;
|
QLabel* elapsed_lbl_;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user