From 28fad27ea571e2935f46e13b78513e26af805436 Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Thu, 25 Oct 2018 15:08:30 +0200 Subject: [PATCH] Localisation issue fix --- .gitignore | 18 -------- harbour-tooter.desktop | 1 - harbour-tooter.pro | 72 +++++++++++++----------------- icons/172x172/harbour-tooter.png | Bin 0 -> 13966 bytes rpm/harbour-tooter.changes | 4 ++ rpm/harbour-tooter.changes.run.in | 25 +++++++++++ rpm/harbour-tooter.spec | 3 +- rpm/harbour-tooter.yaml | 18 +++----- src/harbour-tooter.cpp | 21 ++++----- 9 files changed, 77 insertions(+), 85 deletions(-) delete mode 100644 .gitignore create mode 100644 icons/172x172/harbour-tooter.png create mode 100644 rpm/harbour-tooter.changes.run.in diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2b6ecca..0000000 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ - -*.user -harbour-tooter.pro.user -harbour-tooter.pro.user - -harbour-tooter.pro.user.2549760 -harbour-tooter.pro.user -*.user -harbour-tooter.pro.user -translations/harbour-tooter-de.ts -translations/harbour-tooter-el.ts -translations/harbour-tooter-es.ts -translations/harbour-tooter-fr.ts -translations/harbour-tooter-nl.ts -translations/harbour-tooter-oc.ts -translations/harbour-tooter-ru.ts -translations/harbour-tooter-sr.ts -translations/harbour-tooter-sv.ts diff --git a/harbour-tooter.desktop b/harbour-tooter.desktop index 1ebb61c..0488e61 100644 --- a/harbour-tooter.desktop +++ b/harbour-tooter.desktop @@ -9,4 +9,3 @@ Name=Tooter # # Remember to comment out the following line, if you do not want to use # a different app name in German locale (de). - diff --git a/harbour-tooter.pro b/harbour-tooter.pro index b92557c..e0d36be 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -11,11 +11,10 @@ # The name of your application TARGET = harbour-tooter + CONFIG += sailfishapp QT += network dbus sql - -#CONFIG += sailfishapp_qml CONFIG += link_pkgconfig PKGCONFIG += sailfishapp PKGCONFIG += nemonotifications-qt5 @@ -39,39 +38,38 @@ dbus_services.files = config/ba.dysko.harbour.tooter.service interfaces.path = /usr/share/dbus-1/interfaces/ interfaces.files = config/ba.dysko.harbour.tooter.xml +SOURCES += src/harbour-tooter.cpp +SOURCES += src/imageuploader.cpp +SOURCES += src/filedownloader.cpp +SOURCES += src/notifications.cpp +SOURCES += src/dbusAdaptor.cpp +SOURCES += src/dbus.cpp -SOURCES += src/harbour-tooter.cpp \ - src/filedownloader.cpp \ - src/imageuploader.cpp \ - src/notifications.cpp \ - src/dbusAdaptor.cpp \ - src/dbus.cpp +HEADERS += src/imageuploader.h +HEADERS += src/filedownloader.h +HEADERS += src/notifications.h +HEADERS += src/dbusAdaptor.h +HEADERS += src/dbus.h -OTHER_FILES += qml/harbour-tooter.qml \ - config/* \ - qml/cover/CoverPage.qml \ - qml/pages/MainPage.qml \ - qml/pages/LoginPage.qml \ - qml/pages/components/MyList.qml \ - qml/pages/components/Navigation.qml \ - qml/pages/Conversation.qml \ - qml/pages/components/Toot.qml \ - qml/pages/Browser.qml \ - qml/pages/Profile.qml \ - qml/pages/components/ProfileHeader.qml \ - rpm/harbour-tooter.spec \ - rpm/harbour-tooter.yaml \ - translations/*.ts \ +DISTFILES += qml/harbour-tooter.qml \ qml/pages/components/VisualContainer.qml \ qml/pages/components/MiniStatus.qml \ qml/pages/components/MiniHeader.qml \ qml/pages/components/ItemUser.qml \ - harbour-tooter.desktop - -SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256 - - -DISTFILES += \ + qml/pages/components/MyList.qml \ + qml/pages/components/Navigation.qml \ + qml/pages/components/ProfileHeader.qml \ + qml/pages/components/MediaBlock.qml \ + qml/pages/components/MyImage.qml \ + qml/pages/components/ImageFullScreen.qml \ + qml/cover/CoverPage.qml \ + qml/pages/MainPage.qml \ + qml/pages/LoginPage.qml \ + qml/pages/Conversation.qml \ + qml/pages/components/Toot.qml \ + qml/pages/Browser.qml \ + qml/pages/Profile.qml \ + qml/pages/Settings.qml \ qml/lib/API.js \ qml/images/notification.svg \ qml/images/home.svg \ @@ -84,28 +82,20 @@ DISTFILES += \ qml/lib/Mastodon.js \ qml/lib/Worker.js \ qml/images/boosted.svg \ - qml/pages/Settings.qml \ - qml/pages/components/MediaBlock.qml \ - qml/pages/components/MyImage.qml \ - qml/pages/components/ImageFullScreen.qml \ config/icon-lock-harbour-tooter.png \ config/x-harbour.tooter.activity.conf \ rpm/harbour-tooter.changes \ + rpm/harbour-tooter.changes.run.in \ rpm/harbour-tooter.spec \ rpm/harbour-tooter.yaml \ - translations/*.ts + translations/*.ts \ + harbour-tooter.desktop +SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 -HEADERS += \ - src/imageuploader.h \ - src/filedownloader.h \ - src/notifications.h \ - src/dbusAdaptor.h \ - src/dbus.h # to disable building translations every time, comment out the # following CONFIG line CONFIG += sailfishapp_i18n -CONFIG += sailfishapp_i18n_idbased # German translation is enabled as an example. If you aren't # planning to localize your app, remember to comment out the diff --git a/icons/172x172/harbour-tooter.png b/icons/172x172/harbour-tooter.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5fa10411a2d87fa4c1a568be0155cdbc112006 GIT binary patch literal 13966 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 literal 0 HcmV?d00001 diff --git a/rpm/harbour-tooter.changes b/rpm/harbour-tooter.changes index a5a4eee..ffc7f23 100644 --- a/rpm/harbour-tooter.changes +++ b/rpm/harbour-tooter.changes @@ -1,3 +1,7 @@ +* Thu Oct 25 2018 Dusko Angirevic 0.2.8-0 +- Fixed localisation issue +- Added character counter + * Tue Oct 23 2018 Dusko Angirevic 0.2.7-0 - Added emoji custom support - Bugfix: missing media on boosted toots diff --git a/rpm/harbour-tooter.changes.run.in b/rpm/harbour-tooter.changes.run.in new file mode 100644 index 0000000..c6fa648 --- /dev/null +++ b/rpm/harbour-tooter.changes.run.in @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Rename this file as harbour-tooter.changes.run to let mb2 automatically +# generate changelog from well formatted Git commit messages and tag +# annotations. + +git-change-log + +# Here are some basic examples how to change from the default behavior. Run +# git-change-log --help inside the Sailfish OS SDK chroot or build engine to +# learn all the options git-change-log accepts. + +# Use a subset of tags +#git-change-log --tags refs/tags/my-prefix/* + +# Group entries by minor revision, suppress headlines for patch-level revisions +#git-change-log --dense '/[0-9]\+\.[0-9\+$' + +# Trim very old changes +#git-change-log --since 2014-04-01 +#echo '[ Some changelog entries trimmed for brevity ]' + +# Use the subjects (first lines) of tag annotations when no entry would be +# included for a revision otherwise +#git-change-log --auto-add-annotations diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index 4785ccc..559fd15 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,7 +13,7 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -Version: 0.2.7 +Version: 0.2.8 Release: 0 Group: Qt/Qt License: LICENSE @@ -25,7 +25,6 @@ BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(nemonotifications-qt5) BuildRequires: desktop-file-utils %description diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 9442878..2def057 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,9 +1,9 @@ Name: harbour-tooter Summary: Tooter -Version: 0.2.7 +Version: 0.2.8 Release: 0 # 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 +# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Qt/Qt URL: http://example.org/ License: LICENSE @@ -25,7 +25,6 @@ PkgConfigBR: - Qt5Core - Qt5Qml - Qt5Quick - - nemonotifications-qt5 # Build dependencies without a pkgconfig setup can be listed here # PkgBR: @@ -33,17 +32,14 @@ PkgConfigBR: # Runtime dependencies which are not automatically detected Requires: - - sailfishsilica-qt5 >= 0.10.9 -# - libsailfishapp-launcher - + - sailfishsilica-qt5 >= 0.10.9 # All installed files Files: - - '%{_bindir}' - - '%{_datadir}/%{name}' - - '%{_datadir}/applications/%{name}.desktop' - - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' - + - '%{_bindir}' + - '%{_datadir}/%{name}' + - '%{_datadir}/applications/%{name}.desktop' + - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' # For more information about yaml and what's supported in Sailfish OS # build system, please see https://wiki.merproject.org/wiki/Spectacle diff --git a/src/harbour-tooter.cpp b/src/harbour-tooter.cpp index 4b7a9b6..158624e 100644 --- a/src/harbour-tooter.cpp +++ b/src/harbour-tooter.cpp @@ -13,10 +13,10 @@ #include #include //#include -#include "filedownloader.h" +//#include "filedownloader.h" #include "imageuploader.h" -#include "notifications.h" -#include "dbus.h" +//#include "notifications.h" +//#include "dbus.h" int main(int argc, char *argv[]) { @@ -25,19 +25,16 @@ int main(int argc, char *argv[]) //QQmlContext *context = view.data()->rootContext(); QQmlEngine* engine = view->engine(); - FileDownloader *fd = new FileDownloader(engine); - view->rootContext()->setContextProperty("FileDownloader", fd); - + //FileDownloader *fd = new FileDownloader(engine); + //view->rootContext()->setContextProperty("FileDownloader", fd); qmlRegisterType("harbour.tooter.Uploader", 1, 0, "ImageUploader"); - Notifications *no = new Notifications(); - view->rootContext()->setContextProperty("Notifications", no); - - + //Notifications *no = new Notifications(); + //view->rootContext()->setContextProperty("Notifications", no); QObject::connect(engine, SIGNAL(quit()), app.data(), SLOT(quit())); - Dbus *dbus = new Dbus(); - view->rootContext()->setContextProperty("Dbus", dbus); + //Dbus *dbus = new Dbus(); + //view->rootContext()->setContextProperty("Dbus", dbus); view->setSource(SailfishApp::pathTo("qml/harbour-tooter.qml")); view->show();