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

Merge remote-tracking branch 'origin/small-fixes' into landing-silo

Browse Source
This commit is contained in:
Jenkins 2018-10-18 12:10:24 +02:00
commit 7a868fe54d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ ApplicationWindow {
property int currentMainViewIndex: 0 property int currentMainViewIndex: 0
property bool showHiddenOptions: false property bool showHiddenOptions: false
property int cloudEnvironment: 0 property int cloudEnvironment: 0
property bool showConnectionTabs: app.hasOwnProperty("industrialSetup") && app.industrialSetup property bool showConnectionTabs: false
property int tabCount: 1 property int tabCount: 1
} }
@ -236,9 +236,9 @@ ApplicationWindow {
page = "GarageGateDevicePage.qml"; page = "GarageGateDevicePage.qml";
} else if (interfaceList.indexOf("light") >= 0) { } else if (interfaceList.indexOf("light") >= 0) {
page = "LightDevicePage.qml"; page = "LightDevicePage.qml";
} else if (interfaceList.indexOf("extendedshutter") >= 0 ) { } else if (interfaceList.indexOf("shutter") >= 0 || interfaceList.indexOf("blind") >= 0) {
page = "ShutterDevicePage.qml"; page = "ShutterDevicePage.qml";
} else if (interfaceList.indexOf("extendedawning") >= 0) { } else if (interfaceList.indexOf("awning") >= 0) {
page = "AwningDevicePage.qml"; page = "AwningDevicePage.qml";
} else if (interfaceList.indexOf("notifications") >= 0) { } else if (interfaceList.indexOf("notifications") >= 0) {
page = "NotificationsDevicePage.qml"; page = "NotificationsDevicePage.qml";

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

@ -15,6 +15,10 @@ Item {
color: Material.background color: Material.background
} }
function handleCloseEvent(close) {
swipeView.currentItem.handleCloseEvent(close)
}
ListModel { ListModel {
id: tabModel id: tabModel