From 74b6a3f429bf0ceab2e7e141540025b63c19ded8 Mon Sep 17 00:00:00 2001 From: dorian Date: Tue, 1 Jan 2019 15:23:15 +0100 Subject: [PATCH] started to implement error dialog --- graphics/icons/error.png | Bin 0 -> 10363 bytes qml/ErrorDialog.qml | 84 ++++++ qml/SettingsDialog.qml | 19 ++ qml/main.qml | 11 +- qml/qml.qrc | 1 + shared.qrc | 1 + speedclimbing_stopwatch.pro | 1 - speedclimbing_stopwatch.pro.user.4.8-pre1 | 338 ++++++++++++++++++++++ 8 files changed, 451 insertions(+), 4 deletions(-) create mode 100644 graphics/icons/error.png create mode 100644 qml/ErrorDialog.qml create mode 100644 speedclimbing_stopwatch.pro.user.4.8-pre1 diff --git a/graphics/icons/error.png b/graphics/icons/error.png new file mode 100644 index 0000000000000000000000000000000000000000..7c64f33ec0bde8388c90fb85500544b58759e5df GIT binary patch literal 10363 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 literal 0 HcmV?d00001 diff --git a/qml/ErrorDialog.qml b/qml/ErrorDialog.qml new file mode 100644 index 0000000..fe78f43 --- /dev/null +++ b/qml/ErrorDialog.qml @@ -0,0 +1,84 @@ +/* + Speed Climbing Stopwatch - Simple Stopwatch for Climbers + Copyright (C) 2018 Itsblue Development - Dorian Zeder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import QtQuick 2.9 +import QtMultimedia 5.8 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import com.itsblue.speedclimbingstopwatch 1.0 +import "./styles" + + +Popup { + id: root + x: startButt.x + y: startButt.y + width: startButt.width + height: startButt.height + modal: true + + enter: Transition { + NumberAnimation { properties: "scale"; from: 0; to: 1; duration: 300; easing.type: Easing.Linear } + } + + exit: Transition { + NumberAnimation { properties: "scale"; from: 1; to: 0; duration: 300; easing.type: Easing.Linear } + } + + background: Rectangle { + radius: width * 0.5 + color: StyleSettings.viewColor + border.color: StyleSettings.lineColor + border.width: 1 + + Label { + id: head_text + text: "error" + font.pixelSize: headlineUnderline.width * 0.1 + color: enabled ? StyleSettings.textColor:StyleSettings.disabledTextColor + anchors { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: headlineUnderline.anchors.topMargin / 2 - height / 2 + } + } + + Rectangle { + id: headlineUnderline + height: 1 + width: parent.width + color: StyleSettings.lineColor + anchors { + top: parent.top + left: parent.left + right: parent.right + topMargin: parent.height * 0.15 + rightMargin: parent.radius - Math.sqrt(Math.pow(parent.radius,2)-Math.pow(parent.radius-anchors.topMargin,2)) + leftMargin: parent.radius - Math.sqrt(Math.pow(parent.radius,2)-Math.pow(parent.radius-anchors.topMargin,2)) + } + } + + Image { + id: errorIcon + source: "qrc:/graphics/icons/error.png" + anchors.centerIn: parent + height: parent.height * 0.5 + width: height + } + } +} diff --git a/qml/SettingsDialog.qml b/qml/SettingsDialog.qml index a7168db..f568ee0 100644 --- a/qml/SettingsDialog.qml +++ b/qml/SettingsDialog.qml @@ -139,6 +139,7 @@ Popup { StackView { id: options_stack property int text_pixelSize: root.height * 0.06 + property int rowSpacing: root.height * 0.01 initialItem: settings width: headlineUnderline.width @@ -163,6 +164,7 @@ Popup { Column { property string title: qsTr("Options") id: settings_col + spacing: options_stack.rowSpacing /*----Connect to external devices----*/ NextPageDelegate { @@ -199,6 +201,23 @@ Popup { StyleSettings.setTheme() } } + + /*----Error Dialog----*/ + ItemDelegate { + id: error_del + text: qsTr("open error popup") + width: parent.width + + contentItem: Text { + text: parent.text + color: StyleSettings.textColor + font.pixelSize: options_stack.text_pixelSize + } + + onClicked: { + errorDialog.open() + } + } } } diff --git a/qml/main.qml b/qml/main.qml index 604bb75..b443ace 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -51,7 +51,7 @@ Window { property var last_run : { 'stop_type': "", 'time': 0, 'react_time': 0 - }; + } //array that contains all connections an their atatus property var connections: { @@ -119,7 +119,7 @@ Window { BaseStationConn { id: baseConn - ipAdress: "raspberrypi.local" + ipAdress: "localhost" property var status: {'status': baseConn.state, 'progress': baseConn.progress, 'connections': baseConn.connections} @@ -497,10 +497,11 @@ Window { id: prog_refresh running: parent.opacity === 1 && baseConn.state !== "connected" interval: 1 - repeat: true + repeat: false onTriggered: { console.log("prog refresh timer") prog.arcEnd = 360 * (( next_actionTimer.interval - ( new Date().getTime() - next_actionTimer.started_at ) ) / next_actionTimer.interval) + prog_refresh.start() } } } @@ -571,6 +572,10 @@ Window { } } + ErrorDialog { + id: errorDialog + } + // ProfilesDialog { // id: profilesDialog // } diff --git a/qml/qml.qrc b/qml/qml.qrc index 9474bf1..9ae381b 100644 --- a/qml/qml.qrc +++ b/qml/qml.qrc @@ -15,5 +15,6 @@ components/ConnectionIcon.qml SpeedTimer.qml components/NextPageDelegate.qml + ErrorDialog.qml diff --git a/shared.qrc b/shared.qrc index 1e8a3ea..30f93c4 100644 --- a/shared.qrc +++ b/shared.qrc @@ -21,5 +21,6 @@ graphics/icons/settings_black.png graphics/icons/startpad_black.png sounds/false.wav + graphics/icons/error.png diff --git a/speedclimbing_stopwatch.pro b/speedclimbing_stopwatch.pro index be79620..ab9240a 100644 --- a/speedclimbing_stopwatch.pro +++ b/speedclimbing_stopwatch.pro @@ -5,7 +5,6 @@ android { } VERSION = 0.04 CONFIG += c++11 -LIBS += -L/usr/lib/x86_64-linux-gnu # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked deprecated (the exact warnings diff --git a/speedclimbing_stopwatch.pro.user.4.8-pre1 b/speedclimbing_stopwatch.pro.user.4.8-pre1 new file mode 100644 index 0000000..9823ad4 --- /dev/null +++ b/speedclimbing_stopwatch.pro.user.4.8-pre1 @@ -0,0 +1,338 @@ + + + + + + EnvironmentId + {ada7f138-9843-49cd-ba57-7192ac5ef8b1} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.11.2 GCC 64bit + Desktop Qt 5.11.2 GCC 64bit + qt.qt5.5112.gcc_64_kit + 0 + 0 + 0 + + /home/dorian/Documents/gitlab/build-speedclimbing_stopwatch-Desktop_Qt_5_11_2_GCC_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/dorian/Documents/gitlab/build-speedclimbing_stopwatch-Desktop_Qt_5_11_2_GCC_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/dorian/Documents/gitlab/build-speedclimbing_stopwatch-Desktop_Qt_5_11_2_GCC_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + speedclimbing_stopwatch + + Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/gitlab/speedclimbing_stopwatch/speedclimbing_stopwatch.pro + true + + speedclimbing_stopwatch.pro + + /home/dorian/Documents/gitlab/build-speedclimbing_stopwatch-Desktop_Qt_5_11_2_GCC_64bit-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + +