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

Fix button layout in the setup wizard

Browse Source
This commit is contained in:
Michael Zanetti 2019-02-11 19:19:11 +01:00
parent f9730626ad
commit 95e3576906
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ ToolBar {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pixelSize: app.mediumFont font.pixelSize: app.mediumFont
elide: Text.ElideRight elide: Text.ElideRight
text: qsTr("menu") text: qsTr("Menu")
color: app.headerForegroundColor color: app.headerForegroundColor
} }

10
nymea-app/ui/thingconfiguration/SetupWizard.qml
View File

@ -175,6 +175,7 @@ Page {
ListView { ListView {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
clip: true
model: DeviceDiscoveryProxy { model: DeviceDiscoveryProxy {
id: discoveryProxy id: discoveryProxy
deviceDiscovery: discovery deviceDiscovery: discovery
@ -222,7 +223,7 @@ Page {
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("Search again") text: qsTr("Search again")
onClicked: discovery.discoverDevices(root.deviceClass.id, d.discoveryParams) onClicked: discovery.discoverDevices(root.deviceClass.id, d.discoveryParams)
visible: !discovery.busy && discoveryProxy.count > 0 visible: !discovery.busy
} }
Button { Button {
@ -274,13 +275,6 @@ Page {
text: qsTr("Make sure your things are set up and connected, try searching again or go back and pick a different kind of thing.") text: qsTr("Make sure your things are set up and connected, try searching again or go back and pick a different kind of thing.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
Button {
text: qsTr("Try again!")
Layout.fillWidth: true
onClicked: {
discovery.discoverDevices(root.deviceClass.id, d.discoveryParams)
}
}
} }
} }
} }