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

Merge PR #460: Use main views from branding if set

Browse Source
This commit is contained in:
Jenkins nymea 2020-11-11 16:48:36 +01:00
commit 7fab2ac6e8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nymea-app/nymea-app.pro
View File

@ -156,6 +156,7 @@ ubports: {
BR=$$BRANDING BR=$$BRANDING
!equals(BR, "") { !equals(BR, "") {
message("Branding the style to: $${BR}")
DEFINES += BRANDING=\\\"$${BR}\\\" DEFINES += BRANDING=\\\"$${BR}\\\"
win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico
} else { } else {

2
nymea-app/ui/MainPage.qml
View File

@ -111,7 +111,7 @@ Page {
category: engine.jsonRpcClient.currentHost.uuid category: engine.jsonRpcClient.currentHost.uuid
property string mainMenuContent: "" property string mainMenuContent: ""
property var sortOrder: [] property var sortOrder: []
property var filterList: ["things"] property var filterList: app.hasOwnProperty("mainViewsFilter") ? app.mainViewsFilter : ["things"]
property int currentIndex: 0 property int currentIndex: 0
} }