Localisation issue fix
This commit is contained in:
Dusko Angirevic
parent
90ab1cd922
commit
28fad27ea5
9 changed files with 77 additions and 85 deletions
18
.gitignore
vendored
18
.gitignore
vendored
|
|
@ -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
|
||||
|
|
@ -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).
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
BIN
icons/172x172/harbour-tooter.png
Normal file
BIN
icons/172x172/harbour-tooter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
|
|
@ -1,3 +1,7 @@
|
|||
* Thu Oct 25 2018 Dusko Angirevic <dysko@me.com> 0.2.8-0
|
||||
- Fixed localisation issue
|
||||
- Added character counter
|
||||
|
||||
* Tue Oct 23 2018 Dusko Angirevic <dysko@me.com> 0.2.7-0
|
||||
- Added emoji custom support
|
||||
- Bugfix: missing media on boosted toots
|
||||
|
|
|
|||
25
rpm/harbour-tooter.changes.run.in
Normal file
25
rpm/harbour-tooter.changes.run.in
Normal file
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
#include <QCoreApplication>
|
||||
#include <QtNetwork>
|
||||
//#include <QtSystemInfo/QDeviceInfo>
|
||||
#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<ImageUploader>("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();
|
||||
|
|
|
|||
Loading…
Reference in a new issue