From f1e20dad934bb8d55b56097889a0dbeaeb512801 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 26 Jul 2018 00:08:56 +0200 Subject: [PATCH 1/5] first attempt to build with clickable --- clickable.json | 8 ++++++++ manifest.json | 15 +++++++++++++++ nymea-app.apparmor | 5 +++++ nymea-app.desktop | 7 +++++++ 4 files changed, 35 insertions(+) create mode 100644 clickable.json create mode 100644 manifest.json create mode 100644 nymea-app.apparmor create mode 100644 nymea-app.desktop diff --git a/clickable.json b/clickable.json new file mode 100644 index 00000000..254b9dc6 --- /dev/null +++ b/clickable.json @@ -0,0 +1,8 @@ +{ + "template": "qmake", + "kill": "nymeaapp", + "dependencies": [ + "libavahi-client-dev", + "libavahi-common-dev" + ] +} diff --git a/manifest.json b/manifest.json new file mode 100644 index 00000000..7aad3569 --- /dev/null +++ b/manifest.json @@ -0,0 +1,15 @@ +{ + "name": "io.guh.nymeaapp", + "description": "blabla", + "architecture": "armhf", + "title": "nymea:app", + "hooks": { + "nymea-app": { + "apparmor": "nymea-app.apparmor", + "desktop": "nymea-app.desktop" + } + }, + "version": "1.0.0", + "maintainer": "Your FullName ", + "framework" : "ubuntu-sdk-15.04.5" +} diff --git a/nymea-app.apparmor b/nymea-app.apparmor new file mode 100644 index 00000000..7a0a3253 --- /dev/null +++ b/nymea-app.apparmor @@ -0,0 +1,5 @@ +{ + "template": "unconfined", + "policy_groups": [], + "policy_version": 1.3 +} diff --git a/nymea-app.desktop b/nymea-app.desktop new file mode 100644 index 00000000..18c12f4f --- /dev/null +++ b/nymea-app.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=nymea:app +Exec=nymeaapp +Icon=packaging/android/appicon.svg +Terminal=false +Type=Application +X-Ubuntu-Touch=true From af3758f60b349c3f623f43abc2f27a6ed241f22b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 26 Jul 2018 01:30:01 +0200 Subject: [PATCH 2/5] install files --- nymea-app/nymea-app.pro | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 2a393964..e47d6432 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -108,6 +108,10 @@ ios: { QMAKE_MAC_XCODE_SETTINGS += IOS_ENTITLEMENTS } +ubuntu_files.path += / +ubuntu_files.files += ../manifest.json ../nymea-app.apparmor ../nymea-app.desktop +INSTALLS += ubuntu_files + BR=$$BRANDING !equals(BR, "") { DEFINES += BRANDING=\\\"$${BR}\\\" @@ -119,10 +123,3 @@ BR=$$BRANDING target.path = /usr/bin INSTALLS += target -DISTFILES += \ - ui/components/BusyOverlay.qml \ - ui/devicepages/NotificationsDevicePage.qml \ - ruletemplates/buttontemplates.json \ - ruletemplates/notificationtemplates.json \ - ui/devicepages/LightDevicePage.qml \ - ruletemplates/accesscontroltemplates.json From 522881d85b01cf5dcc218db23c7e168ca7350c4a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 26 Jul 2018 01:37:12 +0200 Subject: [PATCH 3/5] also install app icon --- nymea-app.desktop | 2 +- nymea-app/nymea-app.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nymea-app.desktop b/nymea-app.desktop index 18c12f4f..8bb1664a 100644 --- a/nymea-app.desktop +++ b/nymea-app.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=nymea:app Exec=nymeaapp -Icon=packaging/android/appicon.svg +Icon=appicon.svg Terminal=false Type=Application X-Ubuntu-Touch=true diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index e47d6432..86c2b022 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -109,7 +109,7 @@ ios: { } ubuntu_files.path += / -ubuntu_files.files += ../manifest.json ../nymea-app.apparmor ../nymea-app.desktop +ubuntu_files.files += ../manifest.json ../nymea-app.apparmor ../nymea-app.desktop ../packaging/android/appicon.svg INSTALLS += ubuntu_files BR=$$BRANDING From bf782749a721e150443cf8fedd54efe41b3a3fb5 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Aug 2018 23:27:49 +0200 Subject: [PATCH 4/5] fix dpr --- clickable.json | 3 ++- libnymea-app-core/libnymea-app-core.pro | 2 +- nymea-app.desktop | 2 +- nymea-app.pro | 1 - nymea-app/main.cpp | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/clickable.json b/clickable.json index 254b9dc6..7b764a17 100644 --- a/clickable.json +++ b/clickable.json @@ -1,6 +1,7 @@ { "template": "qmake", - "kill": "nymeaapp", + "kill": "nymea-app", + "build_args": "CONFIG+=ubuntu", "dependencies": [ "libavahi-client-dev", "libavahi-common-dev" diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro index 451e2091..770170f2 100644 --- a/libnymea-app-core/libnymea-app-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -3,7 +3,7 @@ TEMPLATE = lib CONFIG += staticlib include(../config.pri) -!win32: { +!win32:!ubuntu: { # To enable this on Windows we'd need to install Bonjour # https://support.apple.com/kb/DL999 DEFINES += QZEROCONF_STATIC diff --git a/nymea-app.desktop b/nymea-app.desktop index 8bb1664a..c96d1355 100644 --- a/nymea-app.desktop +++ b/nymea-app.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=nymea:app -Exec=nymeaapp +Exec=usr/bin/nymea-app Icon=appicon.svg Terminal=false Type=Application diff --git a/nymea-app.pro b/nymea-app.pro index ee90a9cc..79416e12 100644 --- a/nymea-app.pro +++ b/nymea-app.pro @@ -1,6 +1,5 @@ include(config.pri) message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") - TEMPLATE=subdirs SUBDIRS = libnymea-common libnymea-app-core nymea-app diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index b317e307..acd34812 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -56,6 +56,15 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine) int main(int argc, char *argv[]) { + QByteArray gridUnits = qgetenv("GRID_UNIT_PX"); + qDebug() << "grid units" << gridUnits; + bool ok; + int gu = gridUnits.toInt(&ok); + if (ok && gu > 0) { + qreal scale = 1.0 * qRound(2.0 * gu / 8) / 2; + qDebug() << "Setting scale factor to" << scale; + qputenv("QT_SCALE_FACTOR", QByteArray::number(scale)); + } QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); From dc6d009e5fdd83be2140272f505b33076bc66042 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 16 Oct 2018 23:44:08 +0200 Subject: [PATCH 5/5] working on ubuntu now --- QtZeroConf | 2 +- libnymea-app-core/libnymea-app-core.pro | 2 +- manifest.json | 6 +++--- nymea-app.apparmor | 2 +- nymea-app/main.cpp | 9 --------- nymea-app/ui/components/FancyHeader.qml | 1 + nymea-app/ui/components/MainPageTabButton.qml | 1 + 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/QtZeroConf b/QtZeroConf index 2990b858..09116a9b 160000 --- a/QtZeroConf +++ b/QtZeroConf @@ -1 +1 @@ -Subproject commit 2990b858e6334fae4dd37a77c770336bd6e1b2d9 +Subproject commit 09116a9bf84082688e9f2cd24cfd08788c71650c diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro index 770170f2..451e2091 100644 --- a/libnymea-app-core/libnymea-app-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -3,7 +3,7 @@ TEMPLATE = lib CONFIG += staticlib include(../config.pri) -!win32:!ubuntu: { +!win32: { # To enable this on Windows we'd need to install Bonjour # https://support.apple.com/kb/DL999 DEFINES += QZEROCONF_STATIC diff --git a/manifest.json b/manifest.json index 7aad3569..23ae010d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "io.guh.nymeaapp", - "description": "blabla", + "description": "nymea:app is a client for nymea - a professional IoT server that allows to link smart devices and services. Functional relations of all available sensing and acting capabilities can be defined by 'Magic'.", "architecture": "armhf", "title": "nymea:app", "hooks": { @@ -9,7 +9,7 @@ "desktop": "nymea-app.desktop" } }, - "version": "1.0.0", - "maintainer": "Your FullName ", + "version": "1.0.75", + "maintainer": "Michael Zanetti ", "framework" : "ubuntu-sdk-15.04.5" } diff --git a/nymea-app.apparmor b/nymea-app.apparmor index 7a0a3253..437a2219 100644 --- a/nymea-app.apparmor +++ b/nymea-app.apparmor @@ -1,5 +1,5 @@ { "template": "unconfined", - "policy_groups": [], + "policy_groups": ["networking"], "policy_version": 1.3 } diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index acd34812..b317e307 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -56,15 +56,6 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine) int main(int argc, char *argv[]) { - QByteArray gridUnits = qgetenv("GRID_UNIT_PX"); - qDebug() << "grid units" << gridUnits; - bool ok; - int gu = gridUnits.toInt(&ok); - if (ok && gu > 0) { - qreal scale = 1.0 * qRound(2.0 * gu / 8) / 2; - qDebug() << "Setting scale factor to" << scale; - qputenv("QT_SCALE_FACTOR", QByteArray::number(scale)); - } QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml index 33de4258..bfe5ac1d 100644 --- a/nymea-app/ui/components/FancyHeader.qml +++ b/nymea-app/ui/components/FancyHeader.qml @@ -106,6 +106,7 @@ ToolBar { ColumnLayout { anchors.fill: parent anchors.margins: app.margins / 2 + spacing: 0 ColorIcon { name: model.iconSource Layout.preferredHeight: app.iconSize diff --git a/nymea-app/ui/components/MainPageTabButton.qml b/nymea-app/ui/components/MainPageTabButton.qml index b7aa8fe8..ac2c6c59 100644 --- a/nymea-app/ui/components/MainPageTabButton.qml +++ b/nymea-app/ui/components/MainPageTabButton.qml @@ -16,6 +16,7 @@ TabButton { contentItem: GridLayout { columns: root.alignment === Qt.Vertical ? 1 : 2 + rowSpacing: 4 ColorIcon { Layout.preferredWidth: app.iconSize Layout.preferredHeight: app.iconSize