Commit dd764fe8 authored by Dusko Angirevic's avatar Dusko Angirevic

1.0.3

#41 remorse popup added
#39 login related issues
parent b4054b8d
......@@ -63,6 +63,7 @@ Page {
id: instance
focus: true
label: qsTr("Enter an Mastodon instance URL")
text: "https://"
placeholderText: "https://mastodon.social"
width: parent.width
validator: RegExpValidator { regExp: /^(ftp|http|https):\/\/[^ "]+$/ }
......
import QtQuick 2.0
import Sailfish.Silica 1.0
import "../lib/API.js" as Logic
Page {
......@@ -7,6 +8,8 @@ Page {
anchors.fill: parent
contentHeight: column.height + Theme.paddingLarge
contentWidth: parent.width
RemorsePopup { id: remorsePopup }
VerticalScrollDecorator {}
Column {
......@@ -20,20 +23,31 @@ Page {
// No spacing in this column
width: parent.width
IconTextSwitch {
text: Logic.conf['login'] ? qsTr("Remove Account"): qsTr("Add Account")
id: removeAccount
text: Logic.conf['login'] ? qsTr("Remove Account") : qsTr("Add Account")
description: Logic.conf['login'] ? qsTr("Deauthorize this app and remove your account") : qsTr("Authorize this app to use your Mastodon account in your behalf")
icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add"
onCheckedChanged: {
busy = true;
remorsePopup.execute(removeAccount.text, function() {
busy = true;
checked = false;
timer1.start();
if (Logic.conf['login']) {
Logic.conf['login'] = false
Logic.conf['instance'] = null;
Logic.conf['api_user_token'] = null;
}
pageStack.push(Qt.resolvedUrl("LoginPage.qml"))
})
}
/* busy = true;
checked = false;
timer1.start()
if (Logic.conf['login']) {
Logic.conf['login'] = false
Logic.conf['instance'] = null;
Logic.conf['api_user_token'] = null;
}
pageStack.push(Qt.resolvedUrl("LoginPage.qml"))
}
}*/
Timer {
id: timer1
interval: 4700
......
* Sun Jan 27 2019 Dusko Angirevic <dysko@me.com> 1.0.3-0
- Remorse popup added for account removal
- Updated translations
* Tue Jan 15 2019 Dusko Angirevic <dysko@me.com> 1.0.2-0
- SailfishOS 3.0 build
- Chinese language translation added
......
......@@ -13,7 +13,7 @@ Name: harbour-tooter
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tooter
Version: 1.0.2
Version: 1.0.3
Release: 0
Group: Qt/Qt
License: LICENSE
......
Name: harbour-tooter
Summary: Tooter
Version: 1.0.2
Version: 1.0.3
Release: 0
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
......
......@@ -96,18 +96,18 @@
<name>LoginPage</name>
<message>
<source>Login</source>
<translation>Login</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation>Gib eine Mastadon Instance URL ein</translation>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation>Mastodon ist ein freies, auf OpenSource begründetes Soziales Netzwerk. Es bietet eine dezentralisierte Alternative zu den kommerziellen Plattformen, vermeidet aber das Risiko, dass ein einzelnes Unternehmen das Monopol auf deine gesamte Kommunikation erhält. Wähle selbst einen Server (Instanz) der du vertraust - egal welche du wählst, du kannst mit allen kommunizieren. Oder du betreibst deine eigene Mastodon Instanz und verbindest dich nahtlos mit dem Mastodon Netzwerk.</translation>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -235,47 +235,47 @@
<name>Settings</name>
<message>
<source>Settings</source>
<translation>Einstellungen</translation>
<translation type="unfinished">Einstellungen</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Account löschen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Account</source>
<translation>Account hinzufügen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Autorisiere diese App deinen Mastodon Account in deinem Namen zu nutzen</translation>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation>Lade Bilder in den Toots</translation>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Der App Autorisierung entziehen und Account entfernen</translation>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation>Credits</translation>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translate</source>
<translation>Übersetzen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation>Nutze Transifex um bei der Übersetzung in deine Sprache zu helfen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Deaktiviere diese Option um deinen Datenverbindung zu schonen</translation>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>UI/UX Design und Implementierung</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
......
......@@ -96,18 +96,18 @@
<name>LoginPage</name>
<message>
<source>Login</source>
<translation>Σύνδεση</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -235,47 +235,47 @@
<name>Settings</name>
<message>
<source>Settings</source>
<translation>Ρυθμίσεις</translation>
<translation type="unfinished">Ρυθμίσεις</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Αφαίρεση λογαριασμού</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Account</source>
<translation>Προσθήκη λογαριασμού</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας</translation>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation>Φόρτωση των εικόνων στα toot</translation>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας</translation>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation>Ευχαριστίες</translation>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translate</source>
<translation>Μετάφραση</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation>Χρησιμοποιήστε το Transifex για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Απενεργοποιήστε αυτήν την επιλογή αν θέλετε να διατηρήσετε την σύνδεση των δεδομένων σας</translation>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>UI/UX σχεδιασμός και ανάπτυξη</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
......
......@@ -96,18 +96,18 @@
<name>LoginPage</name>
<message>
<source>Login</source>
<translation>Acceso</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation>Introduce URL de una instancia de Mastodon</translation>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation>Mastodon es una red social gratuita y de código abierto. Una alternativa descentralizada a las plataformas comerciales, evita los riesgos de una única compañía que monopolice tu comunicación. Elije un servidor en el que confíes cualquiera que elijas, puede interactuar con todos los demás. Cualquiera puede ejecutar su propia instancia de Mastodon y participar en la red social sin problemas.</translation>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -235,47 +235,47 @@
<name>Settings</name>
<message>
<source>Settings</source>
<translation>Ajustes</translation>
<translation type="unfinished">Ajustes</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Eliminar cuenta</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Account</source>
<translation>Añadir cuenta</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Autoriza a esta aplicación a usar tu cuenta de Mastodon en tu nombre</translation>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation>Cargar imágenes en toots</translation>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Retira la autorización a esta aplicación y elimina tu cuenta</translation>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation>Créditos</translation>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translate</source>
<translation>Traducir</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation>Usa Transifex para ayudar en la traducción a tu idioma de esta aplicación</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Deshabilita esta opción si quieres ahorrar en tu conexión de datos</translation>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>Diseño UI/UX y desarrollo</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
......
......@@ -99,15 +99,15 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -246,19 +246,19 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -270,7 +270,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
......
......@@ -96,18 +96,18 @@
<name>LoginPage</name>
<message>
<source>Login</source>
<translation>Login</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation>Saisissez lURL dune instance Mastodon</translation>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation>Mastodon est un réseau libre et open source. Il sagit d&apos;une alternative aux plateformes commerciales, pour éviter qu&apos;une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec dautres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste.</translation>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -235,47 +235,47 @@
<name>Settings</name>
<message>
<source>Settings</source>
<translation>Préférences</translation>
<translation type="unfinished">Paramètres</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Supprimer le compte</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Account</source>
<translation>Ajouter un compte</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Autoriser cette application à utiliser votre compte Mastodon en votre nom</translation>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation>Charger les images des pouets</translation>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Supprimer votre compte de l&apos;application</translation>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation>Crédits</translation>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translate</source>
<translation>Traduire</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation>Utilisez Transifex pour aider à la traduction de l&apos;application dans votre langue</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Désactivez cette option si vous souhaitez économiser votre consommation de données</translation>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>design et développement de l&apos;interface</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
......
......@@ -96,18 +96,18 @@
<name>LoginPage</name>
<message>
<source>Login</source>
<translation>Inloggen</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation>Voer de URL van een Mastodon-instantie in</translation>
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation>Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risicos van een enkel bedrijf dat je communicatie monopoliseert. Kies een server die je vertrouwt welke je ook kiest, je kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociale netwerk.</translation>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Instance</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
......@@ -235,47 +235,47 @@
<name>Settings</name>
<message>
<source>Settings</source>
<translation>Instellingen</translation>
<translation type="unfinished">Instellingen</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Verwijderen account</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Account</source>
<translation>Toevoegen account</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Autoriseer deze app om je Mastodon namens jou te gebruiken</translation>
<source>Deauthorize this app and remove your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation>Laden afbeeldingen in toots</translation>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Trek autorisaties van deze app in en verwijder je account</translation>
<source>Load images in toots