feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

SettingsWidgets error handling

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-05-25 19:42:22 +02:00
parent 20b373bec7
commit bb19fdddda
11 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/lunchmealplugin/lunchmealsettingswidget.cpp
View File

@@ -29,8 +29,8 @@ bool LunchMealSettingsWidget::isValid(QString &message) const
return valid; return valid;
} }
void LunchMealSettingsWidget::apply() bool LunchMealSettingsWidget::apply()
{ {
m_settings.setUrl(m_lineEditUrl->text()); return m_settings.setUrl(m_lineEditUrl->text()) &&
m_settings.setDateFormat(m_lineEditDateFormat->text()); m_settings.setDateFormat(m_lineEditDateFormat->text());
} }

2
plugins/lunchmealplugin/lunchmealsettingswidget.h
View File

@@ -16,7 +16,7 @@ public:
virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; virtual bool isValid(QString &message) const Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
virtual void apply() Q_DECL_OVERRIDE; virtual bool apply() Q_DECL_OVERRIDE;
private: private:
LunchMealSettings m_settings; LunchMealSettings m_settings;

10
plugins/presenceplugin/presencesettingswidget.cpp
View File

@@ -18,13 +18,7 @@ PresenceSettingsWidget::PresenceSettingsWidget(ZeiterfassungSettings &settings,
setLayout(layout); setLayout(layout);
} }
bool PresenceSettingsWidget::isValid(QString &message) const bool PresenceSettingsWidget::apply()
{ {
Q_UNUSED(message) return m_settings.setInterval(m_spinBox->value());
return true;
}
void PresenceSettingsWidget::apply()
{
m_settings.setInterval(m_spinBox->value());
} }

4
plugins/presenceplugin/presencesettingswidget.h
View File

@@ -13,10 +13,8 @@ class PresenceSettingsWidget : public SettingsWidget
public: public:
explicit PresenceSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); explicit PresenceSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR);
virtual bool isValid(QString &message) const Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
virtual void apply() Q_DECL_OVERRIDE; virtual bool apply() Q_DECL_OVERRIDE;
private: private:
PresenceSettings m_settings; PresenceSettings m_settings;

4
plugins/updaterplugin/updatersettingswidget.cpp
View File

@@ -26,7 +26,7 @@ bool UpdaterSettingsWidget::isValid(QString &message) const
return valid; return valid;
} }
void UpdaterSettingsWidget::apply() bool UpdaterSettingsWidget::apply()
{ {
m_settings.setUrl(QUrl(m_lineEdit->text())); return m_settings.setUrl(QUrl(m_lineEdit->text()));
} }

2
plugins/updaterplugin/updatersettingswidget.h
View File

@@ -16,7 +16,7 @@ public:
virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; virtual bool isValid(QString &message) const Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
virtual void apply() Q_DECL_OVERRIDE; virtual bool apply() Q_DECL_OVERRIDE;
private: private:
UpdaterSettings m_settings; UpdaterSettings m_settings;

4
plugins/weatherplugin/weathersettingswidget.cpp
View File

@@ -26,7 +26,7 @@ bool WeatherSettingsWidget::isValid(QString &message) const
return valid; return valid;
} }
void WeatherSettingsWidget::apply() bool WeatherSettingsWidget::apply()
{ {
m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text())); return m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text()));
} }

2
plugins/weatherplugin/weathersettingswidget.h
View File

@@ -20,7 +20,7 @@ public:
bool isValid(QString &message) const Q_DECL_OVERRIDE; bool isValid(QString &message) const Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
void apply() Q_DECL_OVERRIDE; virtual bool apply() Q_DECL_OVERRIDE;
private: private:
WeatherSettings m_settings; WeatherSettings m_settings;

5
plugins/webradioplugin/webradiosettingswidget.cpp
View File

@@ -31,8 +31,7 @@ bool WebRadioSettingsWidget::isValid(QString &message) const
return true; return true;
} }
void WebRadioSettingsWidget::apply() bool WebRadioSettingsWidget::apply()
{ {
if(m_urlsWidget->stringList() != m_settings.urls()) return m_settings.setUrls(m_urlsWidget->stringList());
m_settings.setUrls(m_urlsWidget->stringList());
} }

2
plugins/webradioplugin/webradiosettingswidget.h
View File

@@ -20,7 +20,7 @@ public:
bool isValid(QString &message) const Q_DECL_OVERRIDE; bool isValid(QString &message) const Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
void apply() Q_DECL_OVERRIDE; virtual bool apply() Q_DECL_OVERRIDE;
private: private:
WebRadioSettings m_settings; WebRadioSettings m_settings;

2
zeiterfassungguilib/settingswidget.h
View File

@@ -15,5 +15,5 @@ public:
virtual bool isValid(QString &message) const { Q_UNUSED(message) return true; } virtual bool isValid(QString &message) const { Q_UNUSED(message) return true; }
public Q_SLOTS: public Q_SLOTS:
virtual void apply() { } virtual bool apply() = 0;
}; };