From ac9e3a088b2c505ffb5f0b43a03a2ac74b94430c Mon Sep 17 00:00:00 2001 From: Matti Viljanen Date: Sat, 5 Jan 2019 21:58:52 +0200 Subject: [PATCH] Add Settings object, alert level sliders --- harbour-batterybuddy.pro | 6 ++++-- qml/pages/MainPage.qml | 22 ++++++++++++++++++++++ src/harbour-batterybuddy.cpp | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/harbour-batterybuddy.pro b/harbour-batterybuddy.pro index b0fbf68..74a5cba 100644 --- a/harbour-batterybuddy.pro +++ b/harbour-batterybuddy.pro @@ -15,7 +15,8 @@ TARGET = harbour-batterybuddy CONFIG += sailfishapp SOURCES += src/harbour-batterybuddy.cpp \ - src/battery.cpp + src/battery.cpp \ + src/settings.cpp DISTFILES += qml/harbour-batterybuddy.qml \ qml/cover/CoverPage.qml \ @@ -55,4 +56,5 @@ CONFIG += sailfishapp_i18n TRANSLATIONS += translations/harbour-batterybuddy-de.ts HEADERS += \ - src/battery.h + src/battery.h \ + src/settings.h diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index c25169a..389fe56 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -39,6 +39,28 @@ Page { label: qsTr("Charging") value: battery.charging ? "yes" : "no"; } + Slider { + id: highSlider + width: parent.width + label: qsTr("Upper limit") + minimumValue: 60 + maximumValue: 99 + stepSize: 1 + value: settings.upperLimit + valueText: highSlider.value + onValueChanged: settings.upperLimit = highSlider.value + } + Slider { + id: lowSlider + width: parent.width + label: qsTr("Lower limit") + minimumValue: 10 + maximumValue: 40 + stepSize: 1 + value: settings.lowerLimit + valueText: lowSlider.value + onValueChanged: settings.lowerLimit = lowSlider.value + } } } } diff --git a/src/harbour-batterybuddy.cpp b/src/harbour-batterybuddy.cpp index 2c67b63..6dff5a1 100644 --- a/src/harbour-batterybuddy.cpp +++ b/src/harbour-batterybuddy.cpp @@ -11,6 +11,7 @@ #include #include "battery.h" +#include "settings.h" int main(int argc, char *argv[]) { @@ -28,12 +29,15 @@ int main(int argc, char *argv[]) QQuickView* view = SailfishApp::createView(); Battery battery; + Settings settings; + QTimer updater; QObject::connect(&updater, SIGNAL(timeout()), &battery, SLOT(updateData())); updater.start(15000); view->engine()->addImportPath("/usr/share/harbour-carbudget/qml"); view->rootContext()->setContextProperty("battery", &battery); + view->rootContext()->setContextProperty("settings", &settings); view->setSource(SailfishApp::pathTo("qml/harbour-batterybuddy.qml")); view->showFullScreen();