zeiterfassungcorelib/zeiterfassungsettings.cpp

@@ -1,5 +1,7 @@
 #include "zeiterfassungsettings.h"
 
+#include <QDebug>
+
 const QString ZeiterfassungSettings::m_language("language");
 const QString ZeiterfassungSettings::m_url("url");
 const QString ZeiterfassungSettings::m_username("username");
@@ -48,16 +50,25 @@ QLocale::Language ZeiterfassungSettings::language() const
     return value(m_language, m_defaultLanguage).value<QLocale::Language>();
 }
 
-void ZeiterfassungSettings::setLanguage(QLocale::Language language)
+bool ZeiterfassungSettings::setLanguage(QLocale::Language language)
 {
-    if(this->language() != language)
+    if(this->language() == language)
-    {
+        return true;
-        if(m_defaultLanguage == language)
+
-            remove(m_language);
+    if(m_defaultLanguage == language)
-        else
+        remove(m_language);
-            setValue(m_language, language);
+    else
+        setValue(m_language, language);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT languageChanged(language);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
 QUrl ZeiterfassungSettings::url() const
@@ -65,16 +76,25 @@ QUrl ZeiterfassungSettings::url() const
     return value(m_url, m_defaultUrl).toUrl();
 }
 
-void ZeiterfassungSettings::setUrl(const QUrl &url)
+bool ZeiterfassungSettings::setUrl(const QUrl &url)
 {
-    if(this->url() != url)
+    if(this->url() == url)
-    {
+        return true;
-        if(m_defaultUrl == url)
+
-            remove(m_url);
+    if(m_defaultUrl == url)
-        else
+        remove(m_url);
-            setValue(m_url, url);
+    else
+        setValue(m_url, url);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT urlChanged(url);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
 QString ZeiterfassungSettings::username() const
@@ -82,16 +102,25 @@ QString ZeiterfassungSettings::username() const
     return value(m_username).toString();
 }
 
-void ZeiterfassungSettings::setUsername(const QString &username)
+bool ZeiterfassungSettings::setUsername(const QString &username)
 {
-    if(this->username() != username)
+    if(this->username() == username)
-    {
+        return true;
-        if(username.isEmpty())
+
-            remove(m_username);
+    if(username.isEmpty())
-        else
+        remove(m_username);
-            setValue(m_username, username);
+    else
+        setValue(m_username, username);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT usernameChanged(username);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
 QString ZeiterfassungSettings::password() const
@@ -99,16 +128,25 @@ QString ZeiterfassungSettings::password() const
     return value(m_password).toString();
 }
 
-void ZeiterfassungSettings::setPassword(const QString &password)
+bool ZeiterfassungSettings::setPassword(const QString &password)
 {
-    if(this->password() != password)
+    if(this->password() == password)
-    {
+        return true;
-        if(password.isEmpty())
+
-            remove(m_password);
+    if(password.isEmpty())
-        else
+        remove(m_password);
-            setValue(m_password, password);
+    else
+        setValue(m_password, password);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT passwordChanged(password);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
 QStringList ZeiterfassungSettings::projects() const
@@ -116,21 +154,30 @@ QStringList ZeiterfassungSettings::projects() const
     return value(m_projects).toStringList();
 }
 
-void ZeiterfassungSettings::setProjects(const QStringList &projects)
+bool ZeiterfassungSettings::setProjects(const QStringList &projects)
 {
-    if(this->projects() != projects)
+    if(this->projects() == projects)
-    {
+        return true;
-        if(projects.isEmpty())
+
-            remove(m_projects);
+    if(projects.isEmpty())
-        else
+        remove(m_projects);
-            setValue(m_projects, projects);
+    else
+        setValue(m_projects, projects);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT projectsChanged(projects);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
-void ZeiterfassungSettings::prependProject(const QString &project)
+bool ZeiterfassungSettings::prependProject(const QString &project)
 {
-    setProjects(prependItem(projects(), project));
+    return setProjects(prependItem(projects(), project));
 }
 
 QStringList ZeiterfassungSettings::subprojects() const
@@ -138,21 +185,30 @@ QStringList ZeiterfassungSettings::subprojects() const
     return value(m_subprojects).toStringList();
 }
 
-void ZeiterfassungSettings::setSubprojects(const QStringList &subprojects)
+bool ZeiterfassungSettings::setSubprojects(const QStringList &subprojects)
 {
-    if(this->subprojects() != subprojects)
+    if(this->subprojects() == subprojects)
-    {
+        return true;
-        if(subprojects.isEmpty())
+
-            remove(m_subprojects);
+    if(subprojects.isEmpty())
-        else
+        remove(m_subprojects);
-            setValue(m_subprojects, subprojects);
+    else
+        setValue(m_subprojects, subprojects);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT subprojectsChanged(subprojects);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
-void ZeiterfassungSettings::prependSubproject(const QString &subproject)
+bool ZeiterfassungSettings::prependSubproject(const QString &subproject)
 {
-    setSubprojects(prependItem(subprojects(), subproject));
+    return setSubprojects(prependItem(subprojects(), subproject));
 }
 
 QStringList ZeiterfassungSettings::workpackages() const
@@ -160,21 +216,30 @@ QStringList ZeiterfassungSettings::workpackages() const
     return value(m_workpackages).toStringList();
 }
 
-void ZeiterfassungSettings::setWorkpackages(const QStringList &workpackages)
+bool ZeiterfassungSettings::setWorkpackages(const QStringList &workpackages)
 {
-    if(this->workpackages() != workpackages)
+    if(this->workpackages() == workpackages)
-    {
+        return true;
-        if(workpackages.isEmpty())
+
-            remove(m_workpackages);
+    if(workpackages.isEmpty())
-        else
+        remove(m_workpackages);
-            setValue(m_workpackages, workpackages);
+    else
+        setValue(m_workpackages, workpackages);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT workpackagesChanged(workpackages);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
-void ZeiterfassungSettings::prependWorkpackage(const QString &workpackage)
+bool ZeiterfassungSettings::prependWorkpackage(const QString &workpackage)
 {
-    setWorkpackages(prependItem(workpackages(), workpackage));
+    return setWorkpackages(prependItem(workpackages(), workpackage));
 }
 
 QStringList ZeiterfassungSettings::texts() const
@@ -182,21 +247,30 @@ QStringList ZeiterfassungSettings::texts() const
     return value(m_texts).toStringList();
 }
 
-void ZeiterfassungSettings::setTexts(const QStringList &texts)
+bool ZeiterfassungSettings::setTexts(const QStringList &texts)
 {
-    if(this->texts() != texts)
+    if(this->texts() == texts)
-    {
+        return true;
-        if(m_texts.isEmpty())
+
-            remove(m_texts);
+    if(m_texts.isEmpty())
-        else
+        remove(m_texts);
-            setValue(m_texts, texts);
+    else
+        setValue(m_texts, texts);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT textsChanged(texts);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
-void ZeiterfassungSettings::prependText(const QString &text)
+bool ZeiterfassungSettings::prependText(const QString &text)
 {
-    setTexts(prependItem(texts(), text));
+    return setTexts(prependItem(texts(), text));
 }
 
 QString ZeiterfassungSettings::theme() const
@@ -204,16 +278,25 @@ QString ZeiterfassungSettings::theme() const
     return value(m_theme).toString();
 }
 
-void ZeiterfassungSettings::setTheme(const QString &theme)
+bool ZeiterfassungSettings::setTheme(const QString &theme)
 {
-    if(this->theme() != theme)
+    if(this->theme() == theme)
-    {
+        return true;
-        if(theme.isEmpty())
+
-            remove(m_theme);
+    if(theme.isEmpty())
-        else
+        remove(m_theme);
-            setValue(m_theme, theme);
+    else
+        setValue(m_theme, theme);
+
+    sync();
+
+    const auto success = status() == QSettings::NoError;
+    if(success)
         Q_EMIT themeChanged(theme);
-    }
+    else
+        Q_EMIT saveErrorOccured();
+
+    return success;
 }
 
 QStringList ZeiterfassungSettings::prependItem(QStringList list, const QString &item)

zeiterfassungcorelib/zeiterfassungsettings.h

@@ -33,37 +33,39 @@ public:
     explicit ZeiterfassungSettings(QObject *parent = Q_NULLPTR);
 
     QLocale::Language language() const;
-    void setLanguage(QLocale::Language language);
+    bool setLanguage(QLocale::Language language);
 
     QUrl url() const;
-    void setUrl(const QUrl &url);
+    bool setUrl(const QUrl &url);
 
     QString username() const;
-    void setUsername(const QString &username);
+    bool setUsername(const QString &username);
 
     QString password() const;
-    void setPassword(const QString &password);
+    bool setPassword(const QString &password);
 
     QStringList projects() const;
-    void setProjects(const QStringList &projects);
+    bool setProjects(const QStringList &projects);
-    void prependProject(const QString &project);
+    bool prependProject(const QString &project);
 
     QStringList subprojects() const;
-    void setSubprojects(const QStringList &subprojects);
+    bool setSubprojects(const QStringList &subprojects);
-    void prependSubproject(const QString &subproject);
+    bool prependSubproject(const QString &subproject);
 
     QStringList workpackages() const;
-    void setWorkpackages(const QStringList &workpackages);
+    bool setWorkpackages(const QStringList &workpackages);
-    void prependWorkpackage(const QString &workpackage);
+    bool prependWorkpackage(const QString &workpackage);
 
     QStringList texts() const;
-    void setTexts(const QStringList &texts);
+    bool setTexts(const QStringList &texts);
-    void prependText(const QString &text);
+    bool prependText(const QString &text);
 
     QString theme() const;
-    void setTheme(const QString &theme);
+    bool setTheme(const QString &theme);
 
 Q_SIGNALS:
+    void saveErrorOccured();
+
     void languageChanged(QLocale::Language language);
     void urlChanged(const QUrl &url);
     void usernameChanged(const QString &username);