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 { ...@@ -63,6 +63,7 @@ Page {
id: instance id: instance
focus: true focus: true
label: qsTr("Enter an Mastodon instance URL") label: qsTr("Enter an Mastodon instance URL")
text: "https://"
placeholderText: "https://mastodon.social" placeholderText: "https://mastodon.social"
width: parent.width width: parent.width
validator: RegExpValidator { regExp: /^(ftp|http|https):\/\/[^ "]+$/ } validator: RegExpValidator { regExp: /^(ftp|http|https):\/\/[^ "]+$/ }
......
import QtQuick 2.0 import QtQuick 2.0
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
import "../lib/API.js" as Logic import "../lib/API.js" as Logic
Page { Page {
...@@ -7,6 +8,8 @@ Page { ...@@ -7,6 +8,8 @@ Page {
anchors.fill: parent anchors.fill: parent
contentHeight: column.height + Theme.paddingLarge contentHeight: column.height + Theme.paddingLarge
contentWidth: parent.width contentWidth: parent.width
RemorsePopup { id: remorsePopup }
VerticalScrollDecorator {} VerticalScrollDecorator {}
Column { Column {
...@@ -20,20 +23,31 @@ Page { ...@@ -20,20 +23,31 @@ Page {
// No spacing in this column // No spacing in this column
width: parent.width width: parent.width
IconTextSwitch { 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") 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" icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add"
onCheckedChanged: { 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; checked = false;
timer1.start() 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 { Timer {
id: timer1 id: timer1
interval: 4700 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 * Tue Jan 15 2019 Dusko Angirevic <dysko@me.com> 1.0.2-0
- SailfishOS 3.0 build - SailfishOS 3.0 build
- Chinese language translation added - Chinese language translation added
......
...@@ -13,7 +13,7 @@ Name: harbour-tooter ...@@ -13,7 +13,7 @@ Name: harbour-tooter
%{!?qtc_make:%define qtc_make make} %{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir} %{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tooter Summary: Tooter
Version: 1.0.2 Version: 1.0.3
Release: 0 Release: 0
Group: Qt/Qt Group: Qt/Qt
License: LICENSE License: LICENSE
......
Name: harbour-tooter Name: harbour-tooter
Summary: Tooter Summary: Tooter
Version: 1.0.2 Version: 1.0.3
Release: 0 Release: 0
# The contents of the Group field should be one of the groups listed here: # The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
......
...@@ -96,18 +96,18 @@ ...@@ -96,18 +96,18 @@
<name>LoginPage</name> <name>LoginPage</name>
<message> <message>
<source>Login</source> <source>Login</source>
<translation>Login</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Enter an Mastodon instance URL</source> <source>Instance</source>
<translation>Gib eine Mastadon Instance URL ein</translation> <translation type="unfinished"></translation>
</message> </message>
<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>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> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
...@@ -235,47 +235,47 @@ ...@@ -235,47 +235,47 @@
<name>Settings</name> <name>Settings</name>
<message> <message>
<source>Settings</source> <source>Settings</source>
<translation>Einstellungen</translation> <translation type="unfinished">Einstellungen</translation>
</message> </message>
<message> <message>
<source>Remove Account</source> <source>Remove Account</source>
<translation>Account löschen</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Add Account</source> <source>Add Account</source>
<translation>Account hinzufügen</translation> <translation type="unfinished"></translation>
</message> </message>
<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>Autorisiere diese App deinen Mastodon Account in deinem Namen zu nutzen</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Load images in toots</source> <source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Lade Bilder in den Toots</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Deauthorize this app and remove your account</source> <source>Load images in toots</source>
<translation>Der App Autorisierung entziehen und Account entfernen</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Credits</source> <source>Disable this option if you want to preserve your data connection</source>
<translation>Credits</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Translate</source> <source>Translate</source>
<translation>Übersetzen</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Use Transifex to help with app translation to your language</source> <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>
<message> <message>
<source>Disable this option if you want to preserve your data connection</source> <source>Credits</source>
<translation>Deaktiviere diese Option um deinen Datenverbindung zu schonen</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>UI/UX design and development</source> <source>UI/UX design and development</source>
<translation>UI/UX Design und Implementierung</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
......
...@@ -96,18 +96,18 @@ ...@@ -96,18 +96,18 @@
<name>LoginPage</name> <name>LoginPage</name>
<message> <message>
<source>Login</source> <source>Login</source>
<translation>Σύνδεση</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Enter an Mastodon instance URL</source> <source>Instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
...@@ -235,47 +235,47 @@ ...@@ -235,47 +235,47 @@
<name>Settings</name> <name>Settings</name>
<message> <message>
<source>Settings</source> <source>Settings</source>
<translation>Ρυθμίσεις</translation> <translation type="unfinished">Ρυθμίσεις</translation>
</message> </message>
<message> <message>
<source>Remove Account</source> <source>Remove Account</source>
<translation>Αφαίρεση λογαριασμού</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Add Account</source> <source>Add Account</source>
<translation>Προσθήκη λογαριασμού</translation> <translation type="unfinished"></translation>
</message> </message>
<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>Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Load images in toots</source> <source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Φόρτωση των εικόνων στα toot</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Deauthorize this app and remove your account</source> <source>Load images in toots</source>
<translation>Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Credits</source> <source>Disable this option if you want to preserve your data connection</source>
<translation>Ευχαριστίες</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Translate</source> <source>Translate</source>
<translation>Μετάφραση</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Use Transifex to help with app translation to your language</source> <source>Use Transifex to help with app translation to your language</source>
<translation>Χρησιμοποιήστε το Transifex για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Disable this option if you want to preserve your data connection</source> <source>Credits</source>
<translation>Απενεργοποιήστε αυτήν την επιλογή αν θέλετε να διατηρήσετε την σύνδεση των δεδομένων σας</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>UI/UX design and development</source> <source>UI/UX design and development</source>
<translation>UI/UX σχεδιασμός και ανάπτυξη</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
......
...@@ -96,18 +96,18 @@ ...@@ -96,18 +96,18 @@
<name>LoginPage</name> <name>LoginPage</name>
<message> <message>
<source>Login</source> <source>Login</source>
<translation>Acceso</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Enter an Mastodon instance URL</source> <source>Instance</source>
<translation>Introduce URL de una instancia de Mastodon</translation> <translation type="unfinished"></translation>
</message> </message>
<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>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> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
...@@ -235,47 +235,47 @@ ...@@ -235,47 +235,47 @@
<name>Settings</name> <name>Settings</name>
<message> <message>
<source>Settings</source> <source>Settings</source>
<translation>Ajustes</translation> <translation type="unfinished">Ajustes</translation>
</message> </message>
<message> <message>
<source>Remove Account</source> <source>Remove Account</source>
<translation>Eliminar cuenta</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Add Account</source> <source>Add Account</source>
<translation>Añadir cuenta</translation> <translation type="unfinished"></translation>
</message> </message>
<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>Autoriza a esta aplicación a usar tu cuenta de Mastodon en tu nombre</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Load images in toots</source> <source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Cargar imágenes en toots</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Deauthorize this app and remove your account</source> <source>Load images in toots</source>
<translation>Retira la autorización a esta aplicación y elimina tu cuenta</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Credits</source> <source>Disable this option if you want to preserve your data connection</source>
<translation>Créditos</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Translate</source> <source>Translate</source>
<translation>Traducir</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Use Transifex to help with app translation to your language</source> <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>
<message> <message>
<source>Disable this option if you want to preserve your data connection</source> <source>Credits</source>
<translation>Deshabilita esta opción si quieres ahorrar en tu conexión de datos</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>UI/UX design and development</source> <source>UI/UX design and development</source>
<translation>Diseño UI/UX y desarrollo</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
......
...@@ -99,15 +99,15 @@ ...@@ -99,15 +99,15 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Enter an Mastodon instance URL</source> <source>Instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
...@@ -246,19 +246,19 @@ ...@@ -246,19 +246,19 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Deauthorize this app and remove your account</source> <source>Load images in toots</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Credits</source> <source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Disable this option if you want to preserve your data connection</source> <source>Credits</source>
<translation type="unfinished"></translation>