From 91e6cad41455811d62d99c04f83182158ae1897f Mon Sep 17 00:00:00 2001
From: "Peter G. (nephros)" <nephros@pearl>
Date: Sun, 2 May 2021 17:18:25 +0200
Subject: [PATCH] Add several strings for health notification

---
 application/src/settings.cpp | 28 ++++++++++++++++++++++------
 application/src/settings.h   | 24 ++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/application/src/settings.cpp b/application/src/settings.cpp
index 29bbe64..ebf9e42 100644
--- a/application/src/settings.cpp
+++ b/application/src/settings.cpp
@@ -45,12 +45,16 @@ Settings::Settings(Logger *newLogger, QObject *parent) : QObject(parent)
     loadString(sNotificationTitle, notificationTitle);
     loadString(sNotificationLowText, notificationLowText);
     loadString(sNotificationHighText, notificationHighText);
-    loadString(sNotificationHealthText, notificationHealthText);
+    loadString(sNotificationHealthTitle, notificationHealthTitle);
+    loadString(sNotificationHealthWarnText, notificationHealthWarnText);
+    loadString(sNotificationHealthCritText, notificationHealthCritText);
 
     saveString(sNotificationTitle, tr("Battery charge %1%"), notificationTitle);
     saveString(sNotificationLowText, tr("Please connect the charger."), notificationLowText);
     saveString(sNotificationHighText, tr("Please disconnect the charger."), notificationHighText);
-    saveString(sNotificationHealthText, tr("Battery health"), notificationHealthText);
+    saveString(sNotificationHealthTitle, tr("Battery health %1"), notificationHealthTitle);
+    saveString(sNotificationHealthWarnText, tr("Battery health is not good"), notificationHealthWarnText);
+    saveString(sNotificationHealthCritText, tr("Battery health is critical"), notificationHealthCritText);
 }
 
 Settings::~Settings()
@@ -76,7 +80,9 @@ QString Settings::getLogFilename()                 { return logFilename; }
 QString Settings::getNotificationTitle()           { return notificationTitle; }
 QString Settings::getNotificationLowText()         { return notificationLowText; }
 QString Settings::getNotificationHighText()        { return notificationHighText; }
-QString Settings::getNotificationHealthText()      { return notificationHealthText; }
+QString Settings::getNotificationHealthTitle()         { return notificationHealthTitle; }
+QString Settings::getNotificationHealthWarnText()      { return notificationHealthWarnText; }
+QString Settings::getNotificationHealthCritText()      { return notificationHealthCritText; }
 int     Settings::getLogLevel()                    { return logLevel; }
 
 void Settings::setLowAlert(const int newLimit) {
@@ -146,9 +152,19 @@ void Settings::setNotificationHighText(const QString newText) {
         emit notificationHighTextChanged(notificationHighText);
 }
 
-void Settings::setNotificationHealthText(const QString newText) {
-    if(saveString(sNotificationHealthText, newText, notificationHealthText))
-        emit notificationHealthTextChanged(notificationHealthText);
+void Settings::setNotificationHealthTitle(const QString newText) {
+    if(saveString(sNotificationHealthTitle, newText, notificationTitle))
+        emit notificationHealthTitleChanged(notificationTitle);
+}
+
+void Settings::setNotificationHealthWarnText(const QString newText) {
+    if(saveString(sNotificationHealthWarnText, newText, notificationHealthWarnText))
+        emit notificationHealthWarnTextChanged(notificationHealthWarnText);
+}
+
+void Settings::setNotificationHealthCritText(const QString newText) {
+    if(saveString(sNotificationHealthCritText, newText, notificationHealthCritText))
+        emit notificationHealthCritTextChanged(notificationHealthCritText);
 }
 
 void Settings::setLogLevel(const int newLogLevel) {
diff --git a/application/src/settings.h b/application/src/settings.h
index 497ba44..b30fc7d 100644
--- a/application/src/settings.h
+++ b/application/src/settings.h
@@ -40,7 +40,9 @@ class Settings : public QObject
     Q_PROPERTY(QString notificationTitle READ getNotificationTitle WRITE setNotificationTitle NOTIFY notificationTitleChanged)
     Q_PROPERTY(QString notificationLowText READ getNotificationLowText WRITE setNotificationLowText NOTIFY notificationLowTextChanged)
     Q_PROPERTY(QString notificationHighText READ getNotificationHighText WRITE setNotificationHighText NOTIFY notificationHighTextChanged)
-    Q_PROPERTY(QString notificationHealthText READ getNotificationHealthText WRITE setNotificationHealthText NOTIFY notificationHealthTextChanged)
+    Q_PROPERTY(QString notificationHealthTitle READ getNotificationHealthTitle WRITE setNotificationHealthTitle NOTIFY notificationHealthTitleChanged)
+    Q_PROPERTY(QString notificationHealthWarnText READ getNotificationHealthWarnText WRITE setNotificationHealthWarnText NOTIFY notificationHealthWarnTextChanged)
+    Q_PROPERTY(QString notificationHealthCritText READ getNotificationHealthCritText WRITE setNotificationHealthCritText NOTIFY notificationHealthCritTextChanged)
     Q_PROPERTY(QString logFilename READ getLogFilename NOTIFY logFilenameChanged)
     Q_PROPERTY(int logLevel READ getLogLevel WRITE setLogLevel NOTIFY logLevelChanged)
 
@@ -63,7 +65,9 @@ public:
     QString getNotificationTitle();
     QString getNotificationLowText();
     QString getNotificationHighText();
-    QString getNotificationHealthText();
+    QString getNotificationHealthTitle();
+    QString getNotificationHealthWarnText();
+    QString getNotificationHealthCritText();
     QString getLogFilename();
     int getLogLevel();
 
@@ -79,7 +83,9 @@ public:
     void setNotificationTitle(const QString newText);
     void setNotificationLowText(const QString newText);
     void setNotificationHighText(const QString newText);
-    void setNotificationHealthText(const QString newText);
+    void setNotificationHealthTitle(const QString newText);
+    void setNotificationHealthWarnText(const QString newText);
+    void setNotificationHealthCritText(const QString newText);
     void setLogLevel(const int newLogLevel);
 
 private:
@@ -103,7 +109,9 @@ private:
     QString notificationTitle;
     QString notificationLowText;
     QString notificationHighText;
-    QString notificationHealthText;
+    QString notificationHealthTitle;
+    QString notificationHealthWarnText;
+    QString notificationHealthCritText;
     QString logFilename;
     int logLevel;
 
@@ -123,7 +131,9 @@ private:
     const char* sNotificationTitle = "notificationTitle";
     const char* sNotificationLowText = "notificationLowText";
     const char* sNotificationHighText = "notificationHighText";
-    const char* sNotificationHealthText = "notificationHealthText";
+    const char* sNotificationHealthTitle = "notificationHealthTitle";
+    const char* sNotificationHealthWarnText = "notificationHealthWarnText";
+    const char* sNotificationHealthCritText = "notificationHealthCritText";
     const char* sLogFilename = "logFilename";
     const char* sLogLevel = "logLevel";
 
@@ -149,7 +159,9 @@ signals:
     void notificationTitleChanged(QString);
     void notificationLowTextChanged(QString);
     void notificationHighTextChanged(QString);
-    void notificationHealthTextChanged(QString);
+    void notificationHealthTitleChanged(QString);
+    void notificationHealthWarnTextChanged(QString);
+    void notificationHealthCritTextChanged(QString);
     void logFilenameChanged(QString);
     void logLevelChanged(int);
 };