From 6c260b4e826b8229a0b91b3ef49a76b4b72fe9cd Mon Sep 17 00:00:00 2001 From: Muki Date: Sat, 23 Mar 2019 14:07:19 +0100 Subject: [PATCH] 2.9.0 release --- sailfish/harbour-kaktus.pro | 2 +- sailfish/qml/ChangelogPage.qml | 29 ++++++++++ sailfish/qml/TTRssSignInDialog.qml | 2 +- sailfish/rpm/harbour-kaktus.changes.in | 7 +++ sailfish/rpm/harbour-kaktus.spec | 73 ++++++++++++++++++++++++++ sailfish/rpm/harbour-kaktus.yaml | 4 +- sailfish/src/info.h | 2 +- sailfish/src/main.cpp | 5 +- 8 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 sailfish/rpm/harbour-kaktus.spec diff --git a/sailfish/harbour-kaktus.pro b/sailfish/harbour-kaktus.pro index 7dbab57..9620ea7 100644 --- a/sailfish/harbour-kaktus.pro +++ b/sailfish/harbour-kaktus.pro @@ -62,7 +62,7 @@ HEADERS += \ # libs include(qhttpserver/qhttpserver.pri) -SAILFISHAPP_ICONS = 86x86 108x108 128x128 150x150 256x256 +SAILFISHAPP_ICONS = 86x86 108x108 128x128 150x150 172x172 256x256 CONFIG += sailfishapp_i18n_include_obsolete TRANSLATIONS += \ diff --git a/sailfish/qml/ChangelogPage.qml b/sailfish/qml/ChangelogPage.qml index 9f430cc..57fe226 100644 --- a/sailfish/qml/ChangelogPage.qml +++ b/sailfish/qml/ChangelogPage.qml @@ -60,6 +60,35 @@ Page { title: qsTr("Changelog") } + SectionHeader { + text: qsTr("Version %1").arg("2.9.0 (beta)") + } + + LogItem { + title: "Tiny Tiny RSS" + description: "Tiny Tiny RSS is now supported as a new feeds " + + "aggregator. Tiny Tiny RSS is a free and " + + "open source web-based news feed (RSS/Atom) reader. " + + "To find more about it, please check the official " + + "web page."; + } + + LogItem { + title: "UI refresh" + description: "The app UI has been updated to match the newest " + + "Sailfish OS style. Many small elements of " + + "Tabs, Feeds and Aricles lists have been improved, " + + "together with images presentation and UI colors. " + + "Support for Light themes has been added as well." + } + + LogItem { + title: "Save images to gallery" + description: "If article item contains Image, it can be " + + "saved to the gallery. The option to do so is " + + "located in the item's context menu." + } + SectionHeader { text: qsTr("Version %1").arg("2.6.1") } diff --git a/sailfish/qml/TTRssSignInDialog.qml b/sailfish/qml/TTRssSignInDialog.qml index 3cdd167..f77bf2e 100644 --- a/sailfish/qml/TTRssSignInDialog.qml +++ b/sailfish/qml/TTRssSignInDialog.qml @@ -77,7 +77,7 @@ Dialog { Label { id: label anchors.verticalCenter: parent.verticalCenter - text: "Tiny Tiny Rss" + text: "Tiny Tiny RSS" color: Theme.highlightColor font.pixelSize: Theme.fontSizeSmall } diff --git a/sailfish/rpm/harbour-kaktus.changes.in b/sailfish/rpm/harbour-kaktus.changes.in index f5770d6..2496e60 100644 --- a/sailfish/rpm/harbour-kaktus.changes.in +++ b/sailfish/rpm/harbour-kaktus.changes.in @@ -8,6 +8,13 @@ # * date Author's Name version-release # - Summary of changes +* Sat Mar 23 2019 Michal Kosciesza 2.9.0-1 +- Tiny Tiny RSS +- Readability.js updated to latest git version +- UI refresh +- Support for Light themes +- Save Image to gallery option + * Sun Aug 27 2017 Michal Kosciesza 2.6.1-2 - UI minor fixes - Readability.js updated to latest git version diff --git a/sailfish/rpm/harbour-kaktus.spec b/sailfish/rpm/harbour-kaktus.spec new file mode 100644 index 0000000..df03400 --- /dev/null +++ b/sailfish/rpm/harbour-kaktus.spec @@ -0,0 +1,73 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# + +Name: harbour-kaktus + +# >> macros +# << macros + +%{!?qtc_qmake:%define qtc_qmake %qmake} +%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} +%{!?qtc_make:%define qtc_make make} +%{?qtc_builddir:%define _builddir %qtc_builddir} +Summary: Kaktus +Version: 2.9.0 +Release: 1 +Group: Qt/Qt +License: LICENSE +URL: https://github.com/mkiol/kaktus +Source0: %{name}-%{version}.tar.bz2 +Source100: harbour-kaktus.yaml +Requires: sailfishsilica-qt5 >= 0.10.9 +Requires: mlite-qt5 +BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(mlite5) +BuildRequires: desktop-file-utils + +%description +Multi services feed reader, specially designed to work offline. + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qtc_qmake5 + +%qtc_make %{?_smp_mflags} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake5_install + +# >> install post +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + +%files +%defattr(-,root,root,-) +%{_bindir} +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +# >> files +# << files diff --git a/sailfish/rpm/harbour-kaktus.yaml b/sailfish/rpm/harbour-kaktus.yaml index eb255f6..bcba251 100644 --- a/sailfish/rpm/harbour-kaktus.yaml +++ b/sailfish/rpm/harbour-kaktus.yaml @@ -1,7 +1,7 @@ Name: harbour-kaktus Summary: Kaktus -Version: 2.6.1 -Release: 2 +Version: 2.9.0 +Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Qt/Qt diff --git a/sailfish/src/info.h b/sailfish/src/info.h index 9b172a0..bd48a28 100644 --- a/sailfish/src/info.h +++ b/sailfish/src/info.h @@ -23,7 +23,7 @@ namespace Kaktus { static const char* APP_NAME = "Kaktus"; #ifdef SAILFISH -static const char* APP_VERSION = "2.6.1"; +static const char* APP_VERSION = "2.9.0 (beta)"; #elif ANDROID static const char* APP_VERSION = "2.6.1"; #endif diff --git a/sailfish/src/main.cpp b/sailfish/src/main.cpp index f6cd914..168121f 100644 --- a/sailfish/src/main.cpp +++ b/sailfish/src/main.cpp @@ -122,7 +122,10 @@ int main(int argc, char *argv[]) QTranslator translator; QString locale = settings->getLocale() == "" ? QLocale::system().name() : settings->getLocale(); if(!translator.load(locale, "kaktus", "_", translationsDirPath, ".qm")) { - qDebug() << "Couldn't load translation for locale " + locale + " from " + translationsDirPath; + qDebug() << "Cannot load translation:" << locale << translationsDirPath; + if (!translator.load("kaktus_en", translationsDirPath)) { + qDebug() << "Cannot load default translation"; + } } app->installTranslator(&translator);