Compare commits
2 Commits
1e271201c5
...
061c57ef51
Author | SHA1 | Date | |
---|---|---|---|
061c57ef51 | |||
e82417dde7 |
@ -146,7 +146,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# syncCustomerRepositoryAndFS().
|
# syncCustomerRepositoryAndFS().
|
||||||
# 1.5.5 : Call into binary ptuPackageVersion to get installed package
|
# 1.5.5 : Call into binary ptuPackageVersion to get installed package
|
||||||
# versions.
|
# versions.
|
||||||
VERSION="1.5.5"
|
# 1.5.6 : Show additional update progress info in status bar.
|
||||||
|
VERSION="1.5.6"
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
|
@ -59,6 +59,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
|||||||
m_exitTimer->setSingleShot(true);
|
m_exitTimer->setSingleShot(true);
|
||||||
m_exitTimer->start(1800 * 1000);
|
m_exitTimer->start(1800 * 1000);
|
||||||
|
|
||||||
|
m_statusTimer = new QTimer(this);
|
||||||
|
if (m_statusTimer) {
|
||||||
|
connect(m_statusTimer, &QTimer::timeout, [this]() {
|
||||||
|
static QString p(".");
|
||||||
|
QTime const &t = QDateTime::currentDateTime().time();
|
||||||
|
QString s = t.toString(Qt::ISODate);
|
||||||
|
s += ": Update might take several minutes " + p;
|
||||||
|
if (p.length() >= 5) {
|
||||||
|
p = ".";
|
||||||
|
} else {
|
||||||
|
p += ".";
|
||||||
|
}
|
||||||
|
this->statusBar()->showMessage(s);
|
||||||
|
});
|
||||||
|
m_statusTimer->setSingleShot(false);
|
||||||
|
m_statusTimer->start(1000);
|
||||||
|
}
|
||||||
|
|
||||||
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
||||||
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
||||||
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
||||||
@ -76,6 +94,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
|||||||
MainWindow::~MainWindow() {
|
MainWindow::~MainWindow() {
|
||||||
delete m_startTimer;
|
delete m_startTimer;
|
||||||
delete m_exitTimer;
|
delete m_exitTimer;
|
||||||
|
delete m_statusTimer;
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,5 +73,6 @@ private:
|
|||||||
bool m_progressRunning;
|
bool m_progressRunning;
|
||||||
//int m_progressValue;
|
//int m_progressValue;
|
||||||
UpdateDcEvent::UpdateStep m_updateStep;
|
UpdateDcEvent::UpdateStep m_updateStep;
|
||||||
|
QTimer *m_statusTimer;
|
||||||
};
|
};
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
Loading…
Reference in New Issue
Block a user