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

fix the new menu

Browse Source
This commit is contained in:
Michael Zanetti 2018-07-07 16:48:53 +02:00
parent 13979c95cd
commit 6b88b4bf4d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,10 @@ Page {
title: swipeView.currentItem.title title: swipeView.currentItem.title
model: ListModel { model: ListModel {
ListElement { iconSource: "../images/share.svg"; text: qsTr("Configure things"); page: "EditDevicesPage" } ListElement { iconSource: "../images/share.svg"; text: qsTr("Configure things"); page: "../EditDevicesPage.qml" }
ListElement { iconSource: "../images/magic.svg"; text: qsTr("Magic"); page: "MagicPage" } ListElement { iconSource: "../images/magic.svg"; text: qsTr("Magic"); page: "../MagicPage.qml" }
ListElement { iconSource: "../images/settings.svg"; text: qsTr("System settings"); page: "SettingsPage" } ListElement { iconSource: "../images/settings.svg"; text: qsTr("System settings"); page: "../SettingsPage.qml" }
ListElement { iconSource: "../images/stock_application.svg"; text: qsTr("App settings"); page: "AppSettingsPage" } ListElement { iconSource: "../images/stock_application.svg"; text: qsTr("App settings"); page: "../AppSettingsPage.qml" }
} }
} }

4
nymea-app/ui/components/FancyHeader.qml
View File

@ -86,8 +86,8 @@ ToolBar {
width: app.iconSize * 3 width: app.iconSize * 3
onClicked: { onClicked: {
header.menuOpen = false d.menuOpen = false
pageStack.push(Qt.resolvedUrl(model.page + ".qml")) pageStack.push(model.page)
} }
Rectangle { Rectangle {

2
nymea-app/ui/components/MeaListItemDelegate.qml
View File

@ -34,6 +34,8 @@ SwipeDelegate {
Layout.fillHeight: true Layout.fillHeight: true
text: root.text text: root.text
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
maximumLineCount: 2
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
Label { Label {