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

Allow adding custom main views in the overlay

Browse Source 
The STYLES_PATH qmake argument is replaces with OVERLAY_PATH now
This commit is contained in:
Michael Zanetti 2020-09-18 00:54:20 +02:00
parent 61c2cb70f0
commit fbbe8c53c8
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nymea-app.pro
View File

@ -15,8 +15,8 @@ withtests: {
# $ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" # $ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
# $ make wininstaller # $ make wininstaller
wininstaller.depends = nymea-app wininstaller.depends = nymea-app
!equals(STYLES_PATH, ""):!equals(BRANDING, "") { !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") {
PACKAGE_BASE_DIR = $${STYLES_PATH}\packaging PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging
} else { } else {
PACKAGE_BASE_DIR = $$shell_path($$PWD)\packaging PACKAGE_BASE_DIR = $$shell_path($$PWD)\packaging
} }

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

@ -34,12 +34,12 @@ SOURCES += main.cpp \
RESOURCES += resources.qrc \ RESOURCES += resources.qrc \
ruletemplates.qrc \ ruletemplates.qrc \
images.qrc \ images.qrc \
translations.qrc translations.qrc \
equals(STYLES_PATH, "") { styles.qrc
RESOURCES += styles.qrc
} else { !equals(OVERLAY_PATH, "") {
message("Style override enabled. Will be using styles from $${STYLES_PATH}") message("Resource overlay enabled. Will be using overlay from $${OVERLAY_PATH}")
RESOURCES += $${STYLES_PATH}/styles.qrc RESOURCES += $${OVERLAY_PATH}/overlay.qrc
} }
win32 { win32 {

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

@ -131,6 +131,21 @@ Page {
var configList = {} var configList = {}
var newList = {} var newList = {}
var newItems = 0 var newItems = 0
// Add extra views first to make them appear first in the list unless the config says otherwise
if (app.hasOwnProperty("additionalMainViews")) {
for (var i = 0; i < app.additionalMainViews.count; i++) {
var item = app.additionalMainViews.get(i);
var idx = mainViewSettings.sortOrder.indexOf(item.name);
if (idx === -1) {
newList[newItems++] = item;
} else {
configList[idx] = item;
}
}
}
for (var i = 0; i < mainMenuBaseModel.count; i++) { for (var i = 0; i < mainMenuBaseModel.count; i++) {
var item = mainMenuBaseModel.get(i); var item = mainMenuBaseModel.get(i);
var idx = mainViewSettings.sortOrder.indexOf(item.name); var idx = mainViewSettings.sortOrder.indexOf(item.name);
@ -140,16 +155,21 @@ Page {
configList[idx] = item; configList[idx] = item;
} }
} }
clear(); clear();
var brandingFilter = app.hasOwnProperty("mainViewsFilter") ? app.mainViewsFilter : []
for (idx in configList) { for (idx in configList) {
item = configList[idx]; item = configList[idx];
mainMenuModel.append(item) if (brandingFilter.length === 0 || brandingFilter.indexOf(item.name) >= 0) {
mainMenuModel.append(item)
}
} }
for (idx in newList) { for (idx in newList) {
item = newList[idx]; item = newList[idx];
mainMenuModel.append(item) if (brandingFilter.length === 0 || brandingFilter.indexOf(item.name) >= 0) {
mainMenuModel.append(item)
}
} }
tabBar.currentIndex = Qt.binding(function() { return mainViewSettings.currentIndex; }) tabBar.currentIndex = Qt.binding(function() { return mainViewSettings.currentIndex; })