diff --git a/nymea-app/ui/connection/NewConnectionWizard.qml b/nymea-app/ui/connection/NewConnectionWizard.qml index 322cde77..c06edeac 100644 --- a/nymea-app/ui/connection/NewConnectionWizard.qml +++ b/nymea-app/ui/connection/NewConnectionWizard.qml @@ -1,5 +1,5 @@ -import QtQuick 2.9 -import QtQuick.Controls 2.9 +import QtQuick 2.3 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 import "../components" import Nymea 1.0 @@ -20,27 +20,31 @@ WizardPageBase { content: ColumnLayout { anchors.fill: parent - anchors.margins: Style.margins + anchors.leftMargin: Style.margins + anchors.rightMargin: Style.margins - ColumnLayout { - Layout.fillHeight: false + Item { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: Style.hugeIconSize * 2 ColorIcon { - size: Style.hugeIconSize * 3 + anchors.centerIn: parent + size: Math.min(parent.width, parent.height, Style.hugeIconSize * 2) name: "nymea-logo" - Layout.alignment: Qt.AlignHCenter - } - - Label { - Layout.fillWidth: true - horizontalAlignment: Text.AlignHCenter - text: "nymea" - font: Style.hugeFont } } + Label { + Layout.fillWidth: true + Layout.fillHeight: true + horizontalAlignment: Text.AlignHCenter + text: "nymea" + font: Style.hugeFont + } Label { Layout.fillWidth: true + Layout.fillHeight: true wrapMode: Text.WordWrap font: Style.smallFont text: qsTr("In order to use nymea, you will need to install nymea:core on a computer in your network. This can be a Raspberry Pi or any generic Linux computer.") @@ -48,6 +52,7 @@ WizardPageBase { } Label { Layout.fillWidth: true + Layout.fillHeight: true wrapMode: Text.WordWrap font: Style.smallFont text: qsTr("Please follow the installation instructions on %1 to install a nymea system.").arg('nymea.io') diff --git a/nymea-app/ui/images/nymea-logo.svg b/nymea-app/ui/images/nymea-logo.svg index 5696bf0b..a23128c1 100644 --- a/nymea-app/ui/images/nymea-logo.svg +++ b/nymea-app/ui/images/nymea-logo.svg @@ -1,6 +1,4 @@ - - @@ -25,7 +23,8 @@ x1="369.02579" y1="171.88429" x2="441.68719" - y2="262.58051"> + y2="262.58051" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + gradientTransform="matrix(0.62172068,0.16415896,-0.16415896,0.62172068,-107.0588,-17.823831)"> + y2="243.37801" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + y2="234.5722" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + y2="223.4929" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + y2="235.823" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + y2="227.27921" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + gradientTransform="matrix(0.64281121,0.01459619,-0.01459619,0.64281121,126.51817,81.957227)"> + gradientTransform="matrix(0.64281121,0.01459619,-0.01459619,0.64281121,126.51817,81.957227)"> + y2="252.7919" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + y2="239.4308" + gradientTransform="matrix(0.64300411,0,0,0.64300411,149.92441,87.050271)"> + inkscape:window-width="1464" + inkscape:window-height="933" + inkscape:window-x="72" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -269,7 +276,7 @@ image/svg+xml - + @@ -279,10 +286,12 @@ id="layer1" transform="translate(0,-552.36215)"> + transform="matrix(3.4274439,0,0,3.4274439,-1186.3608,-14.740476)" + id="g41" + style="stroke-width:0.643003"> + id="g43" + style="stroke-width:0.643003"> + id="g56" + style="stroke-width:0.643003"> + id="g58" + style="stroke-width:0.643003"> + id="g67" + style="stroke-width:0.643003"> + id="g69" + style="stroke-width:0.643003"> + id="g84" + style="stroke-width:0.643003"> + id="g93" + style="stroke-width:0.643003"> + id="g102" + style="stroke-width:0.643003"> @@ -468,7 +484,7 @@ id="stop3611" /> @@ -491,7 +507,7 @@ id="stop3618" /> @@ -525,12 +541,13 @@ id="stop3631" /> + id="g138" + style="stroke-width:0.643003"> + id="g149" + style="stroke-width:0.643003">