fix using wrong translation function and bump version.

This commit is contained in:
2019-11-15 12:40:59 -05:00
parent 0ec59fc409
commit bdebc0833e
5 changed files with 18 additions and 13 deletions

View File

@@ -15,13 +15,18 @@
</description> </description>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.1/packaging/main_window.png</image> <image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.2/packaging/main_window.png</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.1/packaging/mobile_window.png</image> <image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.2/packaging/mobile_window.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<releases> <releases>
<release version="1.1.2" date="2019-11-15" type="stable">
<description>
<p>Fixed code causing text to sometimes not appear.</p>
</description>
</release>
<release version="1.1.1" date="2019-11-14" type="stable"> <release version="1.1.1" date="2019-11-14" type="stable">
<description> <description>
<p>Cleaned up graph markings and temperature rounding.</p> <p>Cleaned up graph markings and temperature rounding.</p>

View File

@@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=QiFlora Name=QiFlora
Comment=Monitor plants with Mi Flora sensors. Comment=Monitor plants with Mi Flora sensors.
Version=1.1.1 Version=1.1.2
Exec=qiflora Exec=qiflora
MimeType=application/x-qiflora; MimeType=application/x-qiflora;
Icon=org.eyecreate.qiflora Icon=org.eyecreate.qiflora

View File

@@ -90,7 +90,7 @@
{ {
"type": "git", "type": "git",
"url": "https://git.eyecreate.org/eyecreate/qiflora.git", "url": "https://git.eyecreate.org/eyecreate/qiflora.git",
"tag": "v1.1.1", "tag": "v1.1.2",
"commit": "16db502a0460139dcff6a63df90c218e3e4c1d66" "commit": "16db502a0460139dcff6a63df90c218e3e4c1d66"
} }
] ]

View File

@@ -3,7 +3,7 @@ import org.kde.kirigami 2.6 as Kirigami
import QtQuick.Controls 2.0 as Controls import QtQuick.Controls 2.0 as Controls
import QtQuick.Layouts 1.12 as Layouts import QtQuick.Layouts 1.12 as Layouts
import QtCharts 2.3 as Charts import QtCharts 2.3 as Charts
import org.eyecreate.qiflora 1.0 import org.eyecreate.qiflora 1.1
Kirigami.ApplicationWindow { Kirigami.ApplicationWindow {
id: root id: root
@@ -25,7 +25,7 @@ Kirigami.ApplicationWindow {
id: mainPage id: mainPage
mainAction: Kirigami.Action { mainAction: Kirigami.Action {
iconName: "view-refresh" iconName: "view-refresh"
text: i18n("Query Device") text: qsTr("Query Device")
onTriggered: { onTriggered: {
deviceSelect.open(); deviceSelect.open();
} }
@@ -33,7 +33,7 @@ Kirigami.ApplicationWindow {
contextualActions: [ contextualActions: [
Kirigami.Action { Kirigami.Action {
iconName: "help-about" iconName: "help-about"
text: i18n("About") text: qsTr("About")
onTriggered: { onTriggered: {
pageStack.replace(aboutPageComponent); pageStack.replace(aboutPageComponent);
} }
@@ -113,7 +113,7 @@ Kirigami.ApplicationWindow {
delegate: Kirigami.Card { delegate: Kirigami.Card {
id: card id: card
banner { banner {
title: i18n(model.title) title: qsTr(model.title)
titleIcon: model.icon titleIcon: model.icon
titleLevel: 2 titleLevel: 2
} }
@@ -125,7 +125,7 @@ Kirigami.ApplicationWindow {
Kirigami.Heading { Kirigami.Heading {
Layouts.Layout.alignment: Qt.AlignCenter Layouts.Layout.alignment: Qt.AlignCenter
level: 4 level: 4
text: i18n("Last Measured") text: qsTr("Last Measured")
} }
Kirigami.Heading { Kirigami.Heading {
Layouts.Layout.alignment: Qt.AlignCenter Layouts.Layout.alignment: Qt.AlignCenter
@@ -207,7 +207,7 @@ Kirigami.ApplicationWindow {
color: "transparent" color: "transparent"
} }
Kirigami.Heading { Kirigami.Heading {
text: i18n("Select Device to Query") text: qsTr("Select Device to Query")
} }
Rectangle { Rectangle {
height: 10 height: 10
@@ -250,7 +250,7 @@ Kirigami.ApplicationWindow {
id: aboutPage id: aboutPage
actions.main: Kirigami.Action { actions.main: Kirigami.Action {
iconName: "window-close" iconName: "window-close"
text: "Close" text: qsTr("Close")
onTriggered: { onTriggered: {
pageStack.clear(); pageStack.clear();
pageStack.push(mainPageComponent); pageStack.push(mainPageComponent);

View File

@@ -12,7 +12,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv); QApplication app(argc, argv);
KAboutData aboutData("org.eyecreate.qiflora", "QiFlora", "1.1", "Mobile friendly application to monitor Mi Flora devices.",KAboutLicense::GPL_V3);//TODO:i18n KAboutData aboutData("org.eyecreate.qiflora", "QiFlora", "1.1.2", "Mobile friendly application to monitor Mi Flora devices.",KAboutLicense::GPL_V3);//TODO:i18n
aboutData.setProductName("qiflora"); aboutData.setProductName("qiflora");
aboutData.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org"); aboutData.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org");
aboutData.setDesktopFileName("org.eyecreate.qiflora"); aboutData.setDesktopFileName("org.eyecreate.qiflora");
@@ -26,7 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
qmlRegisterType<BluetoothDevices>(); qmlRegisterType<BluetoothDevices>();
qmlRegisterType<MiFlora>("org.eyecreate.qiflora",1,0,"QiFlora"); qmlRegisterType<MiFlora>("org.eyecreate.qiflora",1,1,"QiFlora");
engine.rootContext()->setContextProperty(QStringLiteral("appAboutData"), QVariant::fromValue(aboutData)); engine.rootContext()->setContextProperty(QStringLiteral("appAboutData"), QVariant::fromValue(aboutData));
engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); engine.load(QUrl(QStringLiteral("qrc:///main.qml")));