From e55c740d84cd11813e6d7e5bf7aa0a2f5f9a6784 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 21 Jan 2020 12:24:40 +0100 Subject: diveplanner: call planner model directly for simple variables. Variables without conversion, do not need to pass plannerShared (due to the QML interface). Simple variables do not pass plannerShared, but diveplanner in desktop-widgets and qmlinterface in mobile-widgets call the implementation directly. Signed-off-by: jan Iversen --- mobile-widgets/qml/DivePlannerSetup.qml | 6 +++--- mobile-widgets/qmlinterface.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DivePlannerSetup.qml b/mobile-widgets/qml/DivePlannerSetup.qml index 58bbb1ac9..294752de3 100644 --- a/mobile-widgets/qml/DivePlannerSetup.qml +++ b/mobile-widgets/qml/DivePlannerSetup.qml @@ -275,12 +275,12 @@ Kirigami.ScrollablePage { from: 1 to: 9 stepSize: 1 - value: Planner.problemsolvingtime + value: Backend.problemsolvingtime textFromValue: function (value, locale) { - return value + qsTr("min") + return value + qsTr(" min") } onValueModified: { - Planner.problemsolvingtime = value + Backend.problemsolvingtime = value } } TemplateLabel { diff --git a/mobile-widgets/qmlinterface.cpp b/mobile-widgets/qmlinterface.cpp index 6cf280f55..04fd0b6d9 100644 --- a/mobile-widgets/qmlinterface.cpp +++ b/mobile-widgets/qmlinterface.cpp @@ -63,6 +63,8 @@ void QMLInterface::setup(QQmlContext *ct) connect(qPrefDivePlanner::instance(), &qPrefDivePlanner::switch_at_req_stopChanged, instance(), &QMLInterface::switch_at_req_stopChanged); + connect(qPrefDivePlanner::instance(), &qPrefDivePlanner::problemsolvingtimeChanged, + instance(), &QMLInterface::problemsolvingtimeChanged); connect(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_runtimeChanged, instance(), &QMLInterface::display_runtimeChanged); connect(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_durationChanged, -- cgit v1.2.3-70-g09d2