From 89d4748117bce9d80a83fde6286ba3e527170848 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 13:28:20 +0100 Subject: [PATCH 01/18] Added plugin settings widget factory method --- zeiterfassungguilib/zeiterfassungplugin.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zeiterfassungguilib/zeiterfassungplugin.h b/zeiterfassungguilib/zeiterfassungplugin.h index ed50fb2..4e447c7 100644 --- a/zeiterfassungguilib/zeiterfassungplugin.h +++ b/zeiterfassungguilib/zeiterfassungplugin.h @@ -15,6 +15,8 @@ public: explicit ZeiterfassungPlugin(QObject *parent = Q_NULLPTR); virtual void attachTo(MainWindow &mainWindow) { Q_UNUSED(mainWindow) } + + virtual QWidget *settingsWidget(QWidget *parent = Q_NULLPTR) { Q_UNUSED(parent) return Q_NULLPTR; } }; Q_DECLARE_INTERFACE(ZeiterfassungPlugin, "dbsoftware.zeiterfassung.plugin/1.0") -- 2.50.1 From 237be4ffe5910e5f2945ef5713a5934335092d01 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 13:32:50 +0100 Subject: [PATCH 02/18] Added SettingsWidget class --- zeiterfassungguilib/settingswidget.cpp | 7 +++++++ zeiterfassungguilib/settingswidget.h | 19 +++++++++++++++++++ zeiterfassungguilib/zeiterfassungguilib.pro | 2 ++ zeiterfassungguilib/zeiterfassungplugin.h | 3 ++- 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 zeiterfassungguilib/settingswidget.cpp create mode 100644 zeiterfassungguilib/settingswidget.h diff --git a/zeiterfassungguilib/settingswidget.cpp b/zeiterfassungguilib/settingswidget.cpp new file mode 100644 index 0000000..d4c4878 --- /dev/null +++ b/zeiterfassungguilib/settingswidget.cpp @@ -0,0 +1,7 @@ +#include "settingswidget.h" + +SettingsWidget::SettingsWidget(QWidget *parent) : + QWidget(parent) +{ + +} diff --git a/zeiterfassungguilib/settingswidget.h b/zeiterfassungguilib/settingswidget.h new file mode 100644 index 0000000..d1d7a40 --- /dev/null +++ b/zeiterfassungguilib/settingswidget.h @@ -0,0 +1,19 @@ +#ifndef SETTINGSWIDGET_H +#define SETTINGSWIDGET_H + +#include +#include + +#include "zeiterfassungguilib_global.h" + +class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsWidget : public QWidget +{ + Q_OBJECT +public: + explicit SettingsWidget(QWidget *parent = nullptr); + +public Q_SLOTS: + virtual void apply() { } +}; + +#endif // SETTINGSWIDGET_H diff --git a/zeiterfassungguilib/zeiterfassungguilib.pro b/zeiterfassungguilib/zeiterfassungguilib.pro index a3e9a2d..30e4962 100644 --- a/zeiterfassungguilib/zeiterfassungguilib.pro +++ b/zeiterfassungguilib/zeiterfassungguilib.pro @@ -18,6 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSA DEFINES += ZEITERFASSUNGGUILIB_LIBRARY SOURCES += mainwindow.cpp \ + settingswidget.cpp \ stripfactory.cpp \ stripswidget.cpp \ zeiterfassungdialog.cpp \ @@ -27,6 +28,7 @@ SOURCES += mainwindow.cpp \ dialogs/settingsdialog.cpp HEADERS += mainwindow.h \ + settingswidget.h \ stripfactory.h \ stripswidget.h \ zeiterfassungguilib_global.h \ diff --git a/zeiterfassungguilib/zeiterfassungplugin.h b/zeiterfassungguilib/zeiterfassungplugin.h index 4e447c7..df265f2 100644 --- a/zeiterfassungguilib/zeiterfassungplugin.h +++ b/zeiterfassungguilib/zeiterfassungplugin.h @@ -6,6 +6,7 @@ class MainWindow; class StripsWidget; +class SettingsWidget; class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungPlugin : public QObject { @@ -16,7 +17,7 @@ public: virtual void attachTo(MainWindow &mainWindow) { Q_UNUSED(mainWindow) } - virtual QWidget *settingsWidget(QWidget *parent = Q_NULLPTR) { Q_UNUSED(parent) return Q_NULLPTR; } + virtual SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) { Q_UNUSED(parent) return Q_NULLPTR; } }; Q_DECLARE_INTERFACE(ZeiterfassungPlugin, "dbsoftware.zeiterfassung.plugin/1.0") -- 2.50.1 From 942be5a42edd3b472d8c5e8a777d59bea62fe819 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 13:39:38 +0100 Subject: [PATCH 03/18] Added WeatherSettings --- plugins/weatherplugin/weatherplugin.cpp | 6 ++++++ plugins/weatherplugin/weatherplugin.h | 2 ++ plugins/weatherplugin/weatherplugin.pro | 2 ++ plugins/weatherplugin/weathersettings.cpp | 20 ++++++++++++++++++++ plugins/weatherplugin/weathersettings.h | 18 ++++++++++++++++++ zeiterfassungguilib/settingswidget.h | 2 +- 6 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 plugins/weatherplugin/weathersettings.cpp create mode 100644 plugins/weatherplugin/weathersettings.h diff --git a/plugins/weatherplugin/weatherplugin.cpp b/plugins/weatherplugin/weatherplugin.cpp index b308b11..35842f3 100644 --- a/plugins/weatherplugin/weatherplugin.cpp +++ b/plugins/weatherplugin/weatherplugin.cpp @@ -9,6 +9,7 @@ #include "mainwindow.h" #include "weatherwidget.h" +#include "weathersettings.h" WeatherPlugin::WeatherPlugin(QObject *parent) : ZeiterfassungPlugin(parent) @@ -34,3 +35,8 @@ void WeatherPlugin::attachTo(MainWindow &mainWindow) { mainWindow.statusBar()->addWidget(new WeatherWidget(mainWindow)); } + +SettingsWidget *WeatherPlugin::settingsWidget(QWidget *parent) +{ + return new WeatherSettings(parent); +} diff --git a/plugins/weatherplugin/weatherplugin.h b/plugins/weatherplugin/weatherplugin.h index 07f4f68..f9d7b79 100644 --- a/plugins/weatherplugin/weatherplugin.h +++ b/plugins/weatherplugin/weatherplugin.h @@ -17,6 +17,8 @@ public: // ZeiterfassungPlugin interface void attachTo(MainWindow &mainWindow) Q_DECL_OVERRIDE; + SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) Q_DECL_OVERRIDE; + private: QTranslator m_translator; }; diff --git a/plugins/weatherplugin/weatherplugin.pro b/plugins/weatherplugin/weatherplugin.pro index 02016bc..398a0a2 100644 --- a/plugins/weatherplugin/weatherplugin.pro +++ b/plugins/weatherplugin/weatherplugin.pro @@ -17,9 +17,11 @@ DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT} DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT HEADERS += weatherplugin.h \ + weathersettings.h \ weatherwidget.h SOURCES += weatherplugin.cpp \ + weathersettings.cpp \ weatherwidget.cpp FORMS += diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp new file mode 100644 index 0000000..946ac68 --- /dev/null +++ b/plugins/weatherplugin/weathersettings.cpp @@ -0,0 +1,20 @@ +#include "weathersettings.h" + +#include +#include +#include + +WeatherSettings::WeatherSettings(QWidget *parent) : + SettingsWidget(parent) +{ + auto layout = new QFormLayout(this); + + layout->addRow(tr("Weather API:"), new QLineEdit(this)); + + setLayout(layout); +} + +void WeatherSettings::apply() +{ + qDebug() << "called"; +} diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h new file mode 100644 index 0000000..e65e53c --- /dev/null +++ b/plugins/weatherplugin/weathersettings.h @@ -0,0 +1,18 @@ +#ifndef WEATHERSETTINGS_H +#define WEATHERSETTINGS_H + +#include + +#include "settingswidget.h" + +class WeatherSettings : public SettingsWidget +{ + Q_OBJECT +public: + explicit WeatherSettings(QWidget *parent = Q_NULLPTR); + +public Q_SLOTS: + void apply() Q_DECL_OVERRIDE; +}; + +#endif // WEATHERSETTINGS_H diff --git a/zeiterfassungguilib/settingswidget.h b/zeiterfassungguilib/settingswidget.h index d1d7a40..dc3dd6b 100644 --- a/zeiterfassungguilib/settingswidget.h +++ b/zeiterfassungguilib/settingswidget.h @@ -10,7 +10,7 @@ class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsWidget : public QWidget { Q_OBJECT public: - explicit SettingsWidget(QWidget *parent = nullptr); + explicit SettingsWidget(QWidget *parent = Q_NULLPTR); public Q_SLOTS: virtual void apply() { } -- 2.50.1 From 7cea7aed9ccc2776f006475eeed90fbdcb3dfb4c Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 13:54:21 +0100 Subject: [PATCH 04/18] Plugins now get stored in a QSet --- plugins/weatherplugin/weatherplugin.cpp | 2 +- plugins/weatherplugin/weatherplugin.h | 2 +- zeiterfassung/main.cpp | 25 ++++--- zeiterfassungguilib/dialogs/settingsdialog.ui | 75 ++++++++++++------- zeiterfassungguilib/mainwindow.cpp | 3 +- zeiterfassungguilib/mainwindow.h | 4 +- zeiterfassungguilib/zeiterfassungplugin.h | 2 +- 7 files changed, 69 insertions(+), 44 deletions(-) diff --git a/plugins/weatherplugin/weatherplugin.cpp b/plugins/weatherplugin/weatherplugin.cpp index 35842f3..04d6066 100644 --- a/plugins/weatherplugin/weatherplugin.cpp +++ b/plugins/weatherplugin/weatherplugin.cpp @@ -36,7 +36,7 @@ void WeatherPlugin::attachTo(MainWindow &mainWindow) mainWindow.statusBar()->addWidget(new WeatherWidget(mainWindow)); } -SettingsWidget *WeatherPlugin::settingsWidget(QWidget *parent) +SettingsWidget *WeatherPlugin::settingsWidget(QWidget *parent) const { return new WeatherSettings(parent); } diff --git a/plugins/weatherplugin/weatherplugin.h b/plugins/weatherplugin/weatherplugin.h index f9d7b79..9ad7646 100644 --- a/plugins/weatherplugin/weatherplugin.h +++ b/plugins/weatherplugin/weatherplugin.h @@ -17,7 +17,7 @@ public: // ZeiterfassungPlugin interface void attachTo(MainWindow &mainWindow) Q_DECL_OVERRIDE; - SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) Q_DECL_OVERRIDE; + SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) const Q_DECL_OVERRIDE; private: QTranslator m_translator; diff --git a/zeiterfassung/main.cpp b/zeiterfassung/main.cpp index dc8fc86..7dbc081 100755 --- a/zeiterfassung/main.cpp +++ b/zeiterfassung/main.cpp @@ -34,7 +34,8 @@ struct { QTranslator zeiterfassungguilibTranslator; } translators; -QVector > pluginLoaders; +QSet > pluginLoaders; +QSet plugins; bool loadAndInstallTranslator(QTranslator &translator, const QString &filename) { @@ -290,7 +291,16 @@ bool loadPlugins(QSplashScreen &splashScreen) continue; } - pluginLoaders.append(pluginLoader); + if(auto plugin = qobject_cast(pluginLoader->instance())) + { + pluginLoaders.insert(pluginLoader); + plugins.insert(plugin); + } + else + QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Plugin not valid %0!"), + QCoreApplication::translate("main", "Plugin not valid %0!").arg(pluginLoader->fileName()) % + "\n\n" % pluginLoader->errorString()); + } return ok; @@ -350,16 +360,11 @@ int main(int argc, char *argv[]) loadPlugins(splashScreen); - MainWindow mainWindow(settings, erfassung, userInfo, stripFactory); + MainWindow mainWindow(settings, erfassung, userInfo, stripFactory, plugins); splashScreen.finish(&mainWindow); - for(auto &pluginLoader : pluginLoaders) - if(auto plugin = qobject_cast(pluginLoader->instance())) - plugin->attachTo(mainWindow); - else - QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Plugin not valid %0!"), - QCoreApplication::translate("main", "Plugin not valid %0!").arg(pluginLoader->fileName()) % - "\n\n" % pluginLoader->errorString()); + for(auto &plugin : plugins) + plugin->attachTo(mainWindow); mainWindow.show(); diff --git a/zeiterfassungguilib/dialogs/settingsdialog.ui b/zeiterfassungguilib/dialogs/settingsdialog.ui index b43be14..f1eed28 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.ui +++ b/zeiterfassungguilib/dialogs/settingsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 647 - 162 + 340 + 164 @@ -19,7 +19,7 @@ Settings - + @@ -33,35 +33,52 @@ - - - - - Language: - - - comboBoxLanguage - - - - - - - - - - Theme: - - - comboBoxTheme - - - - - + + + + + + + Language: + + + comboBoxLanguage + + + + + + + + + + Theme: + + + comboBoxTheme + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/zeiterfassungguilib/mainwindow.cpp b/zeiterfassungguilib/mainwindow.cpp index dfd8689..a456487 100644 --- a/zeiterfassungguilib/mainwindow.cpp +++ b/zeiterfassungguilib/mainwindow.cpp @@ -28,13 +28,14 @@ #include "replies/updatetimeassignmentreply.h" MainWindow::MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfassung, const GetUserInfoReply::UserInfo &userInfo, - StripFactory &stripFactory, QWidget *parent) : + StripFactory &stripFactory, const QSet &plugins, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), m_settings(settings), m_erfassung(erfassung), m_userInfo(userInfo), m_stripFactory(stripFactory), + m_plugins(plugins), m_currentStripWidget(Q_NULLPTR), m_timerId(-1) { diff --git a/zeiterfassungguilib/mainwindow.h b/zeiterfassungguilib/mainwindow.h index 2f1666b..3b3d57c 100644 --- a/zeiterfassungguilib/mainwindow.h +++ b/zeiterfassungguilib/mainwindow.h @@ -18,6 +18,7 @@ class QBoxLayout; namespace Ui { class MainWindow; } class ZeiterfassungSettings; class StripFactory; +class ZeiterfassungPlugin; class StripsWidget; class ZEITERFASSUNGGUILIBSHARED_EXPORT MainWindow : public QMainWindow @@ -26,7 +27,7 @@ class ZEITERFASSUNGGUILIBSHARED_EXPORT MainWindow : public QMainWindow public: explicit MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfassung, const GetUserInfoReply::UserInfo &userInfo, - StripFactory &stripFactory, QWidget *parent = Q_NULLPTR); + StripFactory &stripFactory, const QSet &plugins, QWidget *parent = Q_NULLPTR); ~MainWindow(); QMenu *menuFile() const; @@ -73,6 +74,7 @@ private: ZeiterfassungApi &m_erfassung; const GetUserInfoReply::UserInfo &m_userInfo; StripFactory &m_stripFactory; + const QSet &m_plugins; std::unique_ptr m_getProjectsReply; diff --git a/zeiterfassungguilib/zeiterfassungplugin.h b/zeiterfassungguilib/zeiterfassungplugin.h index df265f2..d691db1 100644 --- a/zeiterfassungguilib/zeiterfassungplugin.h +++ b/zeiterfassungguilib/zeiterfassungplugin.h @@ -17,7 +17,7 @@ public: virtual void attachTo(MainWindow &mainWindow) { Q_UNUSED(mainWindow) } - virtual SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) { Q_UNUSED(parent) return Q_NULLPTR; } + virtual SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) const { Q_UNUSED(parent) return Q_NULLPTR; } }; Q_DECLARE_INTERFACE(ZeiterfassungPlugin, "dbsoftware.zeiterfassung.plugin/1.0") -- 2.50.1 From cf3b5f4660d3c7d1dc0abe125121c33ce5455d28 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:07:50 +0100 Subject: [PATCH 05/18] Plugins can now have their own settings in the SettingsDialog #64 --- plugins/weatherplugin/weathersettings.cpp | 1 + zeiterfassung/main.cpp | 16 ++++++---------- zeiterfassungguilib/dialogs/settingsdialog.cpp | 15 ++++++++++++++- zeiterfassungguilib/dialogs/settingsdialog.h | 7 +++++-- zeiterfassungguilib/mainwindow.cpp | 2 +- zeiterfassungguilib/settingswidget.cpp | 1 - 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index 946ac68..da6f31b 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -8,6 +8,7 @@ WeatherSettings::WeatherSettings(QWidget *parent) : SettingsWidget(parent) { auto layout = new QFormLayout(this); + layout->setMargin(0); layout->addRow(tr("Weather API:"), new QLineEdit(this)); diff --git a/zeiterfassung/main.cpp b/zeiterfassung/main.cpp index 7dbc081..48676f2 100755 --- a/zeiterfassung/main.cpp +++ b/zeiterfassung/main.cpp @@ -34,7 +34,6 @@ struct { QTranslator zeiterfassungguilibTranslator; } translators; -QSet > pluginLoaders; QSet plugins; bool loadAndInstallTranslator(QTranslator &translator, const QString &filename) @@ -281,25 +280,22 @@ bool loadPlugins(QSplashScreen &splashScreen) continue; // to skip windows junk files } - auto pluginLoader = std::make_shared(fileInfo.filePath()); - if(!pluginLoader->load()) + QPluginLoader pluginLoader(fileInfo.filePath()); + if(!pluginLoader.load()) { QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Could not load plugin %0!"), QCoreApplication::translate("main", "Could not load plugin %0!").arg(fileInfo.fileName()) % - "\n\n" % pluginLoader->errorString()); + "\n\n" % pluginLoader.errorString()); ok = false; continue; } - if(auto plugin = qobject_cast(pluginLoader->instance())) - { - pluginLoaders.insert(pluginLoader); + if(auto plugin = qobject_cast(pluginLoader.instance())) plugins.insert(plugin); - } else QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Plugin not valid %0!"), - QCoreApplication::translate("main", "Plugin not valid %0!").arg(pluginLoader->fileName()) % - "\n\n" % pluginLoader->errorString()); + QCoreApplication::translate("main", "Plugin not valid %0!").arg(pluginLoader.fileName()) % + "\n\n" % pluginLoader.errorString()); } diff --git a/zeiterfassungguilib/dialogs/settingsdialog.cpp b/zeiterfassungguilib/dialogs/settingsdialog.cpp index ea84650..7df0f0d 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.cpp +++ b/zeiterfassungguilib/dialogs/settingsdialog.cpp @@ -5,12 +5,15 @@ #include #include #include +#include #include #include #include "zeiterfassungsettings.h" +#include "zeiterfassungplugin.h" +#include "settingswidget.h" -SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent) : +SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, const QSet &plugins, QWidget *parent) : ZeiterfassungDialog(parent), ui(new Ui::SettingsDialog), m_settings(settings) @@ -40,6 +43,16 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent) ui->comboBoxTheme->setCurrentIndex(index); } + for(const auto plugin : plugins) + { + auto widget = plugin->settingsWidget(this); + if(!widget) + continue; + + ui->verticalLayout->addWidget(widget); + m_settingsWidgets.append(widget); + } + connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::submit); } diff --git a/zeiterfassungguilib/dialogs/settingsdialog.h b/zeiterfassungguilib/dialogs/settingsdialog.h index 3315276..149869d 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.h +++ b/zeiterfassungguilib/dialogs/settingsdialog.h @@ -3,15 +3,17 @@ #include "zeiterfassungguilib_global.h" #include "zeiterfassungdialog.h" -class ZeiterfassungSettings; namespace Ui { class SettingsDialog; } +class ZeiterfassungSettings; +class ZeiterfassungPlugin; +class SettingsWidget; class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsDialog : public ZeiterfassungDialog { Q_OBJECT public: - explicit SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); + explicit SettingsDialog(ZeiterfassungSettings &settings, const QSet &plugins, QWidget *parent = Q_NULLPTR); ~SettingsDialog(); private Q_SLOTS: @@ -20,4 +22,5 @@ private Q_SLOTS: private: Ui::SettingsDialog *ui; ZeiterfassungSettings &m_settings; + QVector m_settingsWidgets; }; diff --git a/zeiterfassungguilib/mainwindow.cpp b/zeiterfassungguilib/mainwindow.cpp index a456487..df471f6 100644 --- a/zeiterfassungguilib/mainwindow.cpp +++ b/zeiterfassungguilib/mainwindow.cpp @@ -50,7 +50,7 @@ MainWindow::MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfass ui->actionRefresh->setShortcut(QKeySequence::Refresh); connect(ui->actionRefresh, &QAction::triggered, this, &MainWindow::refreshEverything); - connect(ui->actionSettings, &QAction::triggered, this, [this](){ SettingsDialog(m_settings, this).exec(); }); + connect(ui->actionSettings, &QAction::triggered, this, [this](){ SettingsDialog(m_settings, m_plugins, this).exec(); }); ui->actionHelp->setShortcut(QKeySequence::HelpContents); diff --git a/zeiterfassungguilib/settingswidget.cpp b/zeiterfassungguilib/settingswidget.cpp index d4c4878..1a0fa90 100644 --- a/zeiterfassungguilib/settingswidget.cpp +++ b/zeiterfassungguilib/settingswidget.cpp @@ -3,5 +3,4 @@ SettingsWidget::SettingsWidget(QWidget *parent) : QWidget(parent) { - } -- 2.50.1 From 18be548da241b811194d4e3507cf9d782ec8a198 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:21:43 +0100 Subject: [PATCH 06/18] Added isValid() to SettingsWidget --- plugins/weatherplugin/weathersettings.cpp | 8 ++++++++ plugins/weatherplugin/weathersettings.h | 2 ++ zeiterfassungguilib/dialogs/settingsdialog.cpp | 17 ++++++++++++++--- zeiterfassungguilib/settingswidget.h | 2 ++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index da6f31b..7fc257a 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -15,6 +15,14 @@ WeatherSettings::WeatherSettings(QWidget *parent) : setLayout(layout); } +bool WeatherSettings::isValid(QString &message) const +{ + Q_UNUSED(message) + + qDebug() << "called"; + return true; +} + void WeatherSettings::apply() { qDebug() << "called"; diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h index e65e53c..edbc4b2 100644 --- a/plugins/weatherplugin/weathersettings.h +++ b/plugins/weatherplugin/weathersettings.h @@ -11,6 +11,8 @@ class WeatherSettings : public SettingsWidget public: explicit WeatherSettings(QWidget *parent = Q_NULLPTR); + bool isValid(QString &message) const Q_DECL_OVERRIDE; + public Q_SLOTS: void apply() Q_DECL_OVERRIDE; }; diff --git a/zeiterfassungguilib/dialogs/settingsdialog.cpp b/zeiterfassungguilib/dialogs/settingsdialog.cpp index 7df0f0d..57e915e 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.cpp +++ b/zeiterfassungguilib/dialogs/settingsdialog.cpp @@ -72,10 +72,21 @@ void SettingsDialog::submit() return; } + for(const auto widget : m_settingsWidgets) + { + QString message; + if(!widget->isValid(message)) + { + QMessageBox::warning(this, tr("Invalid settings!"), tr("Invalid settings!") % "\n\n" % message); + return; + } + } + if(ui->comboBoxLanguage->currentData().value() != m_settings.language()) { m_settings.setLanguage(ui->comboBoxLanguage->currentData().value()); - warning = true; + //TODO #73 Allow changing of the language without restart + QMessageBox::information(this, tr("Restart required!"), tr("To apply the new settings a restart is required!")); } auto theme = ui->comboBoxTheme->currentData().toString(); @@ -108,8 +119,8 @@ void SettingsDialog::submit() m_settings.setTheme(theme); } - if(warning) - QMessageBox::information(this, tr("Restart required!"), tr("To apply the new settings a restart is required!")); + for(const auto widget : m_settingsWidgets) + widget->apply(); accept(); } diff --git a/zeiterfassungguilib/settingswidget.h b/zeiterfassungguilib/settingswidget.h index dc3dd6b..56fee50 100644 --- a/zeiterfassungguilib/settingswidget.h +++ b/zeiterfassungguilib/settingswidget.h @@ -12,6 +12,8 @@ class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsWidget : public QWidget public: explicit SettingsWidget(QWidget *parent = Q_NULLPTR); + virtual bool isValid(QString &message) const { Q_UNUSED(message) return true; } + public Q_SLOTS: virtual void apply() { } }; -- 2.50.1 From ad10f67af989314dfecc67f0534446142d3d3e37 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:32:02 +0100 Subject: [PATCH 07/18] Added settings argument to ZeiterfassungPlugin::settingsWidget --- plugins/weatherplugin/weatherplugin.cpp | 4 ++-- plugins/weatherplugin/weatherplugin.h | 5 ++++- plugins/weatherplugin/weathersettings.cpp | 5 +++-- plugins/weatherplugin/weathersettings.h | 7 ++++++- zeiterfassungguilib/dialogs/settingsdialog.cpp | 10 ++++------ zeiterfassungguilib/zeiterfassungplugin.cpp | 8 +++++++- zeiterfassungguilib/zeiterfassungplugin.h | 3 ++- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/plugins/weatherplugin/weatherplugin.cpp b/plugins/weatherplugin/weatherplugin.cpp index 04d6066..baac5db 100644 --- a/plugins/weatherplugin/weatherplugin.cpp +++ b/plugins/weatherplugin/weatherplugin.cpp @@ -36,7 +36,7 @@ void WeatherPlugin::attachTo(MainWindow &mainWindow) mainWindow.statusBar()->addWidget(new WeatherWidget(mainWindow)); } -SettingsWidget *WeatherPlugin::settingsWidget(QWidget *parent) const +SettingsWidget *WeatherPlugin::settingsWidget(ZeiterfassungSettings &settings, QWidget *parent) const { - return new WeatherSettings(parent); + return new WeatherSettings(settings, parent); } diff --git a/plugins/weatherplugin/weatherplugin.h b/plugins/weatherplugin/weatherplugin.h index 9ad7646..f4fd64c 100644 --- a/plugins/weatherplugin/weatherplugin.h +++ b/plugins/weatherplugin/weatherplugin.h @@ -5,6 +5,9 @@ #include "zeiterfassungplugin.h" +class SettingsWidget; +class ZeiterfassungSettings; + class Q_DECL_EXPORT WeatherPlugin : public ZeiterfassungPlugin { Q_OBJECT @@ -17,7 +20,7 @@ public: // ZeiterfassungPlugin interface void attachTo(MainWindow &mainWindow) Q_DECL_OVERRIDE; - SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) const Q_DECL_OVERRIDE; + SettingsWidget *settingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR) const Q_DECL_OVERRIDE; private: QTranslator m_translator; diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index 7fc257a..b89296f 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -4,8 +4,9 @@ #include #include -WeatherSettings::WeatherSettings(QWidget *parent) : - SettingsWidget(parent) +WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings, QWidget *parent) : + SettingsWidget(parent), + m_settings(settings) { auto layout = new QFormLayout(this); layout->setMargin(0); diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h index edbc4b2..f4a9e8d 100644 --- a/plugins/weatherplugin/weathersettings.h +++ b/plugins/weatherplugin/weathersettings.h @@ -5,16 +5,21 @@ #include "settingswidget.h" +class ZeiterfassungSettings; + class WeatherSettings : public SettingsWidget { Q_OBJECT public: - explicit WeatherSettings(QWidget *parent = Q_NULLPTR); + explicit WeatherSettings(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); bool isValid(QString &message) const Q_DECL_OVERRIDE; public Q_SLOTS: void apply() Q_DECL_OVERRIDE; + +private: + ZeiterfassungSettings &m_settings; }; #endif // WEATHERSETTINGS_H diff --git a/zeiterfassungguilib/dialogs/settingsdialog.cpp b/zeiterfassungguilib/dialogs/settingsdialog.cpp index 57e915e..2e2c315 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.cpp +++ b/zeiterfassungguilib/dialogs/settingsdialog.cpp @@ -24,7 +24,7 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, const QSetcomboBoxLanguage->addItem(tr("German"), QLocale::German); { - auto index = ui->comboBoxLanguage->findData(settings.language()); + auto index = ui->comboBoxLanguage->findData(m_settings.language()); if(index == -1) QMessageBox::warning(this, tr("Invalid settings!"), tr("Invalid settings!") % "\n\n" % tr("Unknown language!")); ui->comboBoxLanguage->setCurrentIndex(index); @@ -35,9 +35,9 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, const QSetcomboBoxTheme->addItem(entry.baseName(), entry.baseName()); - if(!settings.theme().isEmpty()) + if(!m_settings.theme().isEmpty()) { - auto index = ui->comboBoxTheme->findData(settings.theme()); + auto index = ui->comboBoxTheme->findData(m_settings.theme()); if(index == -1) QMessageBox::warning(this, tr("Invalid settings!"), tr("Invalid settings!") % "\n\n" % tr("Unknown theme!")); ui->comboBoxTheme->setCurrentIndex(index); @@ -45,7 +45,7 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, const QSetsettingsWidget(this); + auto widget = plugin->settingsWidget(m_settings, this); if(!widget) continue; @@ -63,8 +63,6 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::submit() { - auto warning = false; - if(ui->comboBoxLanguage->currentIndex() == -1 || ui->comboBoxTheme->currentIndex() == -1) { diff --git a/zeiterfassungguilib/zeiterfassungplugin.cpp b/zeiterfassungguilib/zeiterfassungplugin.cpp index 4436d93..0f0913a 100644 --- a/zeiterfassungguilib/zeiterfassungplugin.cpp +++ b/zeiterfassungguilib/zeiterfassungplugin.cpp @@ -3,5 +3,11 @@ ZeiterfassungPlugin::ZeiterfassungPlugin(QObject *parent) : QObject(parent) { - +} + +SettingsWidget *ZeiterfassungPlugin::settingsWidget(ZeiterfassungSettings &settings, QWidget *parent) const +{ + Q_UNUSED(settings) + Q_UNUSED(parent) + return Q_NULLPTR; } diff --git a/zeiterfassungguilib/zeiterfassungplugin.h b/zeiterfassungguilib/zeiterfassungplugin.h index d691db1..bcfc883 100644 --- a/zeiterfassungguilib/zeiterfassungplugin.h +++ b/zeiterfassungguilib/zeiterfassungplugin.h @@ -7,6 +7,7 @@ class MainWindow; class StripsWidget; class SettingsWidget; +class ZeiterfassungSettings; class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungPlugin : public QObject { @@ -17,7 +18,7 @@ public: virtual void attachTo(MainWindow &mainWindow) { Q_UNUSED(mainWindow) } - virtual SettingsWidget *settingsWidget(QWidget *parent = Q_NULLPTR) const { Q_UNUSED(parent) return Q_NULLPTR; } + virtual SettingsWidget *settingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR) const; }; Q_DECLARE_INTERFACE(ZeiterfassungPlugin, "dbsoftware.zeiterfassung.plugin/1.0") -- 2.50.1 From 73ea366466170b5d49457945cd6a9a84fa4e759f Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:34:40 +0100 Subject: [PATCH 08/18] Improved Docker caching --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5fca3e4..e997ef7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,10 @@ RUN apt update \ && apt install tzdata -y \ && rm /var/lib/apt/lists/* /var/log/* -Rf +RUN apt update \ + && apt install libssl1.0.0 ca-certificates libqt5core5a libqt5gui5 libqt5network5 libqt5multimedia5 -y \ + && rm /var/lib/apt/lists/* /var/log/* -Rf + RUN apt update \ && apt install git-core g++ make qt5-default qtmultimedia5-dev qttools5-dev qttools5-dev-tools -y \ && rm /var/lib/apt/lists/* /var/log/* -Rf -- 2.50.1 From bfd6b3e0e6745d52622f251f6aff1d0d214f9246 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:37:15 +0100 Subject: [PATCH 09/18] Moved line edit into member --- plugins/weatherplugin/weathersettings.cpp | 3 ++- plugins/weatherplugin/weathersettings.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index b89296f..a9a51b6 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -11,7 +11,8 @@ WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings, QWidget *paren auto layout = new QFormLayout(this); layout->setMargin(0); - layout->addRow(tr("Weather API:"), new QLineEdit(this)); + m_lineEdit = new QLineEdit(this); + layout->addRow(tr("Weather API:"), m_lineEdit); setLayout(layout); } diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h index f4a9e8d..e0a1b7a 100644 --- a/plugins/weatherplugin/weathersettings.h +++ b/plugins/weatherplugin/weathersettings.h @@ -20,6 +20,8 @@ public Q_SLOTS: private: ZeiterfassungSettings &m_settings; + + QLineEdit *m_lineEdit; }; #endif // WEATHERSETTINGS_H -- 2.50.1 From ef2d9b4dcc756edd1cba1db324d7554d291d3217 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:46:34 +0100 Subject: [PATCH 10/18] Added settings wrapper for weather --- plugins/weatherplugin/weatherplugin.cpp | 4 +-- plugins/weatherplugin/weatherplugin.pro | 2 ++ plugins/weatherplugin/weathersettings.cpp | 26 +++++----------- plugins/weatherplugin/weathersettings.h | 17 +++------- .../weatherplugin/weathersettingswidget.cpp | 31 +++++++++++++++++++ plugins/weatherplugin/weathersettingswidget.h | 29 +++++++++++++++++ plugins/weatherplugin/weatherwidget.cpp | 7 +++-- 7 files changed, 81 insertions(+), 35 deletions(-) create mode 100644 plugins/weatherplugin/weathersettingswidget.cpp create mode 100644 plugins/weatherplugin/weathersettingswidget.h diff --git a/plugins/weatherplugin/weatherplugin.cpp b/plugins/weatherplugin/weatherplugin.cpp index baac5db..a09feee 100644 --- a/plugins/weatherplugin/weatherplugin.cpp +++ b/plugins/weatherplugin/weatherplugin.cpp @@ -9,7 +9,7 @@ #include "mainwindow.h" #include "weatherwidget.h" -#include "weathersettings.h" +#include "weathersettingswidget.h" WeatherPlugin::WeatherPlugin(QObject *parent) : ZeiterfassungPlugin(parent) @@ -38,5 +38,5 @@ void WeatherPlugin::attachTo(MainWindow &mainWindow) SettingsWidget *WeatherPlugin::settingsWidget(ZeiterfassungSettings &settings, QWidget *parent) const { - return new WeatherSettings(settings, parent); + return new WeatherSettingsWidget(settings, parent); } diff --git a/plugins/weatherplugin/weatherplugin.pro b/plugins/weatherplugin/weatherplugin.pro index 398a0a2..ebed643 100644 --- a/plugins/weatherplugin/weatherplugin.pro +++ b/plugins/weatherplugin/weatherplugin.pro @@ -18,10 +18,12 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSA HEADERS += weatherplugin.h \ weathersettings.h \ + weathersettingswidget.h \ weatherwidget.h SOURCES += weatherplugin.cpp \ weathersettings.cpp \ + weathersettingswidget.cpp \ weatherwidget.cpp FORMS += diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index a9a51b6..52f4062 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -1,31 +1,21 @@ #include "weathersettings.h" -#include -#include -#include +#include "zeiterfassungsettings.h" -WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings, QWidget *parent) : - SettingsWidget(parent), +WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings) : m_settings(settings) { - auto layout = new QFormLayout(this); - layout->setMargin(0); - m_lineEdit = new QLineEdit(this); - layout->addRow(tr("Weather API:"), m_lineEdit); - - setLayout(layout); } -bool WeatherSettings::isValid(QString &message) const +QUrl WeatherSettings::url() const { - Q_UNUSED(message) - - qDebug() << "called"; - return true; + return m_settings.value(QStringLiteral("WeatherPlugin/url"), + QUrl(QStringLiteral("http://api.openweathermap.org/data/2.5/weather?q=Graz,AT&units=metric&APPID=40f6c892c6162680c6c9235169dc9f83"))) + .toUrl(); } -void WeatherSettings::apply() +void WeatherSettings::setUrl(const QUrl &url) { - qDebug() << "called"; + m_settings.setValue(QStringLiteral("WeatherPlugin/url"), url); } diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h index e0a1b7a..eaa0ff4 100644 --- a/plugins/weatherplugin/weathersettings.h +++ b/plugins/weatherplugin/weathersettings.h @@ -1,27 +1,20 @@ #ifndef WEATHERSETTINGS_H #define WEATHERSETTINGS_H -#include - -#include "settingswidget.h" +#include class ZeiterfassungSettings; -class WeatherSettings : public SettingsWidget +class WeatherSettings { - Q_OBJECT public: - explicit WeatherSettings(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); + WeatherSettings(ZeiterfassungSettings &settings); - bool isValid(QString &message) const Q_DECL_OVERRIDE; - -public Q_SLOTS: - void apply() Q_DECL_OVERRIDE; + QUrl url() const; + void setUrl(const QUrl &url); private: ZeiterfassungSettings &m_settings; - - QLineEdit *m_lineEdit; }; #endif // WEATHERSETTINGS_H diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp new file mode 100644 index 0000000..78fef05 --- /dev/null +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -0,0 +1,31 @@ +#include "weathersettingswidget.h" + +#include +#include +#include + +WeatherSettingsWidget::WeatherSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent) : + SettingsWidget(parent), + m_settings(settings) +{ + auto layout = new QFormLayout(this); + layout->setMargin(0); + + m_lineEdit = new QLineEdit(this); + layout->addRow(tr("Weather API:"), m_lineEdit); + + setLayout(layout); +} + +bool WeatherSettingsWidget::isValid(QString &message) const +{ + Q_UNUSED(message) + + qDebug() << "called"; + return true; +} + +void WeatherSettingsWidget::apply() +{ + qDebug() << "called"; +} diff --git a/plugins/weatherplugin/weathersettingswidget.h b/plugins/weatherplugin/weathersettingswidget.h new file mode 100644 index 0000000..ffc8920 --- /dev/null +++ b/plugins/weatherplugin/weathersettingswidget.h @@ -0,0 +1,29 @@ +#ifndef WEATHERSETTINGS_H +#define WEATHERSETTINGS_H + +#include + +#include "settingswidget.h" + +class QLineEdit; + +class ZeiterfassungSettings; + +class WeatherSettingsWidget : public SettingsWidget +{ + Q_OBJECT +public: + explicit WeatherSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); + + bool isValid(QString &message) const Q_DECL_OVERRIDE; + +public Q_SLOTS: + void apply() Q_DECL_OVERRIDE; + +private: + ZeiterfassungSettings &m_settings; + + QLineEdit *m_lineEdit; +}; + +#endif // WEATHERSETTINGS_H diff --git a/plugins/weatherplugin/weatherwidget.cpp b/plugins/weatherplugin/weatherwidget.cpp index 764bf99..9d62b09 100644 --- a/plugins/weatherplugin/weatherwidget.cpp +++ b/plugins/weatherplugin/weatherwidget.cpp @@ -14,6 +14,8 @@ #include "zeiterfassungsettings.h" #include "zeiterfassungapi.h" +#include "weathersettings.h" + WeatherWidget::WeatherWidget(MainWindow &mainWindow) : QLabel(&mainWindow), m_mainWindow(mainWindow) @@ -30,10 +32,9 @@ void WeatherWidget::refresh() { setText(tr("Loading...")); - auto url = m_mainWindow.settings().value(QStringLiteral("WeatherPlugin/url"), - QStringLiteral("http://api.openweathermap.org/data/2.5/weather?q=Graz,AT&units=metric&APPID=40f6c892c6162680c6c9235169dc9f83")).toString(); + auto url = WeatherSettings(m_mainWindow.settings()).url(); - m_reply = std::unique_ptr(m_mainWindow.erfassung().manager()->get(QNetworkRequest(QUrl(url)))); + m_reply = std::unique_ptr(m_mainWindow.erfassung().manager()->get(QNetworkRequest(url))); connect(m_reply.get(), &QNetworkReply::finished, this, &WeatherWidget::finished); } -- 2.50.1 From 8760c046f3d59d6f4abe9c4a7c4db936b390c9fd Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:50:27 +0100 Subject: [PATCH 11/18] QLineEdit now shows weather api url --- plugins/weatherplugin/weathersettingswidget.cpp | 2 +- plugins/weatherplugin/weathersettingswidget.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp index 78fef05..bbc1ae8 100644 --- a/plugins/weatherplugin/weathersettingswidget.cpp +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -11,7 +11,7 @@ WeatherSettingsWidget::WeatherSettingsWidget(ZeiterfassungSettings &settings, QW auto layout = new QFormLayout(this); layout->setMargin(0); - m_lineEdit = new QLineEdit(this); + m_lineEdit = new QLineEdit(m_settings.url().toString(), this); layout->addRow(tr("Weather API:"), m_lineEdit); setLayout(layout); diff --git a/plugins/weatherplugin/weathersettingswidget.h b/plugins/weatherplugin/weathersettingswidget.h index ffc8920..d962a33 100644 --- a/plugins/weatherplugin/weathersettingswidget.h +++ b/plugins/weatherplugin/weathersettingswidget.h @@ -1,10 +1,12 @@ -#ifndef WEATHERSETTINGS_H -#define WEATHERSETTINGS_H +#ifndef WEATHERSETTINGSWIDGET_H +#define WEATHERSETTINGSWIDGET_H #include #include "settingswidget.h" +#include "weathersettings.h" + class QLineEdit; class ZeiterfassungSettings; @@ -21,9 +23,9 @@ public Q_SLOTS: void apply() Q_DECL_OVERRIDE; private: - ZeiterfassungSettings &m_settings; + WeatherSettings m_settings; QLineEdit *m_lineEdit; }; -#endif // WEATHERSETTINGS_H +#endif // WEATHERSETTINGSWIDGET_H -- 2.50.1 From 5f093b22feccab507dc996fdea298e5f5d23fb51 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 14:55:29 +0100 Subject: [PATCH 12/18] Implemented WeatherSettingsWidget::isValid --- plugins/weatherplugin/weathersettingswidget.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp index bbc1ae8..d48c4e2 100644 --- a/plugins/weatherplugin/weathersettingswidget.cpp +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -19,13 +19,15 @@ WeatherSettingsWidget::WeatherSettingsWidget(ZeiterfassungSettings &settings, QW bool WeatherSettingsWidget::isValid(QString &message) const { - Q_UNUSED(message) + auto valid = QUrl::fromUserInput(m_lineEdit->text()).isValid(); - qDebug() << "called"; - return true; + if(!valid) + message = tr("The weather api url is invalid!"); + + return valid; } void WeatherSettingsWidget::apply() { - qDebug() << "called"; + m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text())); } -- 2.50.1 From ac1edf2372dca7f347c3bcbb8cc4042ccc47429d Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:16:23 +0100 Subject: [PATCH 13/18] The url is now stored as a QUrl in settings --- zeiterfassung/main.cpp | 17 +++++++-- zeiterfassungcorelib/zeiterfassungapi.cpp | 38 +++++++++---------- zeiterfassungcorelib/zeiterfassungapi.h | 9 +++-- .../zeiterfassungsettings.cpp | 6 +-- zeiterfassungcorelib/zeiterfassungsettings.h | 5 ++- 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/zeiterfassung/main.cpp b/zeiterfassung/main.cpp index dc8fc86..04df232 100755 --- a/zeiterfassung/main.cpp +++ b/zeiterfassung/main.cpp @@ -178,14 +178,23 @@ bool loadLoginPage(QSplashScreen &splashScreen, ZeiterfassungSettings &settings, QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Could not access Zeiterfassung!"), QCoreApplication::translate("main", "Could not access Zeiterfassung!") % "\n\n" % reply->message()); + inputAgain: bool ok; - auto url = QInputDialog::getText(&splashScreen, QCoreApplication::translate("main", "Base url"), - QCoreApplication::translate("main", "Please enter the base url to the Zeiterfassung:"), - QLineEdit::Normal, settings.url(), &ok); + auto text = QInputDialog::getText(&splashScreen, QCoreApplication::translate("main", "Base url"), + QCoreApplication::translate("main", "Please enter the base url to the Zeiterfassung:"), + QLineEdit::Normal, settings.url().toString(), &ok); if(!ok) return false; + auto url = QUrl::fromUserInput(text); + if(!url.isValid()) + { + QMessageBox::warning(&splashScreen, QCoreApplication::translate("main", "Invalid url!"), + QCoreApplication::translate("main", "This url is not valid!")); + goto inputAgain; + } + settings.setUrl(url); erfassung.setUrl(url); @@ -335,7 +344,7 @@ int main(int argc, char *argv[]) if(!loadStripLayouts(splashScreen, stripFactory)) return -3; - ZeiterfassungApi erfassung(settings.url(), &app); + ZeiterfassungApi erfassung(settings.url().toString(), &app); if(!loadLoginPage(splashScreen, settings, erfassung)) return -4; diff --git a/zeiterfassungcorelib/zeiterfassungapi.cpp b/zeiterfassungcorelib/zeiterfassungapi.cpp index 16d0a02..a125acc 100644 --- a/zeiterfassungcorelib/zeiterfassungapi.cpp +++ b/zeiterfassungcorelib/zeiterfassungapi.cpp @@ -28,19 +28,19 @@ //add support for pre cpp14 compilers #include "cpp14polyfills.h" -ZeiterfassungApi::ZeiterfassungApi(const QString &url, QObject *parent) : +ZeiterfassungApi::ZeiterfassungApi(const QUrl &url, QObject *parent) : QObject(parent), m_url(url), m_manager(new QNetworkAccessManager(this)) { } -const QString &ZeiterfassungApi::url() const +const QUrl &ZeiterfassungApi::url() const { return m_url; } -void ZeiterfassungApi::setUrl(const QString &url) +void ZeiterfassungApi::setUrl(const QUrl &url) { m_url = url; } @@ -52,14 +52,14 @@ QNetworkAccessManager *ZeiterfassungApi::manager() const std::unique_ptr ZeiterfassungApi::doLoginPage() { - QNetworkRequest request(QUrl(m_url % "pages/login.jsp")); + QNetworkRequest request(QUrl(m_url.toString() % "pages/login.jsp")); return std::make_unique(std::unique_ptr(m_manager->get(request)), this); } std::unique_ptr ZeiterfassungApi::doLogin(const QString &username, const QString &password) { - QNetworkRequest request(QUrl(m_url % "pages/j_spring_security_check")); + QNetworkRequest request(QUrl(m_url.toString() % "pages/j_spring_security_check")); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/x-www-form-urlencoded")); request.setMaximumRedirectsAllowed(0); @@ -70,10 +70,10 @@ std::unique_ptr ZeiterfassungApi::doLogin(const QString &username, c std::unique_ptr ZeiterfassungApi::doUserInfo() { - QNetworkRequest request0(QUrl(m_url % "json/evoAppsUserInfoDialogController/load-EvoAppsUserInfoTO")); + QNetworkRequest request0(QUrl(m_url.toString() % "json/evoAppsUserInfoDialogController/load-EvoAppsUserInfoTO")); request0.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("home")); - QNetworkRequest request1(QUrl(m_url % "json/persons")); + QNetworkRequest request1(QUrl(m_url.toString() % "json/persons")); request1.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); return std::make_unique(std::unique_ptr(m_manager->get(request0)), @@ -83,7 +83,7 @@ std::unique_ptr ZeiterfassungApi::doUserInfo() std::unique_ptr ZeiterfassungApi::doGetBookings(int userId, const QDate &start, const QDate &end) { QNetworkRequest request(QUrl(QStringLiteral("%0json/bookings?start=%1&end=%2&pnrLst=%3") - .arg(m_url) + .arg(m_url.toString()) .arg(start.toString(QStringLiteral("yyyyMMdd"))) .arg(end.toString(QStringLiteral("yyyyMMdd"))) .arg(userId))); @@ -95,7 +95,7 @@ std::unique_ptr ZeiterfassungApi::doGetBookings(int userId, co std::unique_ptr ZeiterfassungApi::doCreateBooking(int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &type, const QString &text) { - QNetworkRequest request(QUrl(m_url % "json/booking")); + QNetworkRequest request(QUrl(m_url.toString() % "json/booking")); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -118,7 +118,7 @@ std::unique_ptr ZeiterfassungApi::doCreateBooking(int userId std::unique_ptr ZeiterfassungApi::doUpdateBooking(int bookingId, int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &type, const QString &text) { - QNetworkRequest request(QUrl(QStringLiteral("%0json/booking/%1").arg(m_url).arg(bookingId))); + QNetworkRequest request(QUrl(QStringLiteral("%0json/booking/%1").arg(m_url.toString()).arg(bookingId))); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -142,7 +142,7 @@ std::unique_ptr ZeiterfassungApi::doUpdateBooking(int bookin std::unique_ptr ZeiterfassungApi::doDeleteBooking(int bookingId) { QNetworkRequest request(QUrl(QStringLiteral("%0json/booking/%1?text=") - .arg(m_url) + .arg(m_url.toString()) .arg(bookingId))); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -152,7 +152,7 @@ std::unique_ptr ZeiterfassungApi::doDeleteBooking(int bookin std::unique_ptr ZeiterfassungApi::doGetTimeAssignments(int userId, const QDate &start, const QDate &end) { QNetworkRequest request(QUrl(QStringLiteral("%0json/azebooking?start=%1&end=%2&pnrLst=%3") - .arg(m_url) + .arg(m_url.toString()) .arg(start.toString(QStringLiteral("yyyyMMdd"))) .arg(end.toString(QStringLiteral("yyyyMMdd"))) .arg(userId))); @@ -166,7 +166,7 @@ std::unique_ptr ZeiterfassungApi::doCreateTimeAssignm const QString &subproject, const QString &workpackage, const QString &text) { - QNetworkRequest request(QUrl(m_url % "json/azebooking")); + QNetworkRequest request(QUrl(m_url.toString() % "json/azebooking")); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -207,7 +207,7 @@ std::unique_ptr ZeiterfassungApi::doUpdateTimeAssignm const QString &subproject, const QString &workpackage, const QString &text) { - QNetworkRequest request(QUrl(QStringLiteral("%0json/azebooking/%1").arg(m_url).arg(timeAssignmentId))); + QNetworkRequest request(QUrl(QStringLiteral("%0json/azebooking/%1").arg(m_url.toString()).arg(timeAssignmentId))); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -251,7 +251,7 @@ std::unique_ptr ZeiterfassungApi::doUpdateTimeAssignm std::unique_ptr ZeiterfassungApi::doDeleteTimeAssignment(int timeAssignmentId) { QNetworkRequest request(QUrl(QStringLiteral("%0json/azebooking/%1") - .arg(m_url) + .arg(m_url.toString()) .arg(timeAssignmentId))); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -261,7 +261,7 @@ std::unique_ptr ZeiterfassungApi::doDeleteTimeAssignm std::unique_ptr ZeiterfassungApi::doGetProjects(int userId, const QDate &date) { QNetworkRequest request(QUrl(QStringLiteral("%0json/combobox?persnr=%1&date=%2&dqkey=KOST&kowert0=&kowert1=&kowert2=&term=") - .arg(m_url) + .arg(m_url.toString()) .arg(userId) .arg(date.toString(QStringLiteral("yyyyMMdd"))))); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -272,7 +272,7 @@ std::unique_ptr ZeiterfassungApi::doGetProjects(int userId, co std::unique_ptr ZeiterfassungApi::doGetReport(int userId, const QDate &date) { QNetworkRequest request(QUrl(QStringLiteral("%0json/auswertung/month?persNr=%1&date=%2") - .arg(m_url) + .arg(m_url.toString()) .arg(userId) .arg(date.toString(QStringLiteral("yyyyMMdd"))))); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("bookingCalendar")); @@ -282,7 +282,7 @@ std::unique_ptr ZeiterfassungApi::doGetReport(int userId, const std::unique_ptr ZeiterfassungApi::doGetPresenceStatus() { - QNetworkRequest request(QUrl(m_url % "json/presencestatus")); + QNetworkRequest request(QUrl(m_url.toString() % "json/presencestatus")); request.setRawHeader(QByteArrayLiteral("sisAppName"), QByteArrayLiteral("presenceStatus")); return std::make_unique(std::unique_ptr(m_manager->get(request)), this); @@ -291,7 +291,7 @@ std::unique_ptr ZeiterfassungApi::doGetPresenceStatus() std::unique_ptr ZeiterfassungApi::doGetAbsences(int userId, const QDate &start, const QDate &end) { QNetworkRequest request(QUrl(QStringLiteral("%0json/fulldayAbsences?start=%1&end=%2&pnrLst=%3") - .arg(m_url) + .arg(m_url.toString()) .arg(start.toString(QStringLiteral("yyyyMMdd"))) .arg(end.toString(QStringLiteral("yyyyMMdd"))) .arg(userId))); diff --git a/zeiterfassungcorelib/zeiterfassungapi.h b/zeiterfassungcorelib/zeiterfassungapi.h index 8af9b71..a3f3107 100644 --- a/zeiterfassungcorelib/zeiterfassungapi.h +++ b/zeiterfassungcorelib/zeiterfassungapi.h @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -32,10 +33,10 @@ class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungApi : public QObject Q_OBJECT public: - explicit ZeiterfassungApi(const QString &url, QObject *parent = Q_NULLPTR); + explicit ZeiterfassungApi(const QUrl &url, QObject *parent = Q_NULLPTR); - const QString &url() const; - void setUrl(const QString &url); + const QUrl &url() const; + void setUrl(const QUrl &url); QNetworkAccessManager *manager() const; @@ -67,6 +68,6 @@ public: std::unique_ptr doGetAbsences(int userId, const QDate &start, const QDate &end); private: - QString m_url; + QUrl m_url; QNetworkAccessManager *m_manager; }; diff --git a/zeiterfassungcorelib/zeiterfassungsettings.cpp b/zeiterfassungcorelib/zeiterfassungsettings.cpp index 18149be..0e9d5b2 100644 --- a/zeiterfassungcorelib/zeiterfassungsettings.cpp +++ b/zeiterfassungcorelib/zeiterfassungsettings.cpp @@ -42,12 +42,12 @@ void ZeiterfassungSettings::setLanguage(QLocale::Language language) setValue(QStringLiteral("language"), language); } -QString ZeiterfassungSettings::url() const +QUrl ZeiterfassungSettings::url() const { - return value(QStringLiteral("url"), QStringLiteral("http://10.1.0.11:8080/evoApps/")).toString(); + return value(QStringLiteral("url"), QUrl(QStringLiteral("http://10.1.0.11:8080/evoApps/"))).toUrl(); } -void ZeiterfassungSettings::setUrl(const QString &url) +void ZeiterfassungSettings::setUrl(const QUrl &url) { setValue(QStringLiteral("url"), url); } diff --git a/zeiterfassungcorelib/zeiterfassungsettings.h b/zeiterfassungcorelib/zeiterfassungsettings.h index 843ea9c..1fe7c60 100644 --- a/zeiterfassungcorelib/zeiterfassungsettings.h +++ b/zeiterfassungcorelib/zeiterfassungsettings.h @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -25,8 +26,8 @@ public: QLocale::Language language() const; void setLanguage(QLocale::Language language); - QString url() const; - void setUrl(const QString &url); + QUrl url() const; + void setUrl(const QUrl &url); QString username() const; void setUsername(const QString &username); -- 2.50.1 From 245c05a045318f1b73f5b58eb00d1913c11bf68d Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:27:39 +0100 Subject: [PATCH 14/18] Added LunchMealSettingsWrapper --- plugins/lunchmealplugin/lunchmealplugin.pro | 6 ++-- plugins/lunchmealplugin/lunchmealsettings.cpp | 31 +++++++++++++++++++ plugins/lunchmealplugin/lunchmealsettings.h | 23 ++++++++++++++ plugins/lunchmealplugin/lunchmealwidget.cpp | 8 ++--- 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 plugins/lunchmealplugin/lunchmealsettings.cpp create mode 100644 plugins/lunchmealplugin/lunchmealsettings.h diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index daf797d..1579638 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -18,11 +18,13 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSA HEADERS += lunchmealdialog.h \ lunchmealplugin.h \ - lunchmealwidget.h + lunchmealwidget.h \ + lunchmealsettings.h SOURCES += lunchmealdialog.cpp \ lunchmealplugin.cpp \ - lunchmealwidget.cpp + lunchmealwidget.cpp \ + lunchmealsettings.cpp FORMS += lunchmealdialog.ui diff --git a/plugins/lunchmealplugin/lunchmealsettings.cpp b/plugins/lunchmealplugin/lunchmealsettings.cpp new file mode 100644 index 0000000..f210fb6 --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealsettings.cpp @@ -0,0 +1,31 @@ +#include "lunchmealsettings.h" + +#include "zeiterfassungsettings.h" + +LunchMealSettings::LunchMealSettings(ZeiterfassungSettings &settings) : + m_settings(settings) +{ + +} + +QUrl LunchMealSettings::url() const +{ + return m_settings.value(QStringLiteral("LunchMealPlugin/url"), + QUrl(QStringLiteral("https://brunner.ninja/lunch/%0.txt"))) + .toUrl(); +} + +void LunchMealSettings::setUrl(const QUrl &url) +{ + m_settings.setValue(QStringLiteral("LunchMealPlugin/url"), url); +} + +QString LunchMealSettings::dateFormat() const +{ + return m_settings.value(QStringLiteral("LunchMealPlugin/dateFormat"), QStringLiteral("yyyy-MM-dd")).toString(); +} + +void LunchMealSettings::setDateFormat(const QString &dateFormat) +{ + m_settings.setValue(QStringLiteral("LunchMealPlugin/dateFormat"), dateFormat); +} diff --git a/plugins/lunchmealplugin/lunchmealsettings.h b/plugins/lunchmealplugin/lunchmealsettings.h new file mode 100644 index 0000000..63d4c83 --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealsettings.h @@ -0,0 +1,23 @@ +#ifndef LUNCHMEALSETTINGS_H +#define LUNCHMEALSETTINGS_H + +#include + +class ZeiterfassungSettings; + +class LunchMealSettings +{ +public: + LunchMealSettings(ZeiterfassungSettings &settings); + + QUrl url() const; + void setUrl(const QUrl &url); + + QString dateFormat() const; + void setDateFormat(const QString &dateFormat); + +private: + ZeiterfassungSettings &m_settings; +}; + +#endif // LUNCHMEALSETTINGS_H diff --git a/plugins/lunchmealplugin/lunchmealwidget.cpp b/plugins/lunchmealplugin/lunchmealwidget.cpp index 47d6649..6083b3c 100644 --- a/plugins/lunchmealplugin/lunchmealwidget.cpp +++ b/plugins/lunchmealplugin/lunchmealwidget.cpp @@ -9,10 +9,10 @@ #include "stripswidget.h" #include "mainwindow.h" -#include "zeiterfassungsettings.h" #include "zeiterfassungapi.h" #include "lunchmealdialog.h" +#include "lunchmealsettings.h" LunchMealWidget::LunchMealWidget(StripsWidget &stripsWidget) : QToolButton(&stripsWidget), @@ -38,11 +38,9 @@ void LunchMealWidget::dateChanged(const QDate &date) setEnabled(false); setVisible(false); - const auto &settings = m_stripsWidget.mainWindow().settings(); + LunchMealSettings settings(m_stripsWidget.mainWindow().settings()); - auto url = settings.value(QStringLiteral("LunchMealPlugin/url"), - QStringLiteral("https://brunner.ninja/lunch/%0.txt")).toString() - .arg(date.toString(settings.value(QStringLiteral("LunchMealPlugin/dateFormat"), QStringLiteral("yyyy-MM-dd")).toString())); + auto url = settings.url().toString().arg(date.toString(settings.dateFormat())); m_reply = std::unique_ptr(m_stripsWidget.mainWindow().erfassung().manager()->get(QNetworkRequest(QUrl(url)))); connect(m_reply.get(), &QNetworkReply::finished, this, &LunchMealWidget::finished); } -- 2.50.1 From 9f442bfda9deced884e98bb1efd042b1055871a3 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:32:15 +0100 Subject: [PATCH 15/18] Added LunchMealSettingsWidget --- plugins/lunchmealplugin/lunchmealplugin.pro | 10 ++++--- .../lunchmealsettingswidget.cpp | 29 +++++++++++++++++++ .../lunchmealplugin/lunchmealsettingswidget.h | 27 +++++++++++++++++ .../weatherplugin/weathersettingswidget.cpp | 1 - 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 plugins/lunchmealplugin/lunchmealsettingswidget.cpp create mode 100644 plugins/lunchmealplugin/lunchmealsettingswidget.h diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index 1579638..f2d730d 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -17,14 +17,16 @@ DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT} DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT HEADERS += lunchmealdialog.h \ + lunchmealsettings.h \ + lunchmealsettingswidget.h \ lunchmealplugin.h \ - lunchmealwidget.h \ - lunchmealsettings.h + lunchmealwidget.h SOURCES += lunchmealdialog.cpp \ + lunchmealsettings.cpp \ + lunchmealsettingswidget.cpp \ lunchmealplugin.cpp \ - lunchmealwidget.cpp \ - lunchmealsettings.cpp + lunchmealwidget.cpp FORMS += lunchmealdialog.ui diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp new file mode 100644 index 0000000..b9529df --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp @@ -0,0 +1,29 @@ +#include "lunchmealsettingswidget.h" + +#include +#include + +LunchMealSettingsWidget::LunchMealSettingsWidget(QWidget *parent) : + SettingsWidget(parent) +{ + auto layout = new QFormLayout(this); + layout->setMargin(0); + + m_lineEditUrl = new QLineEdit(m_settings.url().toString(), this); + layout->addRow(tr("Lunch meal API:"), m_lineEditUrl); + + m_lineEditDateFormat = new QLineEdit(m_settings.dateFormat(), this); + layout->addRow(tr("Lunch meal date format:"), m_lineEditDateFormat); + + setLayout(layout); +} + +bool LunchMealSettingsWidget::isValid(QString &message) const +{ + +} + +void LunchMealSettingsWidget::apply() +{ + +} diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.h b/plugins/lunchmealplugin/lunchmealsettingswidget.h new file mode 100644 index 0000000..7cd6d9f --- /dev/null +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.h @@ -0,0 +1,27 @@ +#ifndef LUNCHMEALSETTINGSWIDGET_H +#define LUNCHMEALSETTINGSWIDGET_H + +#include "settingswidget.h" + +#include "lunchmealsettings.h" + +class LunchMealSettingsWidget : public SettingsWidget +{ + Q_OBJECT + +public: + explicit LunchMealSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = nullptr); + + virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; + +public Q_SLOTS: + virtual void apply() Q_DECL_OVERRIDE; + +private: + LunchMealSettings m_settings; + + QLineEdit *m_lineEditUrl; + QLineEdit *m_lineEditDateFormat; +}; + +#endif // LUNCHMEALSETTINGSWIDGET_H diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp index d48c4e2..2e14db6 100644 --- a/plugins/weatherplugin/weathersettingswidget.cpp +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -2,7 +2,6 @@ #include #include -#include WeatherSettingsWidget::WeatherSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent) : SettingsWidget(parent), -- 2.50.1 From d242dd29bbcf2ec2f7e2ecbbc390a03c34475cb3 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:35:29 +0100 Subject: [PATCH 16/18] Registered LunchMealSettingsWidget --- plugins/lunchmealplugin/lunchmealplugin.cpp | 6 ++++++ plugins/lunchmealplugin/lunchmealplugin.h | 2 ++ plugins/lunchmealplugin/lunchmealsettingswidget.cpp | 7 +++++-- plugins/lunchmealplugin/lunchmealsettingswidget.h | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/lunchmealplugin/lunchmealplugin.cpp b/plugins/lunchmealplugin/lunchmealplugin.cpp index 0379d21..a7414d8 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.cpp +++ b/plugins/lunchmealplugin/lunchmealplugin.cpp @@ -10,6 +10,7 @@ #include "stripswidget.h" #include "lunchmealwidget.h" +#include "lunchmealsettingswidget.h" LunchMealPlugin::LunchMealPlugin(QObject *parent) : ZeiterfassungPlugin(parent) @@ -36,3 +37,8 @@ void LunchMealPlugin::attachTo(MainWindow &mainWindow) for(auto stripsWidget : mainWindow.stripsWidgets()) stripsWidget->headerLayout()->addWidget(new LunchMealWidget(*stripsWidget)); } + +SettingsWidget *LunchMealPlugin::settingsWidget(ZeiterfassungSettings &settings, QWidget *parent) const +{ + return new LunchMealSettingsWidget(settings, parent); +} diff --git a/plugins/lunchmealplugin/lunchmealplugin.h b/plugins/lunchmealplugin/lunchmealplugin.h index 8b14f85..d74a61a 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.h +++ b/plugins/lunchmealplugin/lunchmealplugin.h @@ -19,6 +19,8 @@ public: // ZeiterfassungPlugin interface void attachTo(MainWindow &mainWindow) Q_DECL_OVERRIDE; + virtual SettingsWidget *settingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR) const Q_DECL_OVERRIDE; + private: QTranslator m_translator; }; diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp index b9529df..b6fe25e 100644 --- a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp @@ -3,8 +3,9 @@ #include #include -LunchMealSettingsWidget::LunchMealSettingsWidget(QWidget *parent) : - SettingsWidget(parent) +LunchMealSettingsWidget::LunchMealSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent) : + SettingsWidget(parent), + m_settings(settings) { auto layout = new QFormLayout(this); layout->setMargin(0); @@ -20,7 +21,9 @@ LunchMealSettingsWidget::LunchMealSettingsWidget(QWidget *parent) : bool LunchMealSettingsWidget::isValid(QString &message) const { + Q_UNUSED(message) + return true; } void LunchMealSettingsWidget::apply() diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.h b/plugins/lunchmealplugin/lunchmealsettingswidget.h index 7cd6d9f..90f7ff0 100644 --- a/plugins/lunchmealplugin/lunchmealsettingswidget.h +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.h @@ -5,12 +5,14 @@ #include "lunchmealsettings.h" +class QLineEdit; + class LunchMealSettingsWidget : public SettingsWidget { Q_OBJECT public: - explicit LunchMealSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = nullptr); + explicit LunchMealSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; -- 2.50.1 From 2e69567096de312609fb4fe0696fca99a8d7afd7 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:37:47 +0100 Subject: [PATCH 17/18] Implemented isValid and apply() of LunchMealSettingsWidget (Fixes #67) --- plugins/lunchmealplugin/lunchmealsettingswidget.cpp | 11 +++++++++-- plugins/weatherplugin/weathersettingswidget.cpp | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp index b6fe25e..0fff7b3 100644 --- a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp @@ -21,12 +21,19 @@ LunchMealSettingsWidget::LunchMealSettingsWidget(ZeiterfassungSettings &settings bool LunchMealSettingsWidget::isValid(QString &message) const { - Q_UNUSED(message) + auto valid = QUrl::fromUserInput(m_lineEditUrl->text()).isValid(); - return true; + if(!valid) + message = tr("The lunch meal api url is invalid!"); + + return valid; } void LunchMealSettingsWidget::apply() { + auto url = QUrl::fromUserInput(m_lineEditUrl->text()); + if(m_settings.url() != url) + m_settings.setUrl(url); + m_settings.setDateFormat(m_lineEditDateFormat->text()); } diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp index 2e14db6..5be082a 100644 --- a/plugins/weatherplugin/weathersettingswidget.cpp +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -28,5 +28,7 @@ bool WeatherSettingsWidget::isValid(QString &message) const void WeatherSettingsWidget::apply() { - m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text())); + auto url = QUrl::fromUserInput(m_lineEdit->text()); + if(m_settings.url() != url) + m_settings.setUrl(url); } -- 2.50.1 From 972ecdb971cbdd9afa226b977fcfb407fb595db1 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Sun, 11 Mar 2018 15:40:06 +0100 Subject: [PATCH 18/18] Fixed indentation --- zeiterfassungcorelib/zeiterfassungsettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeiterfassungcorelib/zeiterfassungsettings.h b/zeiterfassungcorelib/zeiterfassungsettings.h index 1fe7c60..4ea1510 100644 --- a/zeiterfassungcorelib/zeiterfassungsettings.h +++ b/zeiterfassungcorelib/zeiterfassungsettings.h @@ -15,7 +15,7 @@ class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungSettings : public QSettings public: explicit ZeiterfassungSettings(const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = Q_NULLPTR); ZeiterfassungSettings(Scope scope, const QString &organization, const QString &application = QString(), QObject *parent = Q_NULLPTR); ZeiterfassungSettings(Format format, Scope scope, const QString &organization, -- 2.50.1