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

Merge remote-tracking branch 'origin/redesign-ui' into landing-silo

Browse Source
This commit is contained in:
Jenkins 2018-07-17 23:00:47 +02:00
commit a518fe8b4a
9 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "-f"]
path = -f
url = https://github.com/mzanetti/QtZeroConf.git
[submodule "QtZeroConf"]
path = QtZeroConf
url = https://github.com/jbagg/QtZeroConf.git
url = https://github.com/jbagg/QtZeroConf.git

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

@ -17,6 +17,7 @@ ApplicationWindow {
property int margins: 14
property int bigMargins: 20
property int extraSmallFont: 10
property int smallFont: 13
property int mediumFont: 16
property int largeFont: 20

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

@ -30,9 +30,9 @@ ToolBar {
Layout.fillHeight: true
Layout.margins: app.margins
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.largeFont
font.pixelSize: app.mediumFont
elide: Text.ElideRight
text: root.title
text: root.title.toLowerCase();
}
HeaderButton {
@ -55,9 +55,9 @@ ToolBar {
Layout.fillHeight: true
Layout.margins: app.margins
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.largeFont
font.pixelSize: app.mediumFont
elide: Text.ElideRight
text: qsTr("Menu")
text: qsTr("menu")
}
HeaderButton {
@ -115,7 +115,7 @@ ToolBar {
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.smallFont - 2
font.pixelSize: app.extraSmallFont
}
}
}

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

@ -38,9 +38,9 @@ ToolBar {
Layout.fillWidth: true
Layout.fillHeight: true
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.largeFont
font.pixelSize: app.mediumFont
elide: Text.ElideRight
text: root.text.toUpperCase()
text: root.text.toLowerCase();
}
}
}

2
nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
View File

@ -19,7 +19,7 @@ Page {
header: GuhHeader {
text: {
if (subPage.shownInterfaces.length === 1) {
return qsTr("My %1").arg(interfaceToString(subPage.shownInterfaces[0]))
return qsTr("My %1").arg(app.interfaceToString(subPage.shownInterfaces[0]))
} else if (subPage.shownInterfaces.length > 1 || subPage.hiddenInterfaces.length > 0) {
return qsTr("My things")
}

2
nymea-app/ui/mainviews/DevicesPage.qml
View File

@ -24,7 +24,7 @@ Item {
devices: Engine.deviceManager.devices
}
cellWidth: width / tilesPerRow
cellHeight: Math.max(cellWidth, minTileHeight)
cellHeight: cellWidth
delegate: DevicesPageDelegate {
width: interfacesGridView.cellWidth
height: interfacesGridView.cellHeight

6
nymea-app/ui/mainviews/DevicesPageDelegate.qml
View File

@ -18,7 +18,7 @@ Item {
anchors.verticalCenterOffset: -app.iconSize
spacing: app.margins
ColorIcon {
height: app.iconSize * 2
height: app.iconSize * 1.3
width: height
color: app.guhAccent
anchors.horizontalCenter: parent.horizontalCenter
@ -27,6 +27,9 @@ Item {
Label {
text: interfaceToString(model.name).toUpperCase()
font.pixelSize: app.extraSmallFont
font.bold: true
font.letterSpacing: 1
width: parent.width
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@ -69,7 +72,6 @@ Item {
color: "black"
opacity: .05
}
Loader {
id: inlineControlLoader
anchors {

7
nymea-app/ui/mainviews/FavoritesView.qml
View File

@ -119,7 +119,7 @@ Item {
spacing: app.margins
ColorIcon {
Layout.preferredWidth: app.iconSize * 2
Layout.preferredWidth: app.iconSize * 1.3
Layout.preferredHeight: width
name: app.interfacesToIcon(delegateRoot.deviceClass.interfaces)
color: app.guhAccent
@ -128,7 +128,10 @@ Item {
Label {
Layout.fillWidth: true
text: delegateRoot.device.name
text: delegateRoot.device.name.toUpperCase()
font.pixelSize: app.extraSmallFont
font.bold: true
font.letterSpacing: 1
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
}

9
nymea-app/ui/mainviews/ScenesView.qml
View File

@ -24,7 +24,7 @@ Item {
filterExecutable: true
}
cellWidth: width / tilesPerRow
cellHeight: Math.max(cellWidth, minTileHeight)
cellHeight: cellWidth
delegate: Item {
id: scenesDelegate
width: interfacesGridView.cellWidth
@ -56,7 +56,7 @@ Item {
spacing: app.margins
ColorIcon {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredHeight: app.iconSize * 1.3
Layout.preferredWidth: height
Layout.alignment: Qt.AlignHCenter
name: scenesDelegate.iconTag ? "../images/" + scenesDelegate.iconTag.value + ".svg" : "../images/slideshow.svg";
@ -72,7 +72,10 @@ Item {
Label {
Layout.fillWidth: true
text: model.name
text: model.name.toUpperCase()
font.pixelSize: app.extraSmallFont
font.bold: true
font.letterSpacing: 1
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
maximumLineCount: 2