Auto time update #70

Merged
0xFEEDC0DE64 merged 2 commits from auto-time-update into master 2018-02-28 18:48:44 +01:00
2 changed files with 21 additions and 1 deletions
Showing only changes of commit 0b1fa67af4 - Show all commits

View File

@@ -12,6 +12,7 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QDesktopServices> #include <QDesktopServices>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTimerEvent>
#include <QDebug> #include <QDebug>
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
@@ -33,7 +34,8 @@ MainWindow::MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfass
m_erfassung(erfassung), m_erfassung(erfassung),
m_userInfo(userInfo), m_userInfo(userInfo),
m_stripFactory(stripFactory), m_stripFactory(stripFactory),
m_currentStripWidget(Q_NULLPTR) m_currentStripWidget(Q_NULLPTR),
m_timerId(-1)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -74,6 +76,8 @@ MainWindow::MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfass
connect(ui->pushButtonStart, &QAbstractButton::pressed, this, &MainWindow::pushButtonStartPressed); connect(ui->pushButtonStart, &QAbstractButton::pressed, this, &MainWindow::pushButtonStartPressed);
connect(ui->pushButtonEnd, &QAbstractButton::pressed, this, &MainWindow::pushButtonEndPressed); connect(ui->pushButtonEnd, &QAbstractButton::pressed, this, &MainWindow::pushButtonEndPressed);
m_timerId = startTimer(60000);
for(quint8 i = 0; i < 7; i++) for(quint8 i = 0; i < 7; i++)
{ {
m_stripsWidgets[i] = new StripsWidget(*this, ui->widgetWeek); m_stripsWidgets[i] = new StripsWidget(*this, ui->widgetWeek);
@@ -154,6 +158,16 @@ const std::array<StripsWidget*, 7> &MainWindow::stripsWidgets() const
return m_stripsWidgets; return m_stripsWidgets;
} }
void MainWindow::timerEvent(QTimerEvent *event)
{
if(event->timerId() == m_timerId)
{
ui->timeEditTime->setTime(timeNormalise(QTime::currentTime()));
}
else
QMainWindow::timerEvent(event);
}
void MainWindow::getProjectsFinished() void MainWindow::getProjectsFinished()
{ {
if(m_getProjectsReply->success()) if(m_getProjectsReply->success())

View File

@@ -50,6 +50,10 @@ Q_SIGNALS:
void dateChanged(const QDate &date); void dateChanged(const QDate &date);
void refreshEverything(); void refreshEverything();
protected:
// QObject interface
virtual void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
private Q_SLOTS: private Q_SLOTS:
void getProjectsFinished(); void getProjectsFinished();
void pushButtonNowPressed(); void pushButtonNowPressed();
@@ -76,4 +80,6 @@ private:
std::array<StripsWidget*, 7> m_stripsWidgets; std::array<StripsWidget*, 7> m_stripsWidgets;
StripsWidget *m_currentStripWidget; StripsWidget *m_currentStripWidget;
int m_timerId;
}; };