diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 50893bdd66e944aa44ae6ca9dc0f75df5f02cbf6..a791ab768217d3ad7cdca876598e21f79fbd83a9 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -43,11 +43,6 @@ Page { }) } - /* busy = true; - checked = false; - timer1.start() - - }*/ Timer { id: timer1 interval: 4700 @@ -79,47 +74,47 @@ Page { Repeater { model: ListModel { ListElement { - name: "Pleroma Authors" - desc: qsTr("Pleroma Authors") - mastodon: "" - mail: "" + name: qsTr("Pleroma Authors") + desc: qsTr("Forking Tooter to Kyclos") + webfinger: "" + url: "https://pleroma.social/" } ListElement { name: "Duško Angirević" desc: qsTr("Tooter developer") - mastodon: "dysko@mastodon.social" - mail: "" + webfinger: "dysko@mastodon.social" + url: "" } ListElement { name: "Miodrag Nikolić" desc: qsTr("visual identity") - mastodon: "" - mail: "micotakis@gmail.com" + webfinger: "" + url: "mailto:micotakis@gmail.com" } ListElement { name: "Quentin PAGÈS / Quenti ♏" desc: qsTr("Occitan & French translation") - mastodon: "Quenti@framapiaf.org" - mail: "" + webfinger: "Quenti@framapiaf.org" + url: "" } ListElement { name: "André Koot" desc: qsTr("Dutch translation") - mastodon: "meneer@mastodon.social" - mail: "https://twitter.com/meneer" + webfinger: "meneer@mastodon.social" + url: "https://twitter.com/meneer" } ListElement { name: "Carlos Gonzalez / Caballlero" desc: qsTr("Español translation") - mastodon: "" - mail: "carlosgonz@protonmail.com" + webfinger: "" + url: "mailto:carlosgonz@protonmail.com" } ListElement { name: "Mohamed-Touhami MAHDI" desc: qsTr("Added README file") - mastodon: "dragnucs@touha.me" - mail: "touhami@touha.me" + webfinger: "dragnucs@touha.me" + url: "mailto:touhami@touha.me" } } @@ -132,22 +127,22 @@ Page { verticalCenter: parent.verticalCenter right: parent.right } - icon.source: "image://theme/" + (model.mastodon !== "" ? "icon-m-person" : "icon-m-mail") + "?" + (pressed + icon.source: "image://theme/" + (model.webfinger !== "" ? "icon-m-outline-chat" : "icon-m-link") + "?" + (pressed ? Theme.highlightColor : Theme.primaryColor) onClicked: { - if (model.mastodon !== ""){ + if (model.webfinger !== ""){ var m = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); pageStack.push(Qt.resolvedUrl("Conversation.qml"), { toot_id: 0, title: model.name, - description: '@'+model.mastodon, + description: '@'+model.webfinger, avatar: "", mdl: m, type: "reply" }) - } else if (model.mail !== ""){ - Qt.openUrlExternally("mailto:"+model.mail); + } else { + Qt.openUrlExternally(model.url); } } }