ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve about page

pull/1/head
Michael Zanetti 2018-06-07 05:05:26 +02:00
parent 5270c2b756
commit 5bb5e6c42b
11 changed files with 275 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mea/guh-logo.svg
View File

@ -9,8 +9,8 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="500"
height="500"
width="256"
height="256"
id="svg2"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
@ -252,8 +252,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="30.679884"
inkscape:cy="202.52602"
inkscape:cx="-128.90044"
inkscape:cy="115.43739"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@ -261,7 +261,11 @@
inkscape:window-height="1698"
inkscape:window-x="0"
inkscape:window-y="44"
inkscape:window-maximized="1" />
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata7">
<rdf:RDF>
@ -270,7 +274,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -278,9 +282,9 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-552.36215)">
transform="translate(-143.41788,-709.27353)">
<g
transform="matrix(2.2038606,0,0,2.2038606,-672.50331,283.61944)"
transform="matrix(1.6610768,0,0,1.6610768,-424.70019,441.27282)"
id="g41">
<g
id="g43">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

3
mea/resources.qrc
View File

@ -141,7 +141,6 @@
<file>styles/light/ApplicationWindow.qml</file>
<file>styles/light/Page.qml</file>
<file>styles/dark/Page.qml</file>
<file>styles/marantec/ApplicationWindow.qml</file>
<file>styles/maveo/ApplicationWindow.qml</file>
<file>ui/BluetoothDiscoveryPage.qml</file>
<file>ui/images/bluetooth.svg</file>
@ -186,5 +185,7 @@
<file>ui/images/shutter-0.svg</file>
<file>ui/components/ShutterControls.qml</file>
<file>../LICENSE</file>
<file>ui/images/Built_with_Qt_RGB_logo.svg</file>
<file>ui/images/Built_with_Qt_RGB_logo_vertical.svg</file>
</qresource>
</RCC>

1
mea/styles/dark/ApplicationWindow.qml
View File

@ -5,6 +5,7 @@ import QtQuick.Controls.Material 2.2
ApplicationWindow {
property color guhAccent: "#ff57baae"
property string systemName: "nymea"
property string appName: "mea"
Material.theme: Material.Dark
Material.accent: guhAccent

1
mea/styles/light/ApplicationWindow.qml
View File

@ -5,6 +5,7 @@ import QtQuick.Controls.Material 2.2
ApplicationWindow {
property color guhAccent: "#ff57baae"
property string systemName: "nymea"
property string appName: "mea"
Material.theme: Material.Light
Material.accent: guhAccent

12
mea/styles/marantec/ApplicationWindow.qml
View File

@ -1,12 +0,0 @@
import QtQuick 2.0
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
property color guhAccent: "red"
property string systemName: "nymea"
Material.theme: Material.Light
Material.accent: guhAccent
Material.primary: "red"
}

3
mea/styles/maveo/ApplicationWindow.qml
View File

@ -5,8 +5,7 @@ import QtQuick.Controls.Material 2.2
ApplicationWindow {
property color guhAccent: "#ffcc00"
property string systemName: "maveo"
title: qsTr("Maveo Pro Box Dashboard")
property string appName: qsTr("Maveo Pro Box Dashboard")
Material.theme: Material.Light
Material.accent: guhAccent

223
mea/ui/AboutPage.qml
View File

@ -8,66 +8,193 @@ import "components"
Page {
id: root
header: GuhHeader {
text: qsTr("About %1").arg(app.systemName)
text: qsTr("About %1").arg(app.appName)
backButtonVisible: true
onBackPressed: pageStack.pop()
}
ColumnLayout {
Flickable {
anchors.fill: parent
spacing: app.margins
contentHeight: aboutColumn.implicitHeight
Image {
Layout.preferredHeight: app.iconSize * 4
Layout.fillWidth: true
fillMode: Image.PreserveAspectFit
horizontalAlignment: Image.AlignHCenter
source: "../guh-logo.svg"
}
ColumnLayout {
id: aboutColumn
width: parent.width
ThinDivider {}
RowLayout {
Layout.fillWidth: true
Layout.margins: app.margins
spacing: app.margins
GridLayout {
Layout.fillWidth: true
Layout.margins: app.margins
columns: 2
Image {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: height
fillMode: Image.PreserveAspectFit
source: "../guh-logo.svg"
}
GridLayout {
Layout.fillWidth: true
columns: 2
Label {
text: qsTr("App version:")
}
Label {
text: appVersion
}
Label {
text: qsTr("Qt version:")
}
Label {
text: qtVersion
}
}
}
ThinDivider {}
Label {
text: qsTr("App version:")
}
Label {
text: appVersion
}
Label {
text: qsTr("Qt version:")
}
Label {
text: qtVersion
}
}
ThinDivider { }
Flickable {
Layout.fillHeight: true
Layout.fillWidth: true
contentHeight: licenseText.implicitHeight
clip: true
ScrollBar.vertical: ScrollBar {}
TextArea {
id: licenseText
Layout.fillWidth: true
Layout.topMargin: app.margins
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
font.pixelSize: app.smallFont
anchors { left: parent.left; right: parent.right; margins: app.margins }
Component.onCompleted: {
var xhr = new XMLHttpRequest;
xhr.open("GET", "../../LICENSE");
xhr.onreadystatechange = function() {
if (xhr.readyState === XMLHttpRequest.DONE) {
text = xhr.responseText.replace(/(^\ *)/gm, "").replace(/(\n\n)/gm,"\t").replace(/(\n)/gm, " ").replace(/(\t)/gm, "\n\n");
font.bold: true
text: "Copyright (C) 2018 guh GmbH"
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
text: qsTr("nymea is a registered trademark of guh GmbH.")
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
text: qsTr("Licensed under the terms of the GNU general public license, version 2. Please visit the GitHub page for source code and build instructions.")
}
ColumnLayout {
Layout.fillWidth: true
ItemDelegate {
Layout.fillWidth: true
contentItem: RowLayout {
Label {
Layout.fillWidth: true
text: qsTr("View license text")
}
};
xhr.send();
Image {
source: "images/next.svg"
Layout.preferredHeight: parent.height
Layout.preferredWidth: height
}
}
onClicked: {
pageStack.push(licenseTextComponent)
}
}
ItemDelegate {
Layout.fillWidth: true
contentItem: RowLayout {
Label {
Layout.fillWidth: true
text: qsTr("Visit GitHub page")
}
Image {
source: "images/next.svg"
Layout.preferredHeight: parent.height
Layout.preferredWidth: height
}
}
onClicked: {
Qt.openUrlExternally("https://github.com/guh/mea")
}
}
}
ThinDivider { }
RowLayout {
Layout.fillWidth: true
Layout.margins: app.margins
spacing: app.margins
Image {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: height
fillMode: Image.PreserveAspectFit
source: "images/Built_with_Qt_RGB_logo_vertical.svg"
sourceSize.width: app.iconSize * 2
sourceSize.height: app.iconSize * 2
}
Label {
Layout.fillWidth: true
text: qsTr("Qt is a registered trademark of The Qt Company Ltd. and its subsidiaries.")
wrapMode: Text.WordWrap
}
}
ItemDelegate {
Layout.fillWidth: true
contentItem: RowLayout {
Label {
Layout.fillWidth: true
text: qsTr("Visit the Qt website")
}
Image {
source: "images/next.svg"
Layout.preferredHeight: parent.height
Layout.preferredWidth: height
}
}
onClicked: {
Qt.openUrlExternally("https://qt.io")
}
}
}
}
Component {
id: licenseTextComponent
Page {
header: GuhHeader {
text: qsTr("License text")
onBackPressed: pageStack.pop()
}
Flickable {
anchors.fill: parent
contentHeight: licenseText.implicitHeight
clip: true
ScrollBar.vertical: ScrollBar {}
TextArea {
id: licenseText
wrapMode: Text.WordWrap
font.pixelSize: app.smallFont
anchors { left: parent.left; right: parent.right; margins: app.margins }
Component.onCompleted: {
var xhr = new XMLHttpRequest;
xhr.open("GET", "../../LICENSE");
xhr.onreadystatechange = function() {
if (xhr.readyState === XMLHttpRequest.DONE) {
text = xhr.responseText.replace(/(^\ *)/gm, "").replace(/(\n\n)/gm,"\t").replace(/(\n)/gm, " ").replace(/(\t)/gm, "\n\n");
}
};
xhr.send();
}
}
}
}

2
mea/ui/AppSettingsPage.qml
View File

@ -116,7 +116,7 @@ Page {
contentItem: RowLayout {
Label {
Layout.fillWidth: true
text: qsTr("About %1").arg(app.systemName)
text: qsTr("About %1").arg(app.appName)
}
Image {
source: "images/next.svg"

1
mea/ui/Mea.qml
View File

@ -12,6 +12,7 @@ ApplicationWindow {
height: 580
visibility: settings.viewMode
font: Qt.application.font
title: appName
property int margins: 14
property int bigMargins: 20

42
mea/ui/images/Built_with_Qt_RGB_logo.svg Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="284px" height="67.8px" viewBox="0 0 284 67.8" style="enable-background:new 0 0 284 67.8;" xml:space="preserve">
<style type="text/css">
.st0{fill:#09102B;}
.st1{fill:#FFFFFF;}
.st2{fill:#41CD52;}
</style>
<polygon class="st0" points="191.9,55.5 191.9,12.7 204.7,0 12.8,0 0,12.7 0,55.5 0,59 0,67.8 8.8,67.8 12,67.8 191.9,67.8
191.9,59 "/>
<g>
<g>
<path class="st1" d="M25.5,22h9.1c2.5,0,4.3,0.5,5.5,1.5s1.8,2.6,1.8,4.8c0,1.4-0.2,2.6-0.7,3.4s-1.2,1.5-2.2,2
c2.3,0.9,3.4,2.8,3.4,5.6c0,4.6-2.6,6.8-7.7,6.8h-9.4V22H25.5z M34.4,25.4h-5v6.9h5.2c2.3,0,3.4-1.2,3.4-3.6
C38,26.5,36.8,25.4,34.4,25.4z M34.7,35.6h-5.2v7.1h5.3c1.3,0,2.3-0.3,2.9-0.8s1-1.5,1-2.8s-0.4-2.2-1.1-2.8
C36.7,35.9,35.8,35.6,34.7,35.6z"/>
<path class="st1" d="M57.2,28.5H61v17.6h-3.8V45c-1.7,1-3.3,1.5-4.7,1.5c-2.4,0-4-0.7-4.9-2c-0.8-1.3-1.2-3.6-1.2-6.8v-9.2h3.8
v9.2c0,2.1,0.2,3.5,0.5,4.3c0.4,0.7,1.2,1.1,2.5,1.1s2.4-0.2,3.5-0.7l0.5-0.2L57.2,28.5L57.2,28.5z"/>
<path class="st1" d="M65.7,25.5v-4h3.8v4H65.7z M65.7,46.1V28.5h3.8v17.6H65.7z"/>
<path class="st1" d="M74.4,46.1V21.2h3.8v24.9H74.4z"/>
<path class="st1" d="M92.5,31.8h-4.9v7.7c0,1.4,0.1,2.4,0.3,2.8c0.2,0.5,0.8,0.7,1.6,0.7l2.9-0.1l0.2,3.1
c-1.6,0.3-2.8,0.5-3.6,0.5c-2,0-3.4-0.5-4.1-1.4s-1.1-2.6-1.1-5.2v-8.2h-2.3v-3.2h2.3v-5.1h3.8v5.1h4.9
C92.5,28.5,92.5,31.8,92.5,31.8z"/>
<path class="st1" d="M102,28.5h3.8l2.8,14.3h0.7l3.3-14h3.9l3.3,14h0.7l2.8-14.3h3.8l-3.7,17.6h-6.1L114.6,34l-2.7,12.1h-6.2
L102,28.5z"/>
<path class="st1" d="M130.4,25.5v-4h3.8v4H130.4z M130.4,46.1V28.5h3.8v17.6H130.4z"/>
<path class="st1" d="M148.4,31.8h-4.9v7.7c0,1.4,0.1,2.4,0.3,2.8c0.2,0.5,0.8,0.7,1.6,0.7l2.9-0.1l0.2,3.1
c-1.6,0.3-2.8,0.5-3.6,0.5c-2,0-3.4-0.5-4.1-1.4s-1.1-2.6-1.1-5.1v-8.2h-2.3v-3.3h2.3v-5.1h3.8v5.1h4.9L148.4,31.8L148.4,31.8z"/>
<path class="st1" d="M155.3,46.1h-3.8V21.2h3.8v8.3c1.7-0.9,3.3-1.3,4.8-1.3c2.3,0,3.9,0.7,4.8,2s1.3,3.5,1.3,6.6v9.4h-3.8v-9.4
c0-1.9-0.2-3.2-0.6-4s-1.2-1.2-2.5-1.2c-1.1,0-2.3,0.2-3.4,0.6l-0.6,0.2L155.3,46.1L155.3,46.1z"/>
</g>
</g>
<polygon class="st2" points="275,0 271.8,0 204.5,0 204.5,0 191.7,12.7 191.7,55.5 191.7,59 191.7,67.8 200.6,67.8 203.8,67.8
271,67.8 271,67.8 283.8,55 283.8,12.3 283.8,8.8 283.8,0 "/>
<path class="st1" d="M226,53.1c-6.1,0-10.3-1.6-12.7-4.9c-2.4-3.3-3.6-8.4-3.6-15.5s1.2-12.3,3.6-15.7s6.6-5.1,12.6-5.1
s10.2,1.7,12.6,5.1s3.6,8.6,3.6,15.7c0,4.7-0.5,8.4-1.5,11.3s-2.6,5.1-4.9,6.6l4.9,7.9l-6,2.8l-5.2-8.5
C228.8,53,227.6,53.1,226,53.1z M218.4,44c1.3,2.3,3.8,3.4,7.6,3.4c3.8,0,6.2-1.1,7.6-3.4c1.3-2.2,2-6,2-11.3s-0.7-9.2-2-11.6
c-1.4-2.4-3.9-3.6-7.6-3.6s-6.2,1.2-7.5,3.6c-1.4,2.4-2,6.3-2,11.5C216.5,38,217.1,41.7,218.4,44z"/>
<path class="st1" d="M264.7,28h-8v12.8c0,2.4,0.2,3.9,0.5,4.7s1.2,1.2,2.7,1.2l4.8-0.2l0.3,5.1c-2.6,0.5-4.6,0.8-5.9,0.8
c-3.3,0-5.6-0.8-6.8-2.3s-1.8-4.4-1.8-8.6V28H246v-5.4h4.5v-8.5h6.3v8.5h8V28H264.7z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

39
mea/ui/images/Built_with_Qt_RGB_logo_vertical.svg Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="92.1px" height="100.4px" viewBox="0 0 92.1 100.4" style="enable-background:new 0 0 92.1 100.4;" xml:space="preserve">
<style type="text/css">
.st0{fill:#09102B;}
.st1{fill:#FFFFFF;}
.st2{fill:#41CD52;}
</style>
<polygon class="st0" points="12.1,67.8 8.8,67.8 0,67.8 0,94.5 0,96.1 0,100.4 4.2,100.4 5.8,100.4 86,100.4 92.1,94.3 92.1,55
79.3,67.8 "/>
<g>
<path class="st1" d="M12.4,78.4h4.4c1.2,0,2.1,0.2,2.7,0.7c0.6,0.5,0.9,1.2,0.9,2.3c0,0.7-0.1,1.2-0.3,1.6s-0.6,0.7-1,1
c1.1,0.4,1.7,1.3,1.7,2.7c0,2.2-1.2,3.3-3.7,3.3h-4.5V78.4H12.4z M16.6,80h-2.4v3.3h2.5c1.1,0,1.7-0.6,1.7-1.7
C18.4,80.6,17.8,80,16.6,80z M16.7,84.9h-2.5v3.4h2.6c0.6,0,1.1-0.1,1.4-0.4c0.3-0.3,0.5-0.7,0.5-1.3s-0.2-1.1-0.5-1.3
C17.7,85.1,17.3,84.9,16.7,84.9z"/>
<path class="st1" d="M27.6,81.5h1.8v8.4h-1.8v-0.5c-0.8,0.5-1.6,0.7-2.3,0.7c-1.2,0-1.9-0.3-2.3-0.9c-0.4-0.6-0.6-1.7-0.6-3.3v-4.4
h1.8v4.4c0,1,0.1,1.7,0.3,2s0.6,0.5,1.2,0.5c0.6,0,1.2-0.1,1.7-0.3l0.3-0.1L27.6,81.5L27.6,81.5z"/>
<path class="st1" d="M31.6,80.1v-1.9h1.8v1.9H31.6z M31.6,90v-8.4h1.8V90H31.6z"/>
<path class="st1" d="M35.8,90V78h1.8v12H35.8z"/>
<path class="st1" d="M44.5,83.1h-2.3v3.7c0,0.7,0.1,1.1,0.2,1.4c0.1,0.2,0.4,0.3,0.8,0.3l1.4-0.1l0.1,1.5c-0.8,0.1-1.3,0.2-1.7,0.2
c-1,0-1.6-0.2-2-0.7c-0.4-0.4-0.5-1.3-0.5-2.5V83h-1.1v-1.6h1.1v-2.5h1.8v2.5h2.3L44.5,83.1L44.5,83.1z"/>
<path class="st1" d="M49.1,81.5h1.8l1.3,6.9h0.3l1.6-6.7H56l1.6,6.7h0.3l1.3-6.9H61l-1.8,8.4h-2.9L55,84.1l-1.3,5.8h-2.9L49.1,81.5
z"/>
<path class="st1" d="M62.7,80.1v-1.9h1.8v1.9H62.7z M62.7,90v-8.4h1.8V90H62.7z"/>
<path class="st1" d="M71.4,83.1h-2.3v3.7c0,0.7,0.1,1.1,0.2,1.4c0.1,0.2,0.4,0.3,0.8,0.3l1.4-0.1l0.1,1.5c-0.8,0.1-1.3,0.2-1.7,0.2
c-1,0-1.6-0.2-2-0.7c-0.4-0.4-0.5-1.3-0.5-2.5V83h-1.1v-1.6h1.1v-2.5h1.8v2.5h2.3L71.4,83.1L71.4,83.1z"/>
<path class="st1" d="M74.7,90h-1.8V78h1.8v4c0.8-0.4,1.6-0.6,2.3-0.6c1.1,0,1.9,0.3,2.3,1c0.4,0.6,0.6,1.7,0.6,3.2v4.5h-1.8v-4.5
c0-0.9-0.1-1.6-0.3-1.9c-0.2-0.4-0.6-0.6-1.2-0.6c-0.5,0-1.1,0.1-1.6,0.3l-0.3,0.1V90z"/>
</g>
<polygon class="st2" points="83.2,0 80,0 12.8,0 12.8,0 0,12.8 0,55.5 0,59 0,67.8 8.8,67.8 12.1,67.8 79.3,67.8 79.3,67.8 92.1,55
92.1,12.3 92.1,8.8 92.1,0 "/>
<path class="st1" d="M34.3,53.1c-6.1,0-10.3-1.6-12.7-4.9S18,39.8,18,32.7s1.2-12.3,3.6-15.7s6.6-5.1,12.6-5.1s10.2,1.7,12.6,5.1
c2.4,3.4,3.6,8.6,3.6,15.7c0,4.7-0.5,8.4-1.5,11.3s-2.6,5.1-4.9,6.6l4.9,7.9l-6,2.8l-5.2-8.5C37.1,53,35.9,53.1,34.3,53.1z M26.7,44
c1.3,2.3,3.8,3.4,7.6,3.4s6.2-1.1,7.6-3.4c1.3-2.2,2-6,2-11.3s-0.7-9.2-2-11.6s-3.8-3.6-7.5-3.6s-6.2,1.2-7.5,3.6
c-1.4,2.4-2,6.3-2,11.5C24.7,38,25.4,41.8,26.7,44z"/>
<path class="st1" d="M73,28h-8v12.8c0,2.4,0.2,3.9,0.5,4.7c0.3,0.8,1.2,1.2,2.7,1.2l4.8-0.2l0.3,5.1c-2.6,0.5-4.6,0.8-5.9,0.8
c-3.3,0-5.6-0.8-6.8-2.3s-1.8-4.4-1.8-8.6V28h-4.5v-5.4h4.5v-8.5h6.3v8.5h8L73,28L73,28z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB