diff --git a/nymea-app/images.qrc b/nymea-app/images.qrc index b7d4de6e..a79e0798 100644 --- a/nymea-app/images.qrc +++ b/nymea-app/images.qrc @@ -1,7 +1,5 @@ - ui/images/Built_with_Qt_RGB_logo_vertical.svg - ui/images/Built_with_Qt_RGB_logo.svg ui/images/nymea-logo.svg ui/images/nymea-box-setup.svg ui/images/rpi-setup.svg diff --git a/nymea-app/ui/components/Imprint.qml b/nymea-app/ui/components/Imprint.qml index b9713a44..cbd1ea76 100644 --- a/nymea-app/ui/components/Imprint.qml +++ b/nymea-app/ui/components/Imprint.qml @@ -95,7 +95,7 @@ Item { Layout.rightMargin: app.margins wrapMode: Text.WordWrap font.bold: true - text: "Copyright (C) %1 chargebyte GmbH".arg(new Date().getFullYear()) + text: "Copyright (C) %1 chargebyte austria GmbH".arg(new Date().getFullYear()) } Label { @@ -103,7 +103,7 @@ Item { Layout.leftMargin: app.margins Layout.rightMargin: app.margins wrapMode: Text.WordWrap - text: qsTr("nymea is a registered trademark of chargebyte GmbH.") + text: qsTr("nymea is a registered trademark of chargebyte austria GmbH.") } Label { @@ -112,7 +112,7 @@ Item { Layout.rightMargin: app.margins wrapMode: Text.WordWrap font.pixelSize: app.smallFont - text: Configuration.closedSource ? qsTr("Licensed under the terms of the nymea commercial license.") : qsTr("Licensed under the terms of the GNU General Public License, version 3. Please visit the GitHub page for source code and build instructions.") + text: qsTr("Licensed under the terms of the GNU General Public License, version 3. Please visit the GitHub page for source code and build instructions.") } ColumnLayout { @@ -206,40 +206,6 @@ Item { } } } - - ThinDivider { } - - RowLayout { - Layout.fillWidth: true - Layout.margins: app.margins - spacing: app.margins - - Image { - Layout.preferredHeight: Style.iconSize * 2 - Layout.preferredWidth: height - fillMode: Image.PreserveAspectFit - source: "qrc:/ui/images/Built_with_Qt_RGB_logo_vertical.svg" - sourceSize.width: Style.iconSize * 2 - sourceSize.height: Style.iconSize * 2 - } - - Label { - Layout.fillWidth: true - text: qsTr("Qt is a registered trademark of The Qt Company Ltd. and its subsidiaries.") - wrapMode: Text.WordWrap - } - } - NymeaSwipeDelegate { - Layout.fillWidth: true - iconName: "qrc:/icons/stock_website.svg" - text: qsTr("Visit the Qt website") - subText: "https://www.qt.io" - prominentSubText: false - wrapTexts: false - onClicked: { - Qt.openUrlExternally("https://www.qt.io") - } - } } diff --git a/nymea-app/ui/images/Built_with_Qt_RGB_logo.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo.svg deleted file mode 100644 index e4235027..00000000 --- a/nymea-app/ui/images/Built_with_Qt_RGB_logo.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg b/nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg deleted file mode 100644 index df5cf0a4..00000000 --- a/nymea-app/ui/images/Built_with_Qt_RGB_logo_vertical.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - -