diff --git a/config/ba.dysko.harbour.tooter.service b/config/ba.dysko.harbour.tooterb.service similarity index 100% rename from config/ba.dysko.harbour.tooter.service rename to config/ba.dysko.harbour.tooterb.service diff --git a/config/ba.dysko.harbour.tooter.xml b/config/ba.dysko.harbour.tooterb.xml similarity index 100% rename from config/ba.dysko.harbour.tooter.xml rename to config/ba.dysko.harbour.tooterb.xml diff --git a/config/icon-lock-harbour-tooter-beta.png b/config/icon-lock-harbour-tooterb.png similarity index 100% rename from config/icon-lock-harbour-tooter-beta.png rename to config/icon-lock-harbour-tooterb.png diff --git a/config/x-harbour.tooter.activity.conf b/config/x-harbour.tooterb.activity.conf similarity index 100% rename from config/x-harbour.tooter.activity.conf rename to config/x-harbour.tooterb.activity.conf diff --git a/harbour-tooter-beta.desktop b/harbour-tooterb.desktop similarity index 84% rename from harbour-tooter-beta.desktop rename to harbour-tooterb.desktop index ef6c948..74cc312 100644 --- a/harbour-tooter-beta.desktop +++ b/harbour-tooterb.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Nemo-Application-Type=silica-qt5 -Icon=harbour-tooter-beta -Exec=harbour-tooter-beta +Icon=harbour-tooterb +Exec=harbour-tooterb Name=Tooter β # translation example: # your app name in German locale (de) diff --git a/harbour-tooter-beta.pro b/harbour-tooterb.pro similarity index 63% rename from harbour-tooter-beta.pro rename to harbour-tooterb.pro index d6d0268..27b3bd3 100644 --- a/harbour-tooter-beta.pro +++ b/harbour-tooterb.pro @@ -10,7 +10,7 @@ # - translation filenames have to be changed # The name of your application -TARGET = harbour-tooter-beta +TARGET = harbour-tooterb CONFIG += sailfishapp @@ -24,23 +24,23 @@ DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" DEFINES += "APPNAME=\\\"$${TARGET}\\\"" !exists( src/dbusAdaptor.h ) { - system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) + system(qdbusxml2cpp config/ba.dysko.harbour.tooterb.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.* +notification_categories.files = config/x-harbour.tooterb.activity.* dbus_services.path = /usr/share/dbus-1/services/ -dbus_services.files = config/ba.dysko.harbour.tooter.service +dbus_services.files = config/ba.dysko.harbour.tooterb.service interfaces.path = /usr/share/dbus-1/interfaces/ -interfaces.files = config/ba.dysko.harbour.tooter.xml +interfaces.files = config/ba.dysko.harbour.tooterb.xml SOURCES += \ - src/harbour-tooter-beta.cpp + src/harbour-tooterb.cpp SOURCES += src/imageuploader.cpp SOURCES += src/filedownloader.cpp SOURCES += src/notifications.cpp @@ -53,8 +53,8 @@ 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 \ +DISTFILES += qml/harbour-tooterb.qml \ + config/icon-lock-harbour-tooterb.png \ qml/pages/components/VisualContainer.qml \ qml/pages/components/MiniStatus.qml \ qml/pages/components/MiniHeader.qml \ @@ -83,13 +83,13 @@ DISTFILES += qml/harbour-tooter-beta.qml \ 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 \ + config/x-harbour.tooterb.activity.conf \ + rpm/harbour-tooterb.changes \ + rpm/harbour-tooterb.changes.run.in \ + rpm/harbour-tooterb.spec \ + rpm/harbour-tooterb.yaml \ translations/*.ts \ - harbour-tooter-beta.desktop + harbour-tooterb.desktop \ SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 @@ -101,17 +101,17 @@ CONFIG += sailfishapp_i18n # 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 +TRANSLATIONS += translations/harbour-tooterb-de.ts +TRANSLATIONS += translations/harbour-tooterb-el.ts +TRANSLATIONS += translations/harbour-tooterb-es.ts +TRANSLATIONS += translations/harbour-tooterb-fi.ts +TRANSLATIONS += translations/harbour-tooterb-fr.ts +TRANSLATIONS += translations/harbour-tooterb-nl.ts +TRANSLATIONS += translations/harbour-tooterb-nl_BE.ts +TRANSLATIONS += translations/harbour-tooterb-oc.ts +TRANSLATIONS += translations/harbour-tooterb-pl.ts +TRANSLATIONS += translations/harbour-tooterb-ru.ts +TRANSLATIONS += translations/harbour-tooterb-sr.ts +TRANSLATIONS += translations/harbour-tooterb-sv.ts +TRANSLATIONS += translations/harbour-tooterb-zh_CN.ts +TRANSLATIONS += translations/harbour-tooterb-it.ts diff --git a/icons/108x108/harbour-tooter-beta.png b/icons/108x108/harbour-tooterb.png similarity index 100% rename from icons/108x108/harbour-tooter-beta.png rename to icons/108x108/harbour-tooterb.png diff --git a/icons/128x128/harbour-tooter-beta.png b/icons/128x128/harbour-tooterb.png similarity index 100% rename from icons/128x128/harbour-tooter-beta.png rename to icons/128x128/harbour-tooterb.png diff --git a/icons/172x172/harbour-tooter-beta.png b/icons/172x172/harbour-tooterb.png similarity index 100% rename from icons/172x172/harbour-tooter-beta.png rename to icons/172x172/harbour-tooterb.png diff --git a/icons/256x256/harbour-tooter-beta.png b/icons/256x256/harbour-tooterb.png similarity index 100% rename from icons/256x256/harbour-tooter-beta.png rename to icons/256x256/harbour-tooterb.png diff --git a/icons/86x86/harbour-tooter-beta.png b/icons/86x86/harbour-tooterb.png similarity index 100% rename from icons/86x86/harbour-tooter-beta.png rename to icons/86x86/harbour-tooterb.png diff --git a/qml/harbour-tooter-beta.qml b/qml/harbour-tooterb.qml similarity index 100% rename from qml/harbour-tooter-beta.qml rename to qml/harbour-tooterb.qml diff --git a/qml/lib/API.js b/qml/lib/API.js index c12523e..f930c0c 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-beta", 100000); +var db = LS.LocalStorage.openDatabaseSync("tooterb", "", "harbour-tooterb", 100000); var conf = {}; var mediator = (function(){ var subscribe = function(channel, fn){ @@ -118,17 +118,17 @@ var notificationGenerator = function(item){ var notification; switch (item.urgency){ case "normal": - notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { category: "x-harbour.tooter.activity"; appName: "Tooter"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooter", "path": "/", "iface": "ba.dysko.harbour.tooter", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Normal; }', Qt.application, 'InternalQmlObject'); + notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { category: "x-harbour.tooterb.activity"; appName: "Tooter β"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooterb", "path": "/", "iface": "ba.dysko.harbour.tooterb", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Normal; }', Qt.application, 'InternalQmlObject'); break; case "critical": - notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { appName: "Tooter"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooter", "path": "/", "iface": "ba.dysko.harbour.tooter", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Critical; }', Qt.application, 'InternalQmlObject'); + notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { appName: "Tooter β"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooterb", "path": "/", "iface": "ba.dysko.harbour.tooterb", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Critical; }', Qt.application, 'InternalQmlObject'); break; default: - notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { category: "x-harbour.tooter.activity"; appName: "Tooter"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooter", "path": "/", "iface": "ba.dysko.harbour.tooter", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Low; }', Qt.application, 'InternalQmlObject'); + notification = Qt.createQmlObject('import org.nemomobile.notifications 1.0; Notification { category: "x-harbour.tooterb.activity"; appName: "Tooter β"; itemCount: 1; remoteActions: [ { "name": "default", "displayName": "Do something", "icon": "icon-s-certificates", "service": "ba.dysko.harbour.tooterb", "path": "/", "iface": "ba.dysko.harbour.tooterb", "method": "openapp", "arguments": [ "'+item.service+'", "'+item.key+'" ] }]; urgency: Notification.Low; }', Qt.application, 'InternalQmlObject'); } console.log(JSON.stringify(notification.remoteActions[0].arguments)) - //Notifications.notify("Tooter", "serverinfo.serverTitle", " new activity", false, "2015-10-15 00:00:00", "aaa") + //Notifications.notify("Tooter β", "serverinfo.serverTitle", " new activity", false, "2015-10-15 00:00:00", "aaa") notification.timestamp = item.timestamp notification.summary = item.summary diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index fce4817..d68f597 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -1,13 +1,13 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import harbour.tooter.Uploader 1.0 +import harbour.tooterb.Uploader 1.0 import "../lib/API.js" as Logic import "./components/" Page { id: conversationPage property string type - property alias title: header.title + property alias title: header.title property alias description: header.description property alias avatar: header.image property string suggestedUser: "" @@ -61,10 +61,10 @@ Page { } SilicaListView { id: conversationList - header: PageHeader { - title: qsTr("Conversation") + header: PageHeader { + title: qsTr("Conversation") } - clip: true + clip: true anchors { top: parent.top bottom: panel.top @@ -157,7 +157,6 @@ Page { Rectangle { id: progressBar width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0 - height: Theme.itemSizeSmall * 0.05 color: Theme.highlightBackgroundColor opacity: 0.7 @@ -211,6 +210,7 @@ Page { //height: implicitHeight horizontalAlignment: Text.AlignLeft placeholderText: qsTr("What's on your mind?") + font.pixelSize: Theme.fontSizeSmall EnterKey.onClicked: { //tweet() } @@ -606,7 +606,7 @@ Page { Label { anchors.centerIn: parent color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) - font.pixelSize: Theme.fontSizeLarge + font.pixelSize: Theme.fontSizeLarge text: glyph } onClicked: { diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index d7b8e42..02bbf4b 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -9,6 +9,7 @@ Page { property string display_name : ""; property string username : ""; property string profileImage : ""; + property string discoverable : ""; property int user_id; property int statuses_count; property int following_count; @@ -19,7 +20,6 @@ Page { property string profile_background: ""; property string note: ""; property string url: ""; - property bool locked : false; property date created_at; property bool following : false; @@ -134,14 +134,12 @@ Page { } } - - MyList { id: list header: ProfileHeader { id: header title: display_name - description: '@'+username + description: username image: profileImage } @@ -251,7 +249,6 @@ Page { Text { x: Theme.horizontalPageMargin width: parent.width - ( 2 * Theme.horizontalPageMargin ) - id: txtnote text: note font.pixelSize: Theme.fontSizeExtraSmall color: Theme.secondaryColor @@ -274,23 +271,19 @@ Page { return check; })); send(link) - } else if (test.length === 4 && test[3][0] === "@" ) { tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) slideshow.positionViewAtIndex(4, ListView.SnapToItem) navigation.navigateTo('search') - } else { Qt.openUrlExternally(link); } } - } Column { spacing: Theme.paddingMedium anchors.horizontalCenter: parent.horizontalCenter Button { - id: btnUrl text: qsTr("Open Profile in Browser") onClicked: { Qt.openUrlExternally(url); diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 00d6874..88a3651 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -1,6 +1,5 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 - import "../lib/API.js" as Logic Page { diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml index 34140a9..6a9f6f9 100644 --- a/qml/pages/components/MiniHeader.qml +++ b/qml/pages/components/MiniHeader.qml @@ -12,7 +12,11 @@ Item { left: parent.left leftMargin: Theme.paddingMedium } - text: account_display_name + text: + if (account_display_name === "") { + account_username.split('@')[0] + } + else account_display_name width: contentWidth > parent.width /2 ? parent.width /2 : contentWidth truncationMode: TruncationMode.Fade font.weight: Font.Bold diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index b2f0626..27acc24 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -122,7 +122,6 @@ SilicaListView { } } onContentYChanged: { - if (Math.abs(contentY - scrollOffset) > Theme.itemSizeMedium) { openDrawer(contentY - scrollOffset > 0 ? false : true ) scrollOffset = contentY diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index 54b9874..6a0c983 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -7,7 +7,7 @@ Item { property string title: ""; property string description: ""; property string image: ""; - property string bg: ""; + //property string bg: ""; width: parent.width height: icon.height + Theme.paddingLarge*2 /*Image { @@ -54,9 +54,14 @@ Item { } Label { id: ttl - text: title + //text: title + text: + if (title === "") { + description.split('@')[0] + } + else title height: contentHeight - color: Theme.primaryColor + color: Theme.highlightColor font.pixelSize: Theme.fontSizeLarge font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight @@ -65,8 +70,8 @@ Item { } Label { height: description === "" ? 0 : contentHeight - text: description - color: Theme.secondaryColor + text: "@"+description + color: Theme.secondaryHighlightColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index a7bc245..e96af80 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -133,11 +133,11 @@ BackgroundItem { return check; })); send(link) + // temporary solution for access to user profiles via toots } else if (test.length === 4 && test[3][0] === "@" ) { tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) slideshow.positionViewAtIndex(4, ListView.SnapToItem) navigation.navigateTo('search') - } else { Qt.openUrlExternally(link); } @@ -146,7 +146,7 @@ BackgroundItem { linkColor : Theme.highlightColor wrapMode: Text.WordWrap textFormat: Text.StyledText - font.pixelSize: Theme.fontSizeSmall + font.pixelSize: Theme.fontSizeExtraSmall color: (pressed ? Theme.highlightColor : (!highlight ? Theme.primaryColor : Theme.secondaryColor)) Rectangle { anchors.fill: parent diff --git a/rpm/harbour-tooter-beta.changes b/rpm/harbour-tooterb.changes similarity index 100% rename from rpm/harbour-tooter-beta.changes rename to rpm/harbour-tooterb.changes diff --git a/rpm/harbour-tooter-beta.changes.run.in b/rpm/harbour-tooterb.changes.run.in similarity index 100% rename from rpm/harbour-tooter-beta.changes.run.in rename to rpm/harbour-tooterb.changes.run.in diff --git a/rpm/harbour-tooter-beta.spec b/rpm/harbour-tooterb.spec similarity index 94% rename from rpm/harbour-tooter-beta.spec rename to rpm/harbour-tooterb.spec index a4c1571..b7a3aa7 100644 --- a/rpm/harbour-tooter-beta.spec +++ b/rpm/harbour-tooterb.spec @@ -3,7 +3,7 @@ # Generated by: spectacle version 0.27 # -Name: harbour-tooter-beta +Name: harbour-tooterb # >> macros # << macros @@ -12,14 +12,14 @@ Name: harbour-tooter-beta %{!?qtc_qmake5:%define qtc_qmake5 %qmake5} %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} -Summary: Tooter +Summary: Tooter β Version: 1.0.4 Release: 2 Group: Qt/Qt License: LICENSE URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-tooter-beta.yaml +Source100: harbour-tooterb.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-tooterb.yaml similarity index 97% rename from rpm/harbour-tooter-beta.yaml rename to rpm/harbour-tooterb.yaml index d6f1b12..3908ac2 100644 --- a/rpm/harbour-tooter-beta.yaml +++ b/rpm/harbour-tooterb.yaml @@ -1,5 +1,5 @@ -Name: harbour-tooter-beta -Summary: Tooter +Name: harbour-tooterb +Summary: Tooter β Version: 1.0.4 Release: 2 # The contents of the Group field should be one of the groups listed here: diff --git a/src/dbus.cpp b/src/dbus.cpp index e221b9b..1135741 100644 --- a/src/dbus.cpp +++ b/src/dbus.cpp @@ -7,7 +7,7 @@ Dbus::Dbus(QObject *parent) : QObject(parent) { m_dbusRegistered = false; - new TooterAdaptor(this); + new TooterbAdaptor(this); registerDBus(); } diff --git a/src/dbusAdaptor.cpp b/src/dbusAdaptor.cpp index d607136..99a3876 100644 --- a/src/dbusAdaptor.cpp +++ b/src/dbusAdaptor.cpp @@ -18,30 +18,30 @@ #include /* - * Implementation of adaptor class TooterAdaptor + * Implementation of adaptor class TooterbAdaptor */ -TooterAdaptor::TooterAdaptor(QObject *parent) +TooterbAdaptor::TooterbAdaptor(QObject *parent) : QDBusAbstractAdaptor(parent) { // constructor setAutoRelaySignals(true); } -TooterAdaptor::~TooterAdaptor() +TooterbAdaptor::~TooterbAdaptor() { // destructor } -void TooterAdaptor::openapp() +void TooterbAdaptor::openapp() { - // handle method call ba.dysko.harbour.tooter.openapp + // handle method call ba.dysko.harbour.tooterb.openapp QMetaObject::invokeMethod(parent(), "openapp"); } -void TooterAdaptor::showtoot(const QStringList &key) +void TooterbAdaptor::showtoot(const QStringList &key) { - // handle method call ba.dysko.harbour.tooter.showtoot + // handle method call ba.dysko.harbour.tooterb.showtoot QMetaObject::invokeMethod(parent(), "showtoot", Q_ARG(QStringList, key)); } diff --git a/src/dbusAdaptor.h b/src/dbusAdaptor.h index c65d635..e8ca064 100644 --- a/src/dbusAdaptor.h +++ b/src/dbusAdaptor.h @@ -27,12 +27,12 @@ QT_END_NAMESPACE /* * Adaptor class for interface com.kimmoli.harbour.maira */ -class TooterAdaptor: public QDBusAbstractAdaptor +class TooterbAdaptor: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "ba.dysko.harbour.tooter") + Q_CLASSINFO("D-Bus Interface", "ba.dysko.harbour.tooterb") Q_CLASSINFO("D-Bus Introspection", "" -" \n" +" \n" " \n" " \n" " \n" @@ -41,8 +41,8 @@ class TooterAdaptor: public QDBusAbstractAdaptor " \n" "") public: - TooterAdaptor(QObject *parent); - virtual ~TooterAdaptor(); + TooterbAdaptor(QObject *parent); + virtual ~TooterbAdaptor(); public: // PROPERTIES public Q_SLOTS: // METHODS diff --git a/src/harbour-tooter-beta.cpp b/src/harbour-tooterb.cpp similarity index 87% rename from src/harbour-tooter-beta.cpp rename to src/harbour-tooterb.cpp index 77605e9..80c8a37 100644 --- a/src/harbour-tooter-beta.cpp +++ b/src/harbour-tooterb.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) FileDownloader *fd = new FileDownloader(engine); view->rootContext()->setContextProperty("FileDownloader", fd); - qmlRegisterType("harbour.tooter.Uploader", 1, 0, "ImageUploader"); + qmlRegisterType("harbour.tooterb.Uploader", 1, 0, "ImageUploader"); Notifications *no = new Notifications(); view->rootContext()->setContextProperty("Notifications", no); @@ -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-beta.qml")); + view->setSource(SailfishApp::pathTo("qml/harbour-tooterb.qml")); view->show(); return app->exec(); } diff --git a/src/notifications.cpp b/src/notifications.cpp index 8234e1f..f7d3e15 100644 --- a/src/notifications.cpp +++ b/src/notifications.cpp @@ -24,14 +24,14 @@ void Notifications::notify(QString appName, QString summary, QString body, bool { notif.setPreviewSummary(summary); notif.setPreviewBody(body); - notif.setCategory("x-harbour.tooter.activity"); + notif.setCategory("x-harbour.tooterb.activity"); if (issuekey.isEmpty()) { remoteactions << Notification::remoteAction("default", QString(), - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "/", - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "openapp", QVariantList()); } @@ -42,12 +42,12 @@ void Notifications::notify(QString appName, QString summary, QString body, bool notif.setSummary(summary); notif.setBody(body); notif.setItemCount(1); - notif.setCategory("x-harbour.tooter.activity"); + notif.setCategory("x-harbour.tooterb.activity"); remoteactions << Notification::remoteAction("app", QString(), - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "/", - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "openapp", QVariantList()); } @@ -64,9 +64,9 @@ void Notifications::notify(QString appName, QString summary, QString body, bool remoteactions << Notification::remoteAction("default", QString(), - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "/", - "ba.dysko.habour.tooter", + "ba.dysko.habour.tooterb", "showtoot", args); } diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts deleted file mode 100644 index b119e7e..0000000 --- a/translations/harbour-tooter.ts +++ /dev/null @@ -1,336 +0,0 @@ - - - - - API - - favourited - favourited - - - followed you - followed you - - - boosted - boosted - - - said - said - - - - Conversation - - Conversation - Conversation - - - Delete - Delete - - - Emojis - Emojis - - - Tap to insert - Tap to insert - - - Write your warning here - - - - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? - - - - - 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 - - - - New Toot - - - - Search - - - - @user or #term - - - - Local - - - - Federated - - - - - MiniStatus - - boosted - boosted - - - favourited - favourited - - - followed you - followed you - - - - MyList - - Load more - Load more - - - Settings - Settings - - - Loading - - - - please wait... - - - - - Profile - - Unfollow - Unfollow - - - Follow request sent! - Follow request sent! - - - Following - Following - - - Mute - Mute - - - Unmute - Unmute - - - Unblock - Unblock - - - Block - Block - - - Statuses - Statuses - - - Favourites - Favourites - - - Follow - Follow - - - Summary - Summary - - - Followers - Followers - - - Bio - - - - Open Profile in Browser - - - - - Settings - - Settings - Settings - - - Remove Account - - - - Add Account - - - - Deauthorize this app and remove your account - - - - Authorize this app to access your Mastodon account - - - - Disable this option if you want to preserve your data connection - - - - Credits - - - - UI/UX design and development - - - - Visual identity - - - - Occitan & French translation - - - - Dutch translation - - - - Spanish translation - - - - Added README file - - - - Chinese translation - - - - Load images in toots - - - - Translate - - - - Use Transifex to help with app translation to your language - - - - Development and translations - - - - - Toot - - boosted - boosted - - - favourited - favourited - - - followed you - followed you - - - - VisualContainer - - Unboost - - - - Boost - - - - Unfavorite - - - - Favorite - - - - diff --git a/translations/harbour-tooter-beta-de.ts b/translations/harbour-tooterb-de.ts similarity index 98% rename from translations/harbour-tooter-beta-de.ts rename to translations/harbour-tooterb-de.ts index d2a2c44..d4f2d4b 100644 --- a/translations/harbour-tooter-beta-de.ts +++ b/translations/harbour-tooterb-de.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konversation - Delete Löschen diff --git a/translations/harbour-tooter-beta-el.ts b/translations/harbour-tooterb-el.ts similarity index 98% rename from translations/harbour-tooter-beta-el.ts rename to translations/harbour-tooterb-el.ts index 6f47211..134dd37 100644 --- a/translations/harbour-tooter-beta-el.ts +++ b/translations/harbour-tooterb-el.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Συνομιλία - Delete Διαγραφή diff --git a/translations/harbour-tooter-beta-es.ts b/translations/harbour-tooterb-es.ts similarity index 100% rename from translations/harbour-tooter-beta-es.ts rename to translations/harbour-tooterb-es.ts diff --git a/translations/harbour-tooter-beta-fi.ts b/translations/harbour-tooterb-fi.ts similarity index 98% rename from translations/harbour-tooter-beta-fi.ts rename to translations/harbour-tooterb-fi.ts index f1444ea..7278cb0 100644 --- a/translations/harbour-tooter-beta-fi.ts +++ b/translations/harbour-tooterb-fi.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - - Delete diff --git a/translations/harbour-tooter-beta-fr.ts b/translations/harbour-tooterb-fr.ts similarity index 98% rename from translations/harbour-tooter-beta-fr.ts rename to translations/harbour-tooterb-fr.ts index 520174c..2b7781b 100644 --- a/translations/harbour-tooter-beta-fr.ts +++ b/translations/harbour-tooterb-fr.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Conversation - Delete Supprimer diff --git a/translations/harbour-tooter-beta-it.ts b/translations/harbour-tooterb-it.ts similarity index 86% rename from translations/harbour-tooter-beta-it.ts rename to translations/harbour-tooterb-it.ts index 7f50712..fbb2e2c 100644 --- a/translations/harbour-tooter-beta-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -28,17 +28,12 @@ Conversation - - Conversation - Conversazione - - - + Write your warning here Contenuto avviso - + What's on your mind? A cosa stai pensando? @@ -155,7 +150,7 @@ @utente o #termine - + New Toot Nuovo toot @@ -204,72 +199,72 @@ Profile - + Summary Sintesi - + Followers Seguaci - + Following Segue - + Statuses Toots - + Favourites Apprezzati - + Unfollow Smetti di seguire - + Follow request sent! Richiesta di seguito inviata! - + Follow Segui - + Unmute Non silenziare - + Mute Silenzia - + Unblock Sblocca - + Block Blocca - + Bio Biografia - + Open Profile in Browser Aprire profile nel browser @@ -277,92 +272,92 @@ Settings - + Settings Impostazione - + Remove Account Rimozione del account - + Add Account Aggiungi account - + Deauthorize this app and remove your account Annullare l'autorizzazione dell'app e rimuovere l'account - + Authorize this app to access your Mastodon account Autorizzare l'app all'utilizzo del conto Mastodon - + Load images in toots Caricare immagini nei toots - + Disable this option if you want to preserve your data connection Disabilitare questa opzione per conservare connessione dati - + Translate Tradurre - + Use Transifex to help with app translation to your language Utilizzare Transifex per aiutare nella traduzione dell'app - + Credits Sviluppo - + UI/UX design and development Design UI/UX e sviluppo - + Visual identity Identità visiva - + Development and translations Sviluppo e traduzioni - + Occitan & French translation Traduzione francese e occitanica - + Chinese translation Traduzione cinese - + Dutch translation Traduzione olandese - + Spanish translation Traduzione spagnola - + Added README file Aggiunto file README diff --git a/translations/harbour-tooter-beta-nl.ts b/translations/harbour-tooterb-nl.ts similarity index 98% rename from translations/harbour-tooter-beta-nl.ts rename to translations/harbour-tooterb-nl.ts index 6ff67ed..5b5a61d 100644 --- a/translations/harbour-tooter-beta-nl.ts +++ b/translations/harbour-tooterb-nl.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Gesprek - Delete Verwijderen diff --git a/translations/harbour-tooter-beta-nl_BE.ts b/translations/harbour-tooterb-nl_BE.ts similarity index 98% rename from translations/harbour-tooter-beta-nl_BE.ts rename to translations/harbour-tooterb-nl_BE.ts index cf8d937..e3c2b0b 100644 --- a/translations/harbour-tooter-beta-nl_BE.ts +++ b/translations/harbour-tooterb-nl_BE.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Gesprek - Delete Verwijderen diff --git a/translations/harbour-tooter-beta-oc.ts b/translations/harbour-tooterb-oc.ts similarity index 98% rename from translations/harbour-tooter-beta-oc.ts rename to translations/harbour-tooterb-oc.ts index 2bb86d9..1c1cf1c 100644 --- a/translations/harbour-tooter-beta-oc.ts +++ b/translations/harbour-tooterb-oc.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Discutida - Delete Escafar diff --git a/translations/harbour-tooter-beta-pl.ts b/translations/harbour-tooterb-pl.ts similarity index 98% rename from translations/harbour-tooter-beta-pl.ts rename to translations/harbour-tooterb-pl.ts index 952b1b2..b54efba 100644 --- a/translations/harbour-tooter-beta-pl.ts +++ b/translations/harbour-tooterb-pl.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konwersacja - Delete Usuń diff --git a/translations/harbour-tooter-beta-ru.ts b/translations/harbour-tooterb-ru.ts similarity index 99% rename from translations/harbour-tooter-beta-ru.ts rename to translations/harbour-tooterb-ru.ts index 277a582..ef5908d 100644 --- a/translations/harbour-tooter-beta-ru.ts +++ b/translations/harbour-tooterb-ru.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Беседа - Delete Удалить diff --git a/translations/harbour-tooter-beta-sr.ts b/translations/harbour-tooterb-sr.ts similarity index 98% rename from translations/harbour-tooter-beta-sr.ts rename to translations/harbour-tooterb-sr.ts index 3091e3e..b304747 100644 --- a/translations/harbour-tooter-beta-sr.ts +++ b/translations/harbour-tooterb-sr.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Разговор - Delete Обриши diff --git a/translations/harbour-tooter-beta-sv.ts b/translations/harbour-tooterb-sv.ts similarity index 98% rename from translations/harbour-tooter-beta-sv.ts rename to translations/harbour-tooterb-sv.ts index 43b1866..2597eb2 100644 --- a/translations/harbour-tooter-beta-sv.ts +++ b/translations/harbour-tooterb-sv.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - Konversation - Delete Radera diff --git a/translations/harbour-tooter-beta-zh_CN.ts b/translations/harbour-tooterb-zh_CN.ts similarity index 98% rename from translations/harbour-tooter-beta-zh_CN.ts rename to translations/harbour-tooterb-zh_CN.ts index 04ddc89..672c02b 100644 --- a/translations/harbour-tooter-beta-zh_CN.ts +++ b/translations/harbour-tooterb-zh_CN.ts @@ -22,10 +22,6 @@ Conversation - - Conversation - 对话 - Delete 删除 diff --git a/translations/harbour-tooter-beta.ts b/translations/harbour-tooterb.ts similarity index 86% rename from translations/harbour-tooter-beta.ts rename to translations/harbour-tooterb.ts index 33843dc..c573656 100644 --- a/translations/harbour-tooter-beta.ts +++ b/translations/harbour-tooterb.ts @@ -28,17 +28,12 @@ Conversation - - Conversation - - - - + Write your warning here - + What's on your mind? @@ -155,7 +150,7 @@ - + New Toot @@ -204,72 +199,72 @@ Profile - + Summary - + Followers - + Following - + Statuses - + Favourites - + Unfollow - + Follow request sent! - + Follow - + Unmute - + Mute - + Unblock - + Block - + Bio - + Open Profile in Browser @@ -277,92 +272,92 @@ 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