Commit 074fcddb authored by Linus Jahn's avatar Linus Jahn

Remove diaspora login option

parent 10b1b868
......@@ -9,6 +9,7 @@ Copyright: 2016-2019, Linus Jahn <lnj@kaidan.im>
2016-2019, Jonah Brüchert <jbb@kaidan.im>
2017-2019, Ilya Bizyaev <bizyaev@zoho.com>
2018, Allan Nordhøy <epost@anotheragency.no>
2019, Xavier <xavi@delape.net>
2018, Nicolas Fella <nicolas.fella@gmx.de>
2018, Bjarne Roß <ross.b@freenet.de>
2018, SohnyBohny <sohny.bean@streber24.de>
......@@ -38,10 +39,8 @@ Files: src/StatusBar.cpp
src/StatusBar.h
src/singleapp/*
src/hsluv-c/*
data/images/xmpp.svg
utils/generate-license.py
Copyright: 2016, J-P Nurmi <jpnurmi@gmail.com>
2007, Raja Sandhu, XMPP Standards Foundation
2018-2019, Linus Jahn <lnj@kaidan.im>
2015-2018, Itay Grudev <itay+github.com@grudev.com>
2015, Alexei Boronine <alexei@boronine.com>
......@@ -56,13 +55,10 @@ Copyright: 2017, Konstantinos Sideris <siderisk@auth.gr>
License: GPL-3+
Files: data/images/message_checkmark.svg
data/images/diaspora.svg
Copyright: 2014, Michael Kurz <betheg@bitcloner.org>
2016, Gregor Santner <gsantner@mailbox.org>
License: GPL-3+
Comment:
message_checkmark.svg: Originally from conversations, optimized using SVGO by LNJ <git@lnj.li>
diaspora.svg: Originally from dandelion, <https://github.com/diaspora-for-android/dandelion>
Files: misc/kaidan.svg
misc/kaidan-small-margin.svg
......
<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 187.50293 187.50293"><circle cx="93.852" cy="93.806" r="93.678" fill="#207be6"/><path d="M37.984 37.837h113.43v112.806H37.984zm141.788 141.788h113.43V292.43h-113.43z" fill="none"/><path d="M107.337 133.213l-9.102-12.714c-2.43-3.403-4.405-6.05-4.51-6.05-.113 0-3.932 5.143-9.055 12.166a793.067 793.067 0 0 1-8.951 12.165c-.142 0-17.582-12.288-17.63-12.41-.018-.067 3.923-5.861 8.763-12.866 4.84-7.013 8.8-12.855 8.8-12.997 0-.217-1.569-.766-13.876-4.868L47.74 90.951c-.123-.048.596-2.486 3.091-10.341 1.796-5.663 3.3-10.332 3.346-10.389.048-.057 6.683 2.07 14.746 4.726 8.054 2.647 14.708 4.812 14.793 4.812.076 0 .17-.123.208-.284.029-.142.095-6.995.152-15.237.056-8.224.141-15.03.189-15.124.085-.114 2.344-.142 10.653-.142 5.804 0 10.615.038 10.681.094.095.057.255 4.585.53 14.746.434 16.694.444 16.92.708 16.92.095 0 6.485-2.136 14.189-4.754a480.141 480.141 0 0 1 14.084-4.65c.151.179 6.475 20.738 6.39 20.814-.038.047-6.466 2.24-14.274 4.887-10.747 3.648-14.216 4.868-14.244 5.019-.029.113 3.667 5.643 8.374 12.515 4.632 6.768 8.394 12.364 8.375 12.42a916.375 916.375 0 0 1-17.506 12.894c-.056 0-2.259-2.997-4.887-6.664z" fill="#fafafa"/></svg>
\ No newline at end of file
......@@ -2,9 +2,7 @@
<qresource prefix="/images/">
<file alias="banner.png">banner.png</file>
<file alias="chat.png">chat.png</file>
<file alias="diaspora.svg">diaspora.svg</file>
<file alias="message_checkmark.svg">message_checkmark.svg</file>
<file alias="xmpp.svg">xmpp.svg</file>
<file alias="kaidan.svg">kaidan.svg</file>
</qresource>
<qresource prefix="/org/kde/kirigami/icons/">
......
<svg xmlns="http://www.w3.org/2000/svg" height="181.44" viewBox="0 0 176.486 181.437" width="176.49"><linearGradient id="a" gradientUnits="userSpaceOnUse" x2="-1807.2" gradientTransform="translate(1916)" y1="125.86" x1="-1807.2"><stop stop-color="#1b3967" offset=".011"/><stop stop-color="#13b5ea" offset=".467"/><stop stop-color="#002b5c" offset=".995"/></linearGradient><path d="M136.29 14.189c.077 1.313-1.786.968-1.786 2.293 0 38.551-44.72 96.831-89.847 108.19v1.182c59.957-5.51 126.73-66.8 128.24-125.85l-36.6 14.189z" fill="url(#a)"/><path d="M120.23 17.96c.077 1.313.121 2.633.121 3.958 0 38.551-30.7 90.497-75.827 101.86v1.637c59.065-3.823 105.81-63.023 105.81-109.2a67.1 67.1 0 0 0-.371-7.056l-29.73 8.796z" fill="#E96D1F"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x2="-1073.2" gradientTransform="matrix(-1 0 0 1 -1008.2 0)" y1="126.85" x1="-1073.2"><stop stop-color="#1b3967" offset=".011"/><stop stop-color="#13b5ea" offset=".467"/><stop stop-color="#002b5c" offset=".995"/></linearGradient><path d="M36.599 14.189c-.077 1.313 1.787.968 1.787 2.293 0 38.551 46.558 97.366 91.688 108.73v1.639C70.121 121.331 1.514 59.051.004.001L36.603 14.19z" fill="url(#b)"/><path d="M54.731 18.932a68.401 68.401 0 0 0-.12 3.957c0 38.551 30.699 90.497 75.827 101.86v1.639c-59.044-2.79-105.81-63.024-105.81-109.2 0-2.375.128-4.729.371-7.056l29.73 8.798z" fill="#A0CE67"/><path d="M24.713 9.583l7.617 2.722a84.24 84.24 0 0 0-.066 3.225c0 41.219 37.271 98.204 87.272 107.12 3.245 1.088 7.538 2.077 10.932 2.931v1.638c-65.254-5.56-111.1-71.866-105.76-117.64z" fill="#439639"/><path d="M150.34 8.76l-7.833 2.625c.041.963.191 2.203.191 3.173 0 41.219-37.272 98.205-87.274 107.12-3.243 1.089-7.538 2.077-10.93 2.932v1.639c68.344-8.66 111.18-71.719 105.84-117.49z" fill="#D9541E"/><path d="M14.576 166.71L1.188 152.06h11.643l9.127 10.268 9.129-10.268H42.73l-13.387 14.646 14.401 14.728h-12.09l-9.697-10.67-9.693 10.67H.172l14.404-14.73zm32.52-14.65h13.836l10.183 18.905 10.183-18.905H95.13v29.374h-8.762v-21.096h-.08l-11.807 21.096h-6.733l-11.807-21.096h-.082v21.096h-8.764v-29.37zm54.154 0h24.546c8.559 0 10.628 4.302 10.628 10.063v2.516c0 4.381-1.908 9.41-8.275 9.41h-17.894v7.385h-9.005v-29.38zm9 14.69h13.997c2.109 0 2.924-1.377 2.924-3.123v-1.135c0-1.99-.976-3.127-3.694-3.127H110.25v7.38zm31.06-14.69h24.546c8.561 0 10.63 4.302 10.63 10.063v2.516c0 4.381-1.907 9.41-8.275 9.41h-17.893v7.385h-9.008v-29.38zm9.01 14.69h13.996c2.11 0 2.922-1.377 2.922-3.123v-1.135c0-1.99-.974-3.127-3.693-3.127H150.32v7.38z"/></svg>
\ No newline at end of file
......@@ -61,16 +61,6 @@ Kirigami.Page {
Controls.Label {
id: jidLabel
text: qsTr("Your Jabber-ID:")
states: [
State {
name: "diaspora"
PropertyChanges {
target: jidLabel
text: qsTr("Your diaspora*-ID:")
}
}
]
}
Controls.TextField {
id: jidField
......@@ -78,16 +68,6 @@ Kirigami.Page {
placeholderText: qsTr("user@example.org")
Layout.fillWidth: true
selectByMouse: true
states: [
State {
name: "diaspora"
PropertyChanges {
target: jidField
placeholderText: qsTr("user@diaspora.pod")
}
}
]
}
// Password field
......@@ -136,42 +116,9 @@ Kirigami.Page {
}
}
RowLayout {
id: serviceBar
anchors.horizontalCenter: parent.horizontalCenter
Controls.ToolButton {
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.75
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.75
onClicked: {
jidField.state = "diaspora";
jidLabel.state = "diaspora";
}
Image {
source: kaidan.getResourcePath("images/diaspora.svg")
fillMode: Image.PreserveAspectFit
mipmap: true
height: parent.height - Kirigami.Units.smallSpacing
}
}
Controls.ToolButton {
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.75
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.75
padding: Kirigami.Units.smallSpacing
onClicked: {
jidField.state = "";
jidLabel.state = "";
}
Image {
source: kaidan.getResourcePath("images/xmpp.svg")
fillMode: Image.PreserveAspectFit
mipmap: true
height: parent.height - Kirigami.Units.smallSpacing
}
}
// placeholder
Item {
Layout.preferredHeight: Kirigami.Units.gridUnit * 3
}
}
......
......@@ -270,12 +270,10 @@ def main():
),
CopyrightTarget(
files = ["src/StatusBar.cpp", "src/StatusBar.h", "src/singleapp/*",
"src/hsluv-c/*", "data/images/xmpp.svg",
"utils/generate-license.py"],
"src/hsluv-c/*", "utils/generate-license.py"],
licenseName = "MIT",
authorList = {
"J-P Nurmi <jpnurmi@gmail.com>": CopyrightAuthor(years = "2016"),
"Raja Sandhu, XMPP Standards Foundation": CopyrightAuthor(years = "2007"),
"Linus Jahn <lnj@kaidan.im>": CopyrightAuthor(years = "2018-2019"),
"Itay Grudev <itay+github.com@grudev.com>": CopyrightAuthor(years = "2015-2018"),
"Alexei Boronine <alexei@boronine.com>": CopyrightAuthor(years = "2015"),
......@@ -291,14 +289,12 @@ def main():
},
),
CopyrightTarget(
files = ["data/images/message_checkmark.svg", "data/images/diaspora.svg"],
files = ["data/images/message_checkmark.svg"],
licenseName = "GPL-3+",
authorList = {
"Michael Kurz <betheg@bitcloner.org>": CopyrightAuthor(years = "2014"),
"Gregor Santner <gsantner@mailbox.org>": CopyrightAuthor(years = "2016"),
},
comment = "message_checkmark.svg: Originally from conversations, optimized using SVGO by LNJ <git@lnj.li>\n"
"diaspora.svg: Originally from dandelion, <https://github.com/diaspora-for-android/dandelion>"
comment = "message_checkmark.svg: Originally from conversations, optimized using SVGO by LNJ <git@lnj.li>"
),
CopyrightTarget(
files = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment