MainWindow now instantiates UpdateDialog
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
#include "updatedialog.h"
|
#include "updatedialog.h"
|
||||||
#include "ui_updatedialog.h"
|
#include "ui_updatedialog.h"
|
||||||
|
|
||||||
UpdateDialog::UpdateDialog(QWidget *parent) :
|
UpdateDialog::UpdateDialog(ZeiterfassungSettings &settings, QNetworkAccessManager *manager, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
ui(new Ui::UpdateDialog)
|
ui(new Ui::UpdateDialog),
|
||||||
|
m_settings(settings)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
}
|
}
|
||||||
|
@@ -3,6 +3,9 @@
|
|||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
|
class QNetworkAccessManager;
|
||||||
|
|
||||||
|
class ZeiterfassungSettings;
|
||||||
namespace Ui { class UpdateDialog; }
|
namespace Ui { class UpdateDialog; }
|
||||||
|
|
||||||
class UpdateDialog : public QDialog
|
class UpdateDialog : public QDialog
|
||||||
@@ -10,11 +13,12 @@ class UpdateDialog : public QDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit UpdateDialog(QWidget *parent = 0);
|
explicit UpdateDialog(ZeiterfassungSettings &settings, QNetworkAccessManager *manager, QWidget *parent = 0);
|
||||||
~UpdateDialog();
|
~UpdateDialog();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::UpdateDialog *ui;
|
Ui::UpdateDialog *ui;
|
||||||
|
ZeiterfassungSettings &m_settings;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // UPDATEDIALOG_H
|
#endif // UPDATEDIALOG_H
|
||||||
|
@@ -20,6 +20,7 @@
|
|||||||
#include "dialogs/bookingdialog.h"
|
#include "dialogs/bookingdialog.h"
|
||||||
#include "dialogs/timeassignmentdialog.h"
|
#include "dialogs/timeassignmentdialog.h"
|
||||||
#include "dialogs/settingsdialog.h"
|
#include "dialogs/settingsdialog.h"
|
||||||
|
#include "dialogs/updatedialog.h"
|
||||||
#include "strips/bookingstrip.h"
|
#include "strips/bookingstrip.h"
|
||||||
#include "strips/timeassignmentstrip.h"
|
#include "strips/timeassignmentstrip.h"
|
||||||
#include "models/bookingsmodel.h"
|
#include "models/bookingsmodel.h"
|
||||||
@@ -112,6 +113,9 @@ MainWindow::MainWindow(ZeiterfassungSettings &settings, Zeiterfassung &erfassung
|
|||||||
m_holidaysLabel->setFrameShadow(QFrame::Sunken);
|
m_holidaysLabel->setFrameShadow(QFrame::Sunken);
|
||||||
|
|
||||||
refresh(true);
|
refresh(true);
|
||||||
|
|
||||||
|
if(settings.lastUpdateCheck().isNull() || settings.lastUpdateCheck() < QDate::currentDate())
|
||||||
|
new UpdateDialog(settings, erfassung.manager(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
|
@@ -33,6 +33,11 @@ void Zeiterfassung::setUrl(const QString &url)
|
|||||||
Q_EMIT urlChanged(m_url = url);
|
Q_EMIT urlChanged(m_url = url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QNetworkAccessManager *Zeiterfassung::manager() const
|
||||||
|
{
|
||||||
|
return m_manager;
|
||||||
|
}
|
||||||
|
|
||||||
bool Zeiterfassung::doLoginPage()
|
bool Zeiterfassung::doLoginPage()
|
||||||
{
|
{
|
||||||
if(m_replies.login)
|
if(m_replies.login)
|
||||||
|
@@ -21,6 +21,8 @@ public:
|
|||||||
const QString &url() const;
|
const QString &url() const;
|
||||||
void setUrl(const QString &url);
|
void setUrl(const QString &url);
|
||||||
|
|
||||||
|
QNetworkAccessManager *manager() const;
|
||||||
|
|
||||||
struct UserInfo
|
struct UserInfo
|
||||||
{
|
{
|
||||||
int userId;
|
int userId;
|
||||||
|
Reference in New Issue
Block a user