From 776485be9076e8490cda0d9118534b81a99a2c9b Mon Sep 17 00:00:00 2001 From: Mark Washeim Date: Wed, 11 Oct 2023 12:39:33 +0200 Subject: [PATCH] [Release] 1.1.8, Amber Authentication framework --- .gitignore | 2 +- harbour-tooterb.pro | 2 +- harbour-tooterb.pro.user | 439 -------------------------- qml/pages/LoginPage.qml | 5 +- qml/pages/ProfilePage.qml | 6 +- rpm/harbour-tooterb.changes.run | 2 +- rpm/harbour-tooterb.spec | 2 +- translations/harbour-tooterb-de.ts | 4 - translations/harbour-tooterb-el.ts | 4 - translations/harbour-tooterb-es.ts | 4 - translations/harbour-tooterb-fr.ts | 4 - translations/harbour-tooterb-it.ts | 4 - translations/harbour-tooterb-nl.ts | 4 - translations/harbour-tooterb-nl_BE.ts | 4 - translations/harbour-tooterb-oc.ts | 4 - translations/harbour-tooterb-pl.ts | 4 - translations/harbour-tooterb-ru.ts | 4 - translations/harbour-tooterb-sr.ts | 4 - translations/harbour-tooterb-sv.ts | 4 - translations/harbour-tooterb-zh_CN.ts | 4 - translations/harbour-tooterb.ts | 4 - 21 files changed, 9 insertions(+), 505 deletions(-) delete mode 100644 harbour-tooterb.pro.user diff --git a/.gitignore b/.gitignore index 23ca2a1..7fa1a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.user -README.md harbour-tooterb.pro.user +harbour-tooterb.pro.user* diff --git a/harbour-tooterb.pro b/harbour-tooterb.pro index 12f593c..0c70dd5 100644 --- a/harbour-tooterb.pro +++ b/harbour-tooterb.pro @@ -84,8 +84,8 @@ DISTFILES += qml/harbour-tooterb.qml \ qml/lib/Worker.js \ config/icon-lock-harbour-tooterb.png \ config/x-harbour.tooterb.activity.conf \ + rpm/harbour-tooterb.changes.run \ rpm/harbour-tooterb.changes \ - rpm/harbour-tooterb.changes.run.in \ rpm/harbour-tooterb.spec \ translations/*.ts \ harbour-tooterb.desktop diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user deleted file mode 100644 index 3913f6a..0000000 --- a/harbour-tooterb.pro.user +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - EnvironmentId - {ddbad1fa-3e15-4c49-99dc-7ab87bce53d2} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - false - true - false - 0 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - - 0 - true - - true - Builtin.BuildSystem - - true - true - Builtin.DefaultTidyAndClazy - 4 - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Mer.Device.Type - SailfishOS-4.5.0.18-aarch64 (in Sailfish SDK Build Engine) - SailfishOS-4.5.0.18-aarch64 (in Sailfish SDK Build Engine) - SailfishOS-4.5.0.18-aarch64.default - 0 - 0 - 0 - - 0 - false - - mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Debug - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Debug - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - - - false - - mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Release - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Release - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - - - 0 - false - - mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Profile - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Profile - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - 0 - - 3 - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerRpmBuildStep - - - --sdk - true - QmakeProjectManager.MerRpmDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - QmakeProjectManager.MerRpmBuildStep - - - true - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerMakeInstallBuildStep - - - --rsync - true - QmakeProjectManager.MerRsyncDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - true - /home/mwa/src/sailfish/harbour-tooter - true - -1 - 3 - - 1 - - harbour-tooterb (on %{Device:Name}) - QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - 1 - false - true - false - true - :0.0 - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index 8e9bdcf..5453a01 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -3,13 +3,11 @@ import Sailfish.Silica 1.0 import Amber.Web.Authorization 1.0 import "../lib/API.js" as Logic - - - Page { property bool debug: false id: loginPage + // The effective value will be restricted by ApplicationWindow.allowedOrientations allowedOrientations: Orientation.All @@ -78,6 +76,7 @@ Page { Logic.conf = conf; if(debug) console.log(JSON.stringify(conf)) if(debug) console.log(JSON.stringify(Logic.conf)) + // we got our application mastodonOAuth.clientId = conf["client_id"] diff --git a/qml/pages/ProfilePage.qml b/qml/pages/ProfilePage.qml index 96268da..5e42b11 100644 --- a/qml/pages/ProfilePage.qml +++ b/qml/pages/ProfilePage.qml @@ -29,7 +29,7 @@ Page { property bool muting: false property bool domain_blocking: false property date created_at - property bool debug: false + property bool debug: true WorkerScript { id: worker @@ -162,13 +162,13 @@ Page { id: txtContainer width: parent.width height: profilePage.isPortrait ? Math.min( txtNote.height, parent.height * 0.5 ) : Math.min( txtNote.height, parent.height * 0.2 ) - visible: { + /*visible: { if ((note.text === "") || ( note.text === "

" )) { false } else { true } - } + }*/ SilicaFlickable { id: txtFlickable diff --git a/rpm/harbour-tooterb.changes.run b/rpm/harbour-tooterb.changes.run index a3693d6..732ac95 100644 --- a/rpm/harbour-tooterb.changes.run +++ b/rpm/harbour-tooterb.changes.run @@ -4,7 +4,7 @@ # generate changelog from well formatted Git commit messages and tag # annotations. -git-change-log +#sfdk-changelog # Here are some basic examples how to change from the default behavior. Run # git-change-log --help inside the Sailfish OS SDK chroot or build engine to diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec index 9be666d..9de00f7 100644 --- a/rpm/harbour-tooterb.spec +++ b/rpm/harbour-tooterb.spec @@ -14,7 +14,7 @@ Name: harbour-tooterb %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter β -Version: 1.1.7 +Version: 1.1.8 Release: 1 Group: Qt/Qt License: GPLv3 diff --git a/translations/harbour-tooterb-de.ts b/translations/harbour-tooterb-de.ts index 6523fe9..5800f8c 100644 --- a/translations/harbour-tooterb-de.ts +++ b/translations/harbour-tooterb-de.ts @@ -114,10 +114,6 @@ 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. Mastodon ist ein freies, quelloffenes soziales Netzwerk. Im Gegensatz zu kommerziellen Plattformen, ist Mastodon als dezentrales Netzwerk konzipiert. Somit wird das Risiko vermieden, dass ein einziges Unternehmen die volle Kontrolle über die Kommunikation der Benutzer hat. Benutzer können einer beliebigen Instanz beitreten oder selbst eine eigene betreiben. - - Reload - Neu laden - MainPage diff --git a/translations/harbour-tooterb-el.ts b/translations/harbour-tooterb-el.ts index c397e1d..dc96fa6 100644 --- a/translations/harbour-tooterb-el.ts +++ b/translations/harbour-tooterb-el.ts @@ -114,10 +114,6 @@ 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 diff --git a/translations/harbour-tooterb-es.ts b/translations/harbour-tooterb-es.ts index 9a0979c..83a351c 100644 --- a/translations/harbour-tooterb-es.ts +++ b/translations/harbour-tooterb-es.ts @@ -114,10 +114,6 @@ 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. Mastodon es una red social libre 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. - - Reload - Volver a cargar - MainPage diff --git a/translations/harbour-tooterb-fr.ts b/translations/harbour-tooterb-fr.ts index 1ff0e42..398d467 100644 --- a/translations/harbour-tooterb-fr.ts +++ b/translations/harbour-tooterb-fr.ts @@ -114,10 +114,6 @@ 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. Mastodon est un réseau libre et open source : une alternative décentralisée aux plateformes commerciales, afin d’éviter le contrôle monopolistique de vos communications par une entreprise. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec tous les utilisateurs du réseau Mastodon. Tout le monde peut monter sa propre instance Mastodon et ainsi contribuer à la croissance du réseau. - - Reload - Recharger - MainPage diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts index f00be42..582e3da 100644 --- a/translations/harbour-tooterb-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -114,10 +114,6 @@ 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. Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'istanze. Mastodon fa parte del più ampio Fediverso, permettendo ai suoi utenti di interagire anche con utenti su diverse piattaforme aperte che supportano lo stesso protocollo. - - Reload - Ricarica - MainPage diff --git a/translations/harbour-tooterb-nl.ts b/translations/harbour-tooterb-nl.ts index 5877d47..a8e75f7 100644 --- a/translations/harbour-tooterb-nl.ts +++ b/translations/harbour-tooterb-nl.ts @@ -114,10 +114,6 @@ 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. Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s 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. - - Reload - Herladen - MainPage diff --git a/translations/harbour-tooterb-nl_BE.ts b/translations/harbour-tooterb-nl_BE.ts index 7792bf9..5995b7d 100644 --- a/translations/harbour-tooterb-nl_BE.ts +++ b/translations/harbour-tooterb-nl_BE.ts @@ -114,10 +114,6 @@ 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. Mastodon is e vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van één enkel bedrijf dat uw communicatie monopoliseert. Kiest ne server die ge vertrouwt — dewelken dat ge ook kiest, ge kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociaal netwerk. - - Reload - Herladen - MainPage diff --git a/translations/harbour-tooterb-oc.ts b/translations/harbour-tooterb-oc.ts index ee636dc..40cd237 100644 --- a/translations/harbour-tooterb-oc.ts +++ b/translations/harbour-tooterb-oc.ts @@ -114,10 +114,6 @@ 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. Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu'una sola entrepresa monopolize vòstras comunicacions. Causissètz un servidor que vos fisatz - qualque siá vòstre causida poiretz interagir amb los autres. Tot lo monde pòt montar sa pròpria instància Mastodon e atal participar a construire un malhum mai solid. - - Reload - - MainPage diff --git a/translations/harbour-tooterb-pl.ts b/translations/harbour-tooterb-pl.ts index c1dda8f..ad24059 100644 --- a/translations/harbour-tooterb-pl.ts +++ b/translations/harbour-tooterb-pl.ts @@ -114,10 +114,6 @@ 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 - Załaduj ponownie - MainPage diff --git a/translations/harbour-tooterb-ru.ts b/translations/harbour-tooterb-ru.ts index 79f1a88..87c308c 100644 --- a/translations/harbour-tooterb-ru.ts +++ b/translations/harbour-tooterb-ru.ts @@ -114,10 +114,6 @@ 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. Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети. - - Reload - Перезарядка - MainPage diff --git a/translations/harbour-tooterb-sr.ts b/translations/harbour-tooterb-sr.ts index 39bd8b0..afa4d86 100644 --- a/translations/harbour-tooterb-sr.ts +++ b/translations/harbour-tooterb-sr.ts @@ -114,10 +114,6 @@ 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 diff --git a/translations/harbour-tooterb-sv.ts b/translations/harbour-tooterb-sv.ts index 2f28c5b..6b881d8 100644 --- a/translations/harbour-tooterb-sv.ts +++ b/translations/harbour-tooterb-sv.ts @@ -114,10 +114,6 @@ 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. Mastodon är ett fritt socialt nätverk byggt på öppen källkod. Ett decentraliserat alternativ till kommersiella plattformar. Det undviker riskerna med att ett enda företag monopoliserar din kommunikation. Välj en server som du litar på, oavsett vad du väljer kan du interagera med alla andra. Vem som helst kan köra sin egen Mastodon-instans och delta i det sociala nätverket sömlöst. - - Reload - Läs in igen - MainPage diff --git a/translations/harbour-tooterb-zh_CN.ts b/translations/harbour-tooterb-zh_CN.ts index fa6d895..6025b91 100644 --- a/translations/harbour-tooterb-zh_CN.ts +++ b/translations/harbour-tooterb-zh_CN.ts @@ -114,10 +114,6 @@ 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. Mastodon 是一个自由且开源的社交网络。一个去中心化的商业平台的替代品。它能够避免某个公司垄断你的通讯方式的风险。选择一个你所信任的服务器——无论你选择什么，你都可以和其他人进行互动。任何人都能运行他们自己的 Mastodon 实例，然后无缝加入社交网站。 - - Reload - 重新加载 - MainPage diff --git a/translations/harbour-tooterb.ts b/translations/harbour-tooterb.ts index 80114cf..c040612 100644 --- a/translations/harbour-tooterb.ts +++ b/translations/harbour-tooterb.ts @@ -114,10 +114,6 @@ 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. 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 - Reload - MainPage