From bdebc0833e0e0653cb0a9add195ff515e6fb0dee Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Fri, 15 Nov 2019 12:40:59 -0500
Subject: [PATCH] fix using wrong translation function and bump version.

---
 packaging/org.eyecreate.qiflora.appdata.xml |  9 +++++++--
 packaging/org.eyecreate.qiflora.desktop     |  2 +-
 packaging/org.eyecreate.qiflora.json        |  2 +-
 src/contents/ui/main.qml                    | 14 +++++++-------
 src/main.cpp                                |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packaging/org.eyecreate.qiflora.appdata.xml b/packaging/org.eyecreate.qiflora.appdata.xml
index 52c89e4..e7492c9 100644
--- a/packaging/org.eyecreate.qiflora.appdata.xml
+++ b/packaging/org.eyecreate.qiflora.appdata.xml
@@ -15,13 +15,18 @@
   </description>
   <screenshots>
       <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>
-          <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>
   </screenshots>
   <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">
           <description>
               <p>Cleaned up graph markings and temperature rounding.</p>
diff --git a/packaging/org.eyecreate.qiflora.desktop b/packaging/org.eyecreate.qiflora.desktop
index 517c45a..4823930 100755
--- a/packaging/org.eyecreate.qiflora.desktop
+++ b/packaging/org.eyecreate.qiflora.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=QiFlora
 Comment=Monitor plants with Mi Flora sensors.
-Version=1.1.1
+Version=1.1.2
 Exec=qiflora
 MimeType=application/x-qiflora;
 Icon=org.eyecreate.qiflora
diff --git a/packaging/org.eyecreate.qiflora.json b/packaging/org.eyecreate.qiflora.json
index 28496dc..7b27e57 100644
--- a/packaging/org.eyecreate.qiflora.json
+++ b/packaging/org.eyecreate.qiflora.json
@@ -90,7 +90,7 @@
         {
           "type": "git",
           "url": "https://git.eyecreate.org/eyecreate/qiflora.git",
-          "tag": "v1.1.1",
+          "tag": "v1.1.2",
           "commit": "16db502a0460139dcff6a63df90c218e3e4c1d66"
         }
       ]
diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
index 32ff4bd..1706804 100644
--- a/src/contents/ui/main.qml
+++ b/src/contents/ui/main.qml
@@ -3,7 +3,7 @@ import org.kde.kirigami 2.6 as Kirigami
 import QtQuick.Controls 2.0 as Controls
 import QtQuick.Layouts 1.12 as Layouts
 import QtCharts 2.3 as Charts
-import org.eyecreate.qiflora 1.0
+import org.eyecreate.qiflora 1.1
 
 Kirigami.ApplicationWindow {
     id: root
@@ -25,7 +25,7 @@ Kirigami.ApplicationWindow {
             id: mainPage
             mainAction: Kirigami.Action {
                     iconName: "view-refresh"
-                    text: i18n("Query Device")
+                    text: qsTr("Query Device")
                     onTriggered: {
                         deviceSelect.open();
                     }
@@ -33,7 +33,7 @@ Kirigami.ApplicationWindow {
             contextualActions: [
                 Kirigami.Action {
                     iconName: "help-about"
-                    text: i18n("About")
+                    text: qsTr("About")
                     onTriggered: {
                         pageStack.replace(aboutPageComponent);
                     }
@@ -113,7 +113,7 @@ Kirigami.ApplicationWindow {
                     delegate: Kirigami.Card {
                         id: card
                         banner {
-                            title: i18n(model.title)
+                            title: qsTr(model.title)
                             titleIcon: model.icon
                             titleLevel: 2
                         }
@@ -125,7 +125,7 @@ Kirigami.ApplicationWindow {
                                 Kirigami.Heading {
                                     Layouts.Layout.alignment: Qt.AlignCenter
                                     level: 4
-                                    text: i18n("Last Measured")
+                                    text: qsTr("Last Measured")
                                 }
                                 Kirigami.Heading {
                                     Layouts.Layout.alignment: Qt.AlignCenter
@@ -207,7 +207,7 @@ Kirigami.ApplicationWindow {
                                 color: "transparent"
                             }
                             Kirigami.Heading {
-                                text: i18n("Select Device to Query")
+                                text: qsTr("Select Device to Query")
                             }
                             Rectangle {
                                 height: 10
@@ -250,7 +250,7 @@ Kirigami.ApplicationWindow {
             id: aboutPage
             actions.main: Kirigami.Action {
                 iconName: "window-close"
-                text: "Close"
+                text: qsTr("Close")
                 onTriggered: {
                     pageStack.clear();
                     pageStack.push(mainPageComponent);
diff --git a/src/main.cpp b/src/main.cpp
index b1f57fa..5e06a49 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     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.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org");
     aboutData.setDesktopFileName("org.eyecreate.qiflora");
@@ -26,7 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
     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.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
-- 
GitLab