From 465d0755c2648d4bd8c67042efdfa535f33e14f2 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 9 Jul 2018 17:28:55 +0200 Subject: [PATCH 1/7] changes to font size --- -f | 1 + nymea-app/ui/components/FancyHeader.qml | 8 ++++---- nymea-app/ui/components/GuhHeader.qml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 160000 -f diff --git a/-f b/-f new file mode 160000 index 00000000..d91e9e5b --- /dev/null +++ b/-f @@ -0,0 +1 @@ +Subproject commit d91e9e5b81025acc4d25843a2871e72c8924a8fe diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml index 432ab946..cc22e67e 100644 --- a/nymea-app/ui/components/FancyHeader.qml +++ b/nymea-app/ui/components/FancyHeader.qml @@ -28,9 +28,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 { @@ -53,9 +53,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 { diff --git a/nymea-app/ui/components/GuhHeader.qml b/nymea-app/ui/components/GuhHeader.qml index 41aea2ef..63c3daf2 100644 --- a/nymea-app/ui/components/GuhHeader.qml +++ b/nymea-app/ui/components/GuhHeader.qml @@ -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(); } } } From 02f751eba52245f2ea2788abb7933e3ccfc8fb32 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 16 Jul 2018 18:32:20 +0300 Subject: [PATCH 2/7] ui improvements first part. --- nymea-app/ui/Nymea.qml | 1 + nymea-app/ui/components/FancyHeader.qml | 2 +- nymea-app/ui/devicelistpages/GenericDeviceListPage.qml | 2 +- nymea-app/ui/mainviews/DevicesPage.qml | 2 +- nymea-app/ui/mainviews/DevicesPageDelegate.qml | 6 ++++-- nymea-app/ui/mainviews/FavoritesView.qml | 5 ++++- nymea-app/ui/mainviews/ScenesView.qml | 7 +++++-- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index 5c0b2c46..df8ee59b 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -16,6 +16,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 diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml index cc22e67e..86046168 100644 --- a/nymea-app/ui/components/FancyHeader.qml +++ b/nymea-app/ui/components/FancyHeader.qml @@ -113,7 +113,7 @@ ToolBar { elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - font.pixelSize: app.smallFont - 2 + font.pixelSize: app.extraSmallFont } } } diff --git a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml index a792d936..dacc2ce5 100644 --- a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml @@ -19,7 +19,7 @@ Page { header: GuhHeader { text: { if (subPage.shownInterfaces.length === 1) { - return qsTr("My %1 things").arg(interfaceToString(subPage.filterInterface)) + return qsTr("My %1 things").arg(app.interfaceToString(subPage.shownInterfaces[0])) } else if (subPage.shownInterfaces.length > 1 || subPage.hiddenInterfaces.length > 0) { return qsTr("My things") } diff --git a/nymea-app/ui/mainviews/DevicesPage.qml b/nymea-app/ui/mainviews/DevicesPage.qml index fbaa2f5b..7eca6603 100644 --- a/nymea-app/ui/mainviews/DevicesPage.qml +++ b/nymea-app/ui/mainviews/DevicesPage.qml @@ -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 diff --git a/nymea-app/ui/mainviews/DevicesPageDelegate.qml b/nymea-app/ui/mainviews/DevicesPageDelegate.qml index 863e8bee..72fc4e50 100644 --- a/nymea-app/ui/mainviews/DevicesPageDelegate.qml +++ b/nymea-app/ui/mainviews/DevicesPageDelegate.qml @@ -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 { diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml index 747b6550..aa5354dc 100644 --- a/nymea-app/ui/mainviews/FavoritesView.qml +++ b/nymea-app/ui/mainviews/FavoritesView.qml @@ -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 } diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 62714156..11e67b7e 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -24,7 +24,7 @@ Item { filterExecutable: true } cellWidth: width / tilesPerRow - cellHeight: Math.max(cellWidth, minTileHeight) + cellHeight: cellWidth delegate: Item { id: scenesDelegate width: interfacesGridView.cellWidth @@ -67,7 +67,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 From 4c0801761651cd3a05c8223b4b078dedca65e613 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 16 Jul 2018 18:42:48 +0300 Subject: [PATCH 3/7] fix on icon --- nymea-app/ui/mainviews/FavoritesView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml index aa5354dc..9436c80f 100644 --- a/nymea-app/ui/mainviews/FavoritesView.qml +++ b/nymea-app/ui/mainviews/FavoritesView.qml @@ -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 From 0b664836637ad3f7c1374660e081d85511d4adc4 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 16 Jul 2018 19:00:52 +0300 Subject: [PATCH 4/7] fix on icon size for scenes --- nymea-app/ui/mainviews/ScenesView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 04c7640a..9f1f174f 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -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"; From 3e3e13c9d4d6131a1b2b6441466d9f39089639f3 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Mon, 16 Jul 2018 19:03:49 +0300 Subject: [PATCH 5/7] removed "things" string --- nymea-app/ui/devicelistpages/GenericDeviceListPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml index dacc2ce5..4274b3c4 100644 --- a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml @@ -19,7 +19,7 @@ Page { header: GuhHeader { text: { if (subPage.shownInterfaces.length === 1) { - return qsTr("My %1 things").arg(app.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") } From 14f7e21205c1419072fe6ef6a28b6bc0a6ad7349 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Tue, 17 Jul 2018 14:56:23 +0300 Subject: [PATCH 6/7] fix on scenes view --- -f | 1 - .gitmodules | 5 +---- nymea-app/ui/mainviews/ScenesView.qml | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-) delete mode 160000 -f diff --git a/-f b/-f deleted file mode 160000 index d91e9e5b..00000000 --- a/-f +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d91e9e5b81025acc4d25843a2871e72c8924a8fe diff --git a/.gitmodules b/.gitmodules index 81790a01..3e4d5c9e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 \ No newline at end of file diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 9f1f174f..e44bddc7 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -70,19 +70,19 @@ Item { } } - Label { - Layout.fillWidth: true - text: model.name.toUpperCase() - font.pixelSize: app.extraSmallFont - font.bold: true - font.letterSpacing: 1 - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter - maximumLineCount: 2 - elide: Text.ElideRight + Label { + Layout.fillWidth: true + text: model.name.toUpperCase() + font.pixelSize: app.extraSmallFont + font.bold: true + font.letterSpacing: 1 + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter + maximumLineCount: 2 + elide: Text.ElideRight + } } } } } } -} From 4d305560c912ede84f175ff47de8e9aa74d1f256 Mon Sep 17 00:00:00 2001 From: George Yatsev Date: Tue, 17 Jul 2018 14:57:14 +0300 Subject: [PATCH 7/7] world champion hide and seek. --- nymea-app/ui/mainviews/ScenesView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index e44bddc7..c089f9cb 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -86,3 +86,4 @@ Item { } } } +}