Compare commits
No commits in common. "061c57ef5115ac5efc2eff5c4ec29e1cc0b380b2" and "1e271201c5067b95d8abdf4fecabc33aea3208e4" have entirely different histories.
061c57ef51
...
1e271201c5
@ -146,8 +146,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# syncCustomerRepositoryAndFS().
|
||||
# 1.5.5 : Call into binary ptuPackageVersion to get installed package
|
||||
# versions.
|
||||
# 1.5.6 : Show additional update progress info in status bar.
|
||||
VERSION="1.5.6"
|
||||
VERSION="1.5.5"
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||
|
@ -59,24 +59,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
m_exitTimer->setSingleShot(true);
|
||||
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(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
||||
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
||||
@ -94,7 +76,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
MainWindow::~MainWindow() {
|
||||
delete m_startTimer;
|
||||
delete m_exitTimer;
|
||||
delete m_statusTimer;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
@ -73,6 +73,5 @@ private:
|
||||
bool m_progressRunning;
|
||||
//int m_progressValue;
|
||||
UpdateDcEvent::UpdateStep m_updateStep;
|
||||
QTimer *m_statusTimer;
|
||||
};
|
||||
#endif // MAINWINDOW_H
|
||||
|
Loading…
Reference in New Issue
Block a user