Implement legacy forge button!
Many refactors of the task system. Progress dialog now accepts generic ProgressProvider objects
This commit is contained in:
20
logic/tasks/ProgressProvider.h
Normal file
20
logic/tasks/ProgressProvider.h
Normal file
@ -0,0 +1,20 @@
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
class ProgressProvider : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
protected:
|
||||
explicit ProgressProvider(QObject* parent = 0): QObject(parent){}
|
||||
signals:
|
||||
void started();
|
||||
void progress(qint64 current, qint64 total);
|
||||
void succeeded();
|
||||
void failed(QString reason);
|
||||
void status(QString status);
|
||||
public:
|
||||
virtual QString getStatus() const = 0;
|
||||
virtual void getProgress(qint64 ¤t, qint64 &total) = 0;
|
||||
virtual bool isRunning() const = 0;
|
||||
public slots:
|
||||
virtual void start() = 0;
|
||||
};
|
@ -16,70 +16,56 @@
|
||||
#include "Task.h"
|
||||
|
||||
Task::Task(QObject *parent) :
|
||||
QObject(parent)
|
||||
ProgressProvider(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
QString Task::getStatus() const
|
||||
{
|
||||
return status;
|
||||
return m_status;
|
||||
}
|
||||
|
||||
void Task::setStatus(const QString &status)
|
||||
void Task::setStatus(const QString &new_status)
|
||||
{
|
||||
this->status = status;
|
||||
emitStatusChange(status);
|
||||
m_status = new_status;
|
||||
emit status(new_status);
|
||||
}
|
||||
|
||||
int Task::getProgress() const
|
||||
void Task::setProgress(int new_progress)
|
||||
{
|
||||
return progress;
|
||||
m_progress = new_progress;
|
||||
emit progress(new_progress, 100);
|
||||
}
|
||||
|
||||
void Task::setProgress(int progress)
|
||||
void Task::getProgress(qint64& current, qint64& total)
|
||||
{
|
||||
this->progress = progress;
|
||||
emitProgressChange(progress);
|
||||
current = m_progress;
|
||||
total = 100;
|
||||
}
|
||||
|
||||
void Task::startTask()
|
||||
{
|
||||
emitStarted();
|
||||
executeTask();
|
||||
}
|
||||
|
||||
void Task::emitStarted()
|
||||
void Task::start()
|
||||
{
|
||||
running = true;
|
||||
m_running = true;
|
||||
emit started();
|
||||
executeTask();
|
||||
}
|
||||
|
||||
void Task::emitFailed(QString reason)
|
||||
{
|
||||
running = false;
|
||||
m_running = false;
|
||||
emit failed(reason);
|
||||
}
|
||||
|
||||
void Task::emitSucceeded()
|
||||
{
|
||||
running = false;
|
||||
m_running = false;
|
||||
emit succeeded();
|
||||
}
|
||||
|
||||
|
||||
bool Task::isRunning() const
|
||||
{
|
||||
return running;
|
||||
}
|
||||
|
||||
|
||||
void Task::emitStatusChange(const QString &status)
|
||||
{
|
||||
emit statusChanged(status);
|
||||
}
|
||||
|
||||
void Task::emitProgressChange(int progress)
|
||||
{
|
||||
emit progressChanged(progress);
|
||||
return m_running;
|
||||
}
|
||||
|
@ -13,53 +13,37 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef TASK_H
|
||||
#define TASK_H
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include "ProgressProvider.h"
|
||||
|
||||
class Task : public QObject
|
||||
class Task : public ProgressProvider
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Task(QObject *parent = 0);
|
||||
|
||||
QString getStatus() const;
|
||||
int getProgress() const;
|
||||
bool isRunning() const;
|
||||
virtual QString getStatus() const;
|
||||
virtual void getProgress(qint64& current, qint64& total);
|
||||
virtual bool isRunning() const;
|
||||
|
||||
public slots:
|
||||
void startTask();
|
||||
|
||||
protected slots:
|
||||
void setStatus(const QString& status);
|
||||
void setProgress(int progress);
|
||||
|
||||
signals:
|
||||
void started();
|
||||
void failed(QString reason);
|
||||
void succeeded();
|
||||
|
||||
void statusChanged(Task* task, const QString& status);
|
||||
void progressChanged(Task* task, int progress);
|
||||
|
||||
void statusChanged(const QString& status);
|
||||
void progressChanged(int progress);
|
||||
virtual void start();
|
||||
|
||||
protected:
|
||||
virtual void executeTask() = 0;
|
||||
|
||||
virtual void emitStarted();
|
||||
virtual void emitFailed(QString reason);
|
||||
virtual void emitSucceeded();
|
||||
|
||||
virtual void emitStatusChange(const QString &status);
|
||||
virtual void emitProgressChange(int progress);
|
||||
|
||||
QString status;
|
||||
int progress;
|
||||
bool running = false;
|
||||
};
|
||||
virtual void emitFailed(QString reason);
|
||||
|
||||
#endif // TASK_H
|
||||
protected slots:
|
||||
void setStatus(const QString& status);
|
||||
void setProgress(int progress);
|
||||
|
||||
protected:
|
||||
QString m_status;
|
||||
int m_progress = 0;
|
||||
bool m_running = false;
|
||||
};
|
||||
|
Reference in New Issue
Block a user