ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-25 14:24:21 +02:00
parent 2e25dc16f6
commit fd0f702916
6 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/styles/dark/ApplicationWindow.qml
View File

@ -33,5 +33,5 @@ ApplicationWindow {
"pressuresensor": "grey"
}
property bool showConnectionTabs: false
property bool industrialSetup: true
}

2
nymea-app/styles/light/ApplicationWindow.qml
View File

@ -31,6 +31,4 @@ ApplicationWindow {
"pressuresensor": "grey"
}
property bool showConnectionTabs: false
}

3
nymea-app/ui/Nymea.qml
View File

@ -20,7 +20,7 @@ ApplicationWindow {
Material.accent: accentColor
Material.foreground: foregroundColor
property int margins: 14
property int margins: 16
property int bigMargins: 20
property int extraSmallFont: 10
property int smallFont: 13
@ -41,6 +41,7 @@ ApplicationWindow {
property int currentMainViewIndex: 0
property bool showHiddenOptions: false
property int cloudEnvironment: 0
property bool showConnectionTabs: app.hasOwnProperty("industrialSetup") && app.industrialSetup
}
RootItem {

3
nymea-app/ui/RootItem.qml
View File

@ -232,11 +232,12 @@ Item {
}
RowLayout {
visible: app.showConnectionTabs
visible: settings.showConnectionTabs
TabBar {
id: tabbar
Layout.fillWidth: true
Material.elevation: 2
Repeater {
model: mainRepeater.count

82
nymea-app/ui/appsettings/AppSettingsPage.qml
View File

@ -13,15 +13,17 @@ Page {
onBackPressed: pageStack.pop()
}
ColumnLayout {
anchors { left: parent.left; right: parent.right; top: parent.top }
Flickable {
anchors.fill: parent
contentHeight: contentColumn.implicitHeight
interactive: contentHeight > height
ColumnLayout {
Layout.fillWidth: true
Layout.margins: app.margins
id: contentColumn
width: parent.width
RowLayout {
Layout.fillWidth: true
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.topMargin: app.margins
Label {
Layout.fillWidth: true
text: qsTr("View mode")
@ -55,7 +57,7 @@ Page {
}
RowLayout {
Layout.fillWidth: true
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
visible: appBranding.length === 0
Label {
Layout.fillWidth: true
@ -80,18 +82,7 @@ Page {
}
RowLayout {
Layout.fillWidth: true
Label {
Layout.fillWidth: true
text: qsTr("Return to home on idle")
}
CheckBox {
checked: settings.returnToHome
onClicked: settings.returnToHome = checked
}
}
RowLayout {
Layout.fillWidth: true
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
Label {
Layout.fillWidth: true
text: qsTr("Graph style")
@ -106,32 +97,45 @@ Page {
text: qsTr("Lines")
onClicked: settings.graphStyle = "bezier"
}
}
CheckDelegate {
Layout.fillWidth: true
text: qsTr("Return to home on idle")
checked: settings.returnToHome
onClicked: settings.returnToHome = checked
}
CheckDelegate {
Layout.fillWidth: true
text: qsTr("Show connection tabs")
checked: settings.showConnectionTabs
onClicked: settings.showConnectionTabs = checked
}
ThinDivider {}
MeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("Cloud login")
iconName: "../images/cloud.svg"
onClicked: pageStack.push(Qt.resolvedUrl("CloudLoginPage.qml"))
}
MeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("About %1").arg(app.appName)
iconName: "../images/info.svg"
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
}
MeaListItemDelegate {
Layout.fillWidth: true
Layout.bottomMargin: app.margins
visible: settings.showHiddenOptions
text: qsTr("Developer options")
iconName: "../images/configure.svg"
onClicked: pageStack.push(Qt.resolvedUrl("DeveloperOptionsPage.qml"))
}
}
ThinDivider {}
MeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("Cloud login")
iconName: "../images/cloud.svg"
onClicked: pageStack.push(Qt.resolvedUrl("CloudLoginPage.qml"))
}
MeaListItemDelegate {
Layout.fillWidth: true
text: qsTr("About %1").arg(app.appName)
iconName: "../images/info.svg"
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
}
MeaListItemDelegate {
Layout.fillWidth: true
visible: settings.showHiddenOptions
text: qsTr("Developer options")
iconName: "../images/configure.svg"
onClicked: pageStack.push(Qt.resolvedUrl("DeveloperOptionsPage.qml"))
}
}
Component {
id: styleChangedDialog
Dialog {

3
nymea-app/ui/appsettings/DeveloperOptionsPage.qml
View File

@ -32,7 +32,4 @@ Page {
}
}
}
}