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

working on ubuntu now

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-16 23:44:08 +02:00
parent bf782749a7
commit dc6d009e5f
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QtZeroConf

@ -1 +1 @@
Subproject commit 2990b858e6334fae4dd37a77c770336bd6e1b2d9 Subproject commit 09116a9bf84082688e9f2cd24cfd08788c71650c

2
libnymea-app-core/libnymea-app-core.pro
View File

@ -3,7 +3,7 @@ TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
include(../config.pri) include(../config.pri)
!win32:!ubuntu: { !win32: {
# To enable this on Windows we'd need to install Bonjour # To enable this on Windows we'd need to install Bonjour
# https://support.apple.com/kb/DL999 # https://support.apple.com/kb/DL999
DEFINES += QZEROCONF_STATIC DEFINES += QZEROCONF_STATIC

6
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "io.guh.nymeaapp", "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", "architecture": "armhf",
"title": "nymea:app", "title": "nymea:app",
"hooks": { "hooks": {
@ -9,7 +9,7 @@
"desktop": "nymea-app.desktop" "desktop": "nymea-app.desktop"
} }
}, },
"version": "1.0.0", "version": "1.0.75",
"maintainer": "Your FullName <email@domain.org>", "maintainer": "Michael Zanetti <michael.zanetti@nymea.io>",
"framework" : "ubuntu-sdk-15.04.5" "framework" : "ubuntu-sdk-15.04.5"
} }

2
nymea-app.apparmor
View File

@ -1,5 +1,5 @@
{ {
"template": "unconfined", "template": "unconfined",
"policy_groups": [], "policy_groups": ["networking"],
"policy_version": 1.3 "policy_version": 1.3
} }

9
nymea-app/main.cpp
View File

@ -56,15 +56,6 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
int main(int argc, char *argv[]) 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); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication application(argc, argv); QGuiApplication application(argc, argv);

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

@ -106,6 +106,7 @@ ToolBar {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: app.margins / 2 anchors.margins: app.margins / 2
spacing: 0
ColorIcon { ColorIcon {
name: model.iconSource name: model.iconSource
Layout.preferredHeight: app.iconSize Layout.preferredHeight: app.iconSize

1
nymea-app/ui/components/MainPageTabButton.qml
View File

@ -16,6 +16,7 @@ TabButton {
contentItem: GridLayout { contentItem: GridLayout {
columns: root.alignment === Qt.Vertical ? 1 : 2 columns: root.alignment === Qt.Vertical ? 1 : 2
rowSpacing: 4
ColorIcon { ColorIcon {
Layout.preferredWidth: app.iconSize Layout.preferredWidth: app.iconSize
Layout.preferredHeight: app.iconSize Layout.preferredHeight: app.iconSize