diff --git a/config/icon-lock-harbour-tooter.png b/config/icon-lock-harbour-tooter-beta.png similarity index 100% rename from config/icon-lock-harbour-tooter.png rename to config/icon-lock-harbour-tooter-beta.png diff --git a/config/x-harbour.tooter.activity.conf b/config/x-harbour.tooter.activity.conf index a4c6442..440b387 100644 --- a/config/x-harbour.tooter.activity.conf +++ b/config/x-harbour.tooter.activity.conf @@ -1,5 +1,5 @@ -appIcon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter.png -x-nemo-icon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter.png +appIcon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png +x-nemo-icon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png x-nemo-priority=120 x-nemo-feedback=sms_exists x-nemo-led-disabled-without-body-and-summary=false diff --git a/harbour-tooter-beta.desktop b/harbour-tooter-beta.desktop index 02ed710..ef6c948 100644 --- a/harbour-tooter-beta.desktop +++ b/harbour-tooter-beta.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application X-Nemo-Application-Type=silica-qt5 -Icon=harbour-tooter -Exec=harbour-tooter -Name=Tooter Beta +Icon=harbour-tooter-beta +Exec=harbour-tooter-beta +Name=Tooter β # translation example: # your app name in German locale (de) # diff --git a/harbour-tooter-beta.pro b/harbour-tooter-beta.pro index 600bd1f..d6d0268 100644 --- a/harbour-tooter-beta.pro +++ b/harbour-tooter-beta.pro @@ -1,116 +1,117 @@ -# NOTICE: -# -# Application name defined in TARGET has a corresponding QML filename. -# If name defined in TARGET is changed, the following needs to be done -# to match new name: -# - corresponding QML filename must be changed -# - desktop icon filename must be changed -# - desktop filename must be changed -# - icon definition filename in desktop file must be changed -# - translation filenames have to be changed - -# The name of your application -TARGET = harbour-tooter-beta - -CONFIG += sailfishapp - -QT += network dbus sql -CONFIG += link_pkgconfig -PKGCONFIG += sailfishapp -PKGCONFIG += \ - nemonotifications-qt5 - -DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" -DEFINES += "APPNAME=\\\"$${TARGET}\\\"" - -!exists( src/dbusAdaptor.h ) { - system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) -} - -config.path = /usr/share/$${TARGET}/config/ -config.files = config/icon-lock-harbour-tooter.png - -notification_categories.path = /usr/share/lipstick/notificationcategories -notification_categories.files = config/x-harbour.tooter.activity.* - -dbus_services.path = /usr/share/dbus-1/services/ -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 - -HEADERS += src/imageuploader.h -HEADERS += src/filedownloader.h -HEADERS += src/notifications.h -HEADERS += src/dbusAdaptor.h -HEADERS += src/dbus.h - -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 \ - 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/verified.svg \ - qml/images/boosted.svg \ - qml/images/tooter.svg \ - qml/images/emojiselect.svg \ - qml/images/icon-m-profile.svg \ - qml/images/icon-l-profile.svg \ - qml/lib/Mastodon.js \ - qml/lib/Worker.js \ - config/icon-lock-harbour-tooter.png \ - config/x-harbour.tooter.activity.conf \ - rpm/harbour-tooter-beta.changes \ - rpm/harbour-tooter-beta.changes.run.in \ - rpm/harbour-tooter-beta.spec \ - rpm/harbour-tooter-beta.yaml \ - translations/*.ts \ - harbour-tooter-beta.desktop - -SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 - -# to disable building translations every time, comment out the -# following CONFIG line -CONFIG += sailfishapp_i18n - -# German translation is enabled as an example. If you aren't -# planning to localize your app, remember to comment out the -# following TRANSLATIONS line. And also do not forget to -# modify the localized app name in the the .desktop file. -TRANSLATIONS += translations/harbour-tooter-de.ts -TRANSLATIONS += translations/harbour-tooter-el.ts -TRANSLATIONS += translations/harbour-tooter-es.ts -TRANSLATIONS += translations/harbour-tooter-fi.ts -TRANSLATIONS += translations/harbour-tooter-fr.ts -TRANSLATIONS += translations/harbour-tooter-nl.ts -TRANSLATIONS += translations/harbour-tooter-nl_BE.ts -TRANSLATIONS += translations/harbour-tooter-oc.ts -TRANSLATIONS += translations/harbour-tooter-pl.ts -TRANSLATIONS += translations/harbour-tooter-ru.ts -TRANSLATIONS += translations/harbour-tooter-sr.ts -TRANSLATIONS += translations/harbour-tooter-sv.ts -TRANSLATIONS += translations/harbour-tooter-zh_CN.ts -TRANSLATIONS += translations/harbour-tooter-it.ts +# NOTICE: +# +# Application name defined in TARGET has a corresponding QML filename. +# If name defined in TARGET is changed, the following needs to be done +# to match new name: +# - corresponding QML filename must be changed +# - desktop icon filename must be changed +# - desktop filename must be changed +# - icon definition filename in desktop file must be changed +# - translation filenames have to be changed + +# The name of your application +TARGET = harbour-tooter-beta + +CONFIG += sailfishapp + +QT += network dbus sql +CONFIG += link_pkgconfig +PKGCONFIG += sailfishapp +PKGCONFIG += \ + nemonotifications-qt5 + +DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" +DEFINES += "APPNAME=\\\"$${TARGET}\\\"" + +!exists( src/dbusAdaptor.h ) { + system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) +} + +config.path = /usr/share/$${TARGET}/config/ +config.files = config/icon-lock-harbour-tooter.png + +notification_categories.path = /usr/share/lipstick/notificationcategories +notification_categories.files = config/x-harbour.tooter.activity.* + +dbus_services.path = /usr/share/dbus-1/services/ +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-beta.cpp +SOURCES += src/imageuploader.cpp +SOURCES += src/filedownloader.cpp +SOURCES += src/notifications.cpp +SOURCES += src/dbusAdaptor.cpp +SOURCES += src/dbus.cpp + +HEADERS += src/imageuploader.h +HEADERS += src/filedownloader.h +HEADERS += src/notifications.h +HEADERS += src/dbusAdaptor.h +HEADERS += src/dbus.h + +DISTFILES += qml/harbour-tooter-beta.qml \ + config/icon-lock-harbour-tooter-beta.png \ + qml/pages/components/VisualContainer.qml \ + qml/pages/components/MiniStatus.qml \ + qml/pages/components/MiniHeader.qml \ + qml/pages/components/ItemUser.qml \ + 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/verified.svg \ + qml/images/boosted.svg \ + qml/images/tooter.svg \ + qml/images/emojiselect.svg \ + qml/images/icon-m-profile.svg \ + qml/images/icon-l-profile.svg \ + qml/lib/Mastodon.js \ + qml/lib/Worker.js \ + config/x-harbour.tooter.activity.conf \ + rpm/harbour-tooter-beta.changes \ + rpm/harbour-tooter-beta.changes.run.in \ + rpm/harbour-tooter-beta.spec \ + rpm/harbour-tooter-beta.yaml \ + translations/*.ts \ + harbour-tooter-beta.desktop + +SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 + +# to disable building translations every time, comment out the +# following CONFIG line +CONFIG += sailfishapp_i18n + +# German translation is enabled as an example. If you aren't +# planning to localize your app, remember to comment out the +# following TRANSLATIONS line. And also do not forget to +# modify the localized app name in the the .desktop file. +TRANSLATIONS += translations/harbour-tooter-beta-de.ts +TRANSLATIONS += translations/harbour-tooter-beta-el.ts +TRANSLATIONS += translations/harbour-tooter-beta-es.ts +TRANSLATIONS += translations/harbour-tooter-beta-fi.ts +TRANSLATIONS += translations/harbour-tooter-beta-fr.ts +TRANSLATIONS += translations/harbour-tooter-beta-nl.ts +TRANSLATIONS += translations/harbour-tooter-beta-nl_BE.ts +TRANSLATIONS += translations/harbour-tooter-beta-oc.ts +TRANSLATIONS += translations/harbour-tooter-beta-pl.ts +TRANSLATIONS += translations/harbour-tooter-beta-ru.ts +TRANSLATIONS += translations/harbour-tooter-beta-sr.ts +TRANSLATIONS += translations/harbour-tooter-beta-sv.ts +TRANSLATIONS += translations/harbour-tooter-beta-zh_CN.ts +TRANSLATIONS += translations/harbour-tooter-beta-it.ts diff --git a/icons/108x108/harbour-tooter-beta.png b/icons/108x108/harbour-tooter-beta.png new file mode 100644 index 0000000..d802c0b Binary files /dev/null and b/icons/108x108/harbour-tooter-beta.png differ diff --git a/icons/108x108/harbour-tooter.png b/icons/108x108/harbour-tooter.png deleted file mode 100644 index c500c5e..0000000 Binary files a/icons/108x108/harbour-tooter.png and /dev/null differ diff --git a/icons/128x128/harbour-tooter-beta.png b/icons/128x128/harbour-tooter-beta.png new file mode 100644 index 0000000..53b9458 Binary files /dev/null and b/icons/128x128/harbour-tooter-beta.png differ diff --git a/icons/128x128/harbour-tooter.png b/icons/128x128/harbour-tooter.png deleted file mode 100644 index bb7751d..0000000 Binary files a/icons/128x128/harbour-tooter.png and /dev/null differ diff --git a/icons/172x172/harbour-tooter-beta.png b/icons/172x172/harbour-tooter-beta.png new file mode 100644 index 0000000..864b961 Binary files /dev/null and b/icons/172x172/harbour-tooter-beta.png differ diff --git a/icons/172x172/harbour-tooter.png b/icons/172x172/harbour-tooter.png deleted file mode 100644 index bf5fa10..0000000 Binary files a/icons/172x172/harbour-tooter.png and /dev/null differ diff --git a/icons/256x256/harbour-tooter-beta.png b/icons/256x256/harbour-tooter-beta.png new file mode 100644 index 0000000..57e0647 Binary files /dev/null and b/icons/256x256/harbour-tooter-beta.png differ diff --git a/icons/256x256/harbour-tooter.png b/icons/256x256/harbour-tooter.png deleted file mode 100644 index 765dd66..0000000 Binary files a/icons/256x256/harbour-tooter.png and /dev/null differ diff --git a/icons/86x86/harbour-tooter-beta.png b/icons/86x86/harbour-tooter-beta.png new file mode 100644 index 0000000..6a726e4 Binary files /dev/null and b/icons/86x86/harbour-tooter-beta.png differ diff --git a/icons/86x86/harbour-tooter.png b/icons/86x86/harbour-tooter.png deleted file mode 100644 index 0ad7dfd..0000000 Binary files a/icons/86x86/harbour-tooter.png and /dev/null differ diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index 770124c..d109df9 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -95,7 +95,7 @@ CoverBackground { rightMargin: Theme.paddingLarge verticalCenter: iconNot.verticalCenter } - text: "Tooter" + text: "Tooter β" color: Theme.primaryColor } diff --git a/qml/lib/API.js b/qml/lib/API.js index 3dce882..c12523e 100644 --- a/qml/lib/API.js +++ b/qml/lib/API.js @@ -1,7 +1,7 @@ .pragma library .import QtQuick.LocalStorage 2.0 as LS -var db = LS.LocalStorage.openDatabaseSync("tooter", "", "harbour-tooter", 100000); +var db = LS.LocalStorage.openDatabaseSync("tooter", "", "harbour-tooter-beta", 100000); var conf = {}; var mediator = (function(){ var subscribe = function(channel, fn){ diff --git a/rpm/harbour-tooter-beta.spec b/rpm/harbour-tooter-beta.spec index 4c576ba..a4c1571 100644 --- a/rpm/harbour-tooter-beta.spec +++ b/rpm/harbour-tooter-beta.spec @@ -3,7 +3,7 @@ # Generated by: spectacle version 0.27 # -Name: harbour-tooter +Name: harbour-tooter-beta # >> macros # << macros @@ -14,12 +14,12 @@ Name: harbour-tooter %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter Version: 1.0.4 -Release: 1 +Release: 2 Group: Qt/Qt License: LICENSE URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-tooter.yaml +Source100: harbour-tooter-beta.yaml Requires: sailfishsilica-qt5 >= 0.10.9 BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) diff --git a/rpm/harbour-tooter-beta.yaml b/rpm/harbour-tooter-beta.yaml index ba2791a..d6f1b12 100644 --- a/rpm/harbour-tooter-beta.yaml +++ b/rpm/harbour-tooter-beta.yaml @@ -1,7 +1,7 @@ Name: harbour-tooter-beta Summary: Tooter Version: 1.0.4 -Release: 1 +Release: 2 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Qt/Qt diff --git a/src/harbour-tooter.cpp b/src/harbour-tooter-beta.cpp similarity index 94% rename from src/harbour-tooter.cpp rename to src/harbour-tooter-beta.cpp index 6ebfd40..77605e9 100644 --- a/src/harbour-tooter.cpp +++ b/src/harbour-tooter-beta.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) Dbus *dbus = new Dbus(); view->rootContext()->setContextProperty("Dbus", dbus); - view->setSource(SailfishApp::pathTo("qml/harbour-tooter.qml")); + view->setSource(SailfishApp::pathTo("qml/harbour-tooter-beta.qml")); view->show(); return app->exec(); } diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-beta-de.ts similarity index 100% rename from translations/harbour-tooter-de.ts rename to translations/harbour-tooter-beta-de.ts diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-beta-el.ts similarity index 100% rename from translations/harbour-tooter-el.ts rename to translations/harbour-tooter-beta-el.ts diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-beta-es.ts similarity index 100% rename from translations/harbour-tooter-es.ts rename to translations/harbour-tooter-beta-es.ts diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-beta-fi.ts similarity index 100% rename from translations/harbour-tooter-fi.ts rename to translations/harbour-tooter-beta-fi.ts diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-beta-fr.ts similarity index 100% rename from translations/harbour-tooter-fr.ts rename to translations/harbour-tooter-beta-fr.ts diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-beta-it.ts similarity index 100% rename from translations/harbour-tooter-it.ts rename to translations/harbour-tooter-beta-it.ts diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-beta-nl.ts similarity index 100% rename from translations/harbour-tooter-nl.ts rename to translations/harbour-tooter-beta-nl.ts diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-beta-nl_BE.ts similarity index 100% rename from translations/harbour-tooter-nl_BE.ts rename to translations/harbour-tooter-beta-nl_BE.ts diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-beta-oc.ts similarity index 100% rename from translations/harbour-tooter-oc.ts rename to translations/harbour-tooter-beta-oc.ts diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-beta-pl.ts similarity index 100% rename from translations/harbour-tooter-pl.ts rename to translations/harbour-tooter-beta-pl.ts diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-beta-ru.ts similarity index 100% rename from translations/harbour-tooter-ru.ts rename to translations/harbour-tooter-beta-ru.ts diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-beta-sr.ts similarity index 100% rename from translations/harbour-tooter-sr.ts rename to translations/harbour-tooter-beta-sr.ts diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-beta-sv.ts similarity index 100% rename from translations/harbour-tooter-sv.ts rename to translations/harbour-tooter-beta-sv.ts diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-beta-zh_CN.ts similarity index 100% rename from translations/harbour-tooter-zh_CN.ts rename to translations/harbour-tooter-beta-zh_CN.ts diff --git a/translations/harbour-tooter-beta.ts b/translations/harbour-tooter-beta.ts new file mode 100644 index 0000000..33843dc --- /dev/null +++ b/translations/harbour-tooter-beta.ts @@ -0,0 +1,411 @@ + + + + + API + + + favourited + + + + + followed you + + + + + boosted + + + + + + said + + + + + Conversation + + + Conversation + + + + + Write your warning here + + + + + What's on your mind? + + + + + Delete + + + + + Public + + + + + Unlisted + + + + + Followers-only + + + + + Direct + + + + + Emojis + + + + + Tap to insert + + + + + ImageFullScreen + + + Error loading + + + + + ImageUploader + + + The file %1 does not exists + + + + + LoginPage + + + Login + + + + + Instance + + + + + Enter a valid Mastodon instance URL + + + + + Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly. + + + + + Reload + + + + + MainPage + + + Home + + + + + Notifications + + + + + Local + + + + + Federated + + + + + Search + + + + + @user or #term + + + + + New Toot + + + + + MiniStatus + + + boosted + + + + + favourited + + + + + followed you + + + + + MyList + + + Loading + + + + + please wait... + + + + + Settings + + + + + Load more + + + + + Profile + + + Summary + + + + + Followers + + + + + Following + + + + + Statuses + + + + + Favourites + + + + + Unfollow + + + + + Follow request sent! + + + + + Follow + + + + + Unmute + + + + + Mute + + + + + Unblock + + + + + Block + + + + + Bio + + + + + Open Profile in Browser + + + + + Settings + + + Settings + + + + + Remove Account + + + + + Add Account + + + + + Deauthorize this app and remove your account + + + + + Authorize this app to access your Mastodon account + + + + + Load images in toots + + + + + Disable this option if you want to preserve your data connection + + + + + Translate + + + + + Use Transifex to help with app translation to your language + + + + + Credits + + + + + UI/UX design and development + + + + + Visual identity + + + + + Development and translations + + + + + Occitan & French translation + + + + + Chinese translation + + + + + Dutch translation + + + + + Spanish translation + + + + + Added README file + + + + + Toot + + + boosted + + + + + favourited + + + + + followed you + + + + + VisualContainer + + + Unboost + + + + + Boost + + + + + Unfavorite + + + + + Favorite + + + +