Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 75433fe

Browse files
committed
ProgressDlg: only the activity has a finished slot
When a step progress reaches 100%, the progress bar changes to a green background.
1 parent 6aea9a2 commit 75433fe

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

Libs/libMacGitverCore/Widgets/ProgressDlg.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ void ProgressDlg::setPercentage(QObject* activity, const QString& step,
158158
Q_ASSERT(s);
159159

160160
s->mPercentage = qMin( qMax(percent, 0.), 1. ) * 100.;
161+
162+
if (s->mPercentage >= 100.) {
163+
s->resultChanged(Private::ProgressWdgt::Result::Ok);
164+
}
161165
}
162166

163167
void ProgressDlg::closeEvent( QCloseEvent* ev )
@@ -180,16 +184,6 @@ void ProgressDlg::finished(QObject* activity)
180184
a->resultChanged(Private::ProgressWdgt::Result::Ok);
181185
}
182186

183-
void ProgressDlg::finished(QObject* activity, const QString& step)
184-
{
185-
Private::ProgressWdgt* s = findStep(activity, step);
186-
Q_ASSERT(s);
187-
188-
s->mActive = false;
189-
s->mPercentage = 100.;
190-
s->resultChanged(Private::ProgressWdgt::Result::Ok);
191-
}
192-
193187
void ProgressDlg::setError(QObject* activity, const QString& message)
194188
{
195189
Private::ProgressWdgt* a = mActivities[activity];

Libs/libMacGitverCore/Widgets/ProgressDlg.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class MGV_CORE_API ProgressDlg : public BlueSky::Dialog
4949
void setPercentage(QObject* activity, const QString& step, qreal percent);
5050

5151
void finished(QObject* activity);
52-
void finished(QObject* activity, const QString& step);
5352

5453
void setError(QObject* activity, const QString& message);
5554

0 commit comments

Comments
 (0)