Revert "Replace tabs with spaces in messaging app"
This reverts commit 6657dff8cf.
This commit is contained in:
Simon Redman
parent
6657dff8cf
commit
e9d5c9e27e
5 changed files with 393 additions and 0 deletions
|
|
@ -0,0 +1,111 @@
|
||||||
|
/*
|
||||||
|
* Kaidan - A user-friendly XMPP client for every device!
|
||||||
|
*
|
||||||
|
* Copyright (C) 2016-2018 Kaidan developers and contributors
|
||||||
|
* (see the LICENSE file for a full list of copyright authors)
|
||||||
|
*
|
||||||
|
* Kaidan is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* In addition, as a special exception, the author of Kaidan gives
|
||||||
|
* permission to link the code of its release with the OpenSSL
|
||||||
|
* project's "OpenSSL" library (or with modified versions of it that
|
||||||
|
* use the same license as the "OpenSSL" library), and distribute the
|
||||||
|
* linked executables. You must obey the GNU General Public License in
|
||||||
|
* all respects for all of the code used other than "OpenSSL". If you
|
||||||
|
* modify this file, you may extend this exception to your version of
|
||||||
|
* the file, but you are not obligated to do so. If you do not wish to
|
||||||
|
* do so, delete this exception statement from your version.
|
||||||
|
*
|
||||||
|
* Kaidan is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Kaidan. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.6
|
||||||
|
import QtGraphicalEffects 1.0
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
import QtQuick.Controls 2.0 as Controls
|
||||||
|
import org.kde.kirigami 2.0 as Kirigami
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
property bool sentByMe: true
|
||||||
|
property string messageBody
|
||||||
|
property date dateTime
|
||||||
|
property bool isRead: false
|
||||||
|
property string recipientAvatarUrl
|
||||||
|
|
||||||
|
// own messages are on the right, others on the left
|
||||||
|
layoutDirection: sentByMe ? Qt.RightToLeft : Qt.LeftToRight
|
||||||
|
spacing: Kirigami.Units.largeSpacing
|
||||||
|
width: parent.width - Kirigami.Units.largeSpacing * 4
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
|
RoundImage {
|
||||||
|
id: avatar
|
||||||
|
visible: !sentByMe
|
||||||
|
source: recipientAvatarUrl
|
||||||
|
fillMode: Image.PreserveAspectFit
|
||||||
|
mipmap: true
|
||||||
|
height: width
|
||||||
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.2
|
||||||
|
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.2
|
||||||
|
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
|
||||||
|
sourceSize.height: Kirigami.Units.gridUnit * 2.2
|
||||||
|
sourceSize.width: Kirigami.Units.gridUnit * 2.2
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: box
|
||||||
|
Layout.preferredWidth: content.width + Kirigami.Units.gridUnit * 0.9
|
||||||
|
Layout.preferredHeight: content.height + Kirigami.Units.gridUnit * 0.6
|
||||||
|
|
||||||
|
color: sentByMe ? Kirigami.Theme.complementaryTextColor : Kirigami.Theme.highlightColor
|
||||||
|
radius: Kirigami.Units.smallSpacing * 2
|
||||||
|
|
||||||
|
layer.enabled: box.visible
|
||||||
|
layer.effect: DropShadow {
|
||||||
|
verticalOffset: Kirigami.Units.gridUnit * 0.08
|
||||||
|
horizontalOffset: Kirigami.Units.gridUnit * 0.08
|
||||||
|
color: Kirigami.Theme.disabledTextColor
|
||||||
|
samples: 10
|
||||||
|
spread: 0.1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
id: content
|
||||||
|
spacing: 0
|
||||||
|
anchors.centerIn: box
|
||||||
|
|
||||||
|
Controls.Label {
|
||||||
|
text: messageBody
|
||||||
|
textFormat: Text.PlainText
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
color: sentByMe ? Kirigami.Theme.buttonTextColor : Kirigami.Theme.complementaryTextColor
|
||||||
|
|
||||||
|
Layout.maximumWidth: root.width - Kirigami.Units.gridUnit * 6
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
Controls.Label {
|
||||||
|
id: dateLabel
|
||||||
|
text: Qt.formatDateTime(dateTime, "dd. MMM yyyy, hh:mm")
|
||||||
|
color: Kirigami.Theme.disabledTextColor
|
||||||
|
font.pixelSize: Kirigami.Units.gridUnit * 0.8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,85 @@
|
||||||
|
/**
|
||||||
|
* Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License or (at your option) version 3 or any later version
|
||||||
|
* accepted by the membership of KDE e.V. (or its successor approved
|
||||||
|
* by the membership of KDE e.V.), which shall act as a proxy
|
||||||
|
* defined in Section 14 of version 3 of the license.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.1
|
||||||
|
import QtQuick.Controls 2.1
|
||||||
|
import QtQuick.Layouts 1.1
|
||||||
|
import org.kde.people 1.0
|
||||||
|
import org.kde.kirigami 2.4 as Kirigami
|
||||||
|
import org.kde.kdeconnect.sms 1.0
|
||||||
|
|
||||||
|
Kirigami.ScrollablePage
|
||||||
|
{
|
||||||
|
id: page
|
||||||
|
property alias personUri: person.personUri
|
||||||
|
readonly property QtObject person: PersonData {
|
||||||
|
id: person
|
||||||
|
}
|
||||||
|
property QtObject device
|
||||||
|
property string conversationId
|
||||||
|
|
||||||
|
property string phoneNumber
|
||||||
|
title: person.person && person.person.name ? person.person.name : phoneNumber
|
||||||
|
|
||||||
|
ListView {
|
||||||
|
model: QSortFilterProxyModel {
|
||||||
|
id: model
|
||||||
|
sortOrder: Qt.AscendingOrder
|
||||||
|
sortRole: ConversationModel.DateRole
|
||||||
|
sourceModel: ConversationModel {
|
||||||
|
deviceId: device.id()
|
||||||
|
threadId: page.conversationId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
spacing: Kirigami.Units.largeSpacing
|
||||||
|
|
||||||
|
delegate: ChatMessage {
|
||||||
|
messageBody: model.display
|
||||||
|
sentByMe: model.fromMe
|
||||||
|
dateTime: new Date(model.date)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the view to start at the bottom of the page and track new elements if it was not manually scrolled up
|
||||||
|
currentIndex: atYEnd ?
|
||||||
|
count - 1 :
|
||||||
|
currentIndex
|
||||||
|
}
|
||||||
|
|
||||||
|
footer: RowLayout {
|
||||||
|
enabled: page.device
|
||||||
|
TextField {
|
||||||
|
id: message
|
||||||
|
Layout.fillWidth: true
|
||||||
|
placeholderText: i18n("Say hi...")
|
||||||
|
onAccepted: {
|
||||||
|
console.log("sending sms", page.phoneNumber)
|
||||||
|
model.sourceModel.sendReplyToConversation(message.text)
|
||||||
|
text = ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Button {
|
||||||
|
text: "Send"
|
||||||
|
onClicked: {
|
||||||
|
message.accepted()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,108 @@
|
||||||
|
/**
|
||||||
|
* Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License or (at your option) version 3 or any later version
|
||||||
|
* accepted by the membership of KDE e.V. (or its successor approved
|
||||||
|
* by the membership of KDE e.V.), which shall act as a proxy
|
||||||
|
* defined in Section 14 of version 3 of the license.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.5
|
||||||
|
import QtQuick.Controls 2.1
|
||||||
|
import QtQuick.Layouts 1.1
|
||||||
|
import org.kde.people 1.0
|
||||||
|
import org.kde.plasma.core 2.0 as Core
|
||||||
|
import org.kde.kirigami 2.2 as Kirigami
|
||||||
|
import org.kde.kdeconnect 1.0
|
||||||
|
import org.kde.kdeconnect.sms 1.0
|
||||||
|
|
||||||
|
Kirigami.ScrollablePage
|
||||||
|
{
|
||||||
|
footer: ComboBox {
|
||||||
|
id: devicesCombo
|
||||||
|
enabled: count > 0
|
||||||
|
model: DevicesSortProxyModel {
|
||||||
|
id: devicesModel
|
||||||
|
//TODO: make it possible to sort only if they can do sms
|
||||||
|
sourceModel: DevicesModel { displayFilter: DevicesModel.Paired | DevicesModel.Reachable }
|
||||||
|
onRowsInserted: if (devicesCombo.currentIndex < 0) {
|
||||||
|
devicesCombo.currentIndex = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
textRole: "display"
|
||||||
|
}
|
||||||
|
|
||||||
|
Label {
|
||||||
|
text: i18n("No devices available")
|
||||||
|
anchors.centerIn: parent
|
||||||
|
visible: !devicesCombo.enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly property QtObject device: devicesCombo.currentIndex >= 0 ? devicesModel.data(devicesModel.index(devicesCombo.currentIndex, 0), DevicesModel.DeviceRole) : null
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: chatView
|
||||||
|
ConversationDisplay {}
|
||||||
|
}
|
||||||
|
|
||||||
|
ListView {
|
||||||
|
id: view
|
||||||
|
currentIndex: 0
|
||||||
|
|
||||||
|
model: QSortFilterProxyModel {
|
||||||
|
sortOrder: Qt.DescendingOrder
|
||||||
|
sortRole: ConversationListModel.DateRole
|
||||||
|
filterCaseSensitivity: Qt.CaseInsensitive
|
||||||
|
sourceModel: ConversationListModel {
|
||||||
|
deviceId: device ? device.id() : ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
header: TextField {
|
||||||
|
id: filter
|
||||||
|
placeholderText: i18n("Filter...")
|
||||||
|
width: parent.width
|
||||||
|
onTextChanged: {
|
||||||
|
view.model.setFilterFixedString(filter.text);
|
||||||
|
view.currentIndex = 0
|
||||||
|
}
|
||||||
|
Keys.onUpPressed: view.currentIndex = Math.max(view.currentIndex-1, 0)
|
||||||
|
Keys.onDownPressed: view.currentIndex = Math.min(view.currentIndex+1, view.count-1)
|
||||||
|
onAccepted: {
|
||||||
|
view.currentItem.startChat()
|
||||||
|
}
|
||||||
|
Shortcut {
|
||||||
|
sequence: "Ctrl+F"
|
||||||
|
onActivated: filter.forceActiveFocus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delegate: Kirigami.BasicListItem
|
||||||
|
{
|
||||||
|
hoverEnabled: true
|
||||||
|
|
||||||
|
label: i18n("<b>%1</b> <br> %2", display, toolTip)
|
||||||
|
icon: decoration
|
||||||
|
function startChat() {
|
||||||
|
applicationWindow().pageStack.push(chatView, {
|
||||||
|
personUri: model.personUri,
|
||||||
|
phoneNumber: address,
|
||||||
|
conversationId: model.conversationId,
|
||||||
|
device: device})
|
||||||
|
}
|
||||||
|
onClicked: { startChat(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
/*
|
||||||
|
* Kaidan - A user-friendly XMPP client for every device!
|
||||||
|
*
|
||||||
|
* Copyright (C) 2017-2018 Kaidan developers and contributors
|
||||||
|
* (see the LICENSE file for a full list of copyright authors)
|
||||||
|
*
|
||||||
|
* Kaidan is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* In addition, as a special exception, the author of Kaidan gives
|
||||||
|
* permission to link the code of its release with the OpenSSL
|
||||||
|
* project's "OpenSSL" library (or with modified versions of it that
|
||||||
|
* use the same license as the "OpenSSL" library), and distribute the
|
||||||
|
* linked executables. You must obey the GNU General Public License in
|
||||||
|
* all respects for all of the code used other than "OpenSSL". If you
|
||||||
|
* modify this file, you may extend this exception to your version of
|
||||||
|
* the file, but you are not obligated to do so. If you do not wish to
|
||||||
|
* do so, delete this exception statement from your version.
|
||||||
|
*
|
||||||
|
* Kaidan is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Kaidan. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.6
|
||||||
|
import QtGraphicalEffects 1.0
|
||||||
|
|
||||||
|
Image {
|
||||||
|
id: img
|
||||||
|
property bool isRound: true
|
||||||
|
|
||||||
|
layer.enabled: isRound
|
||||||
|
layer.effect: OpacityMask {
|
||||||
|
maskSource: Item {
|
||||||
|
width: img.paintedWidth
|
||||||
|
height: img.paintedHeight
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: Math.min(img.width, img.height)
|
||||||
|
height: width
|
||||||
|
radius: Math.min(width, height)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
/**
|
||||||
|
* Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License or (at your option) version 3 or any later version
|
||||||
|
* accepted by the membership of KDE e.V. (or its successor approved
|
||||||
|
* by the membership of KDE e.V.), which shall act as a proxy
|
||||||
|
* defined in Section 14 of version 3 of the license.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.1
|
||||||
|
import org.kde.kirigami 2.2 as Kirigami
|
||||||
|
import org.kde.kdeconnect 1.0
|
||||||
|
|
||||||
|
Kirigami.ApplicationWindow
|
||||||
|
{
|
||||||
|
id: root
|
||||||
|
visible: true
|
||||||
|
width: 800
|
||||||
|
height: 600
|
||||||
|
|
||||||
|
header: Kirigami.ApplicationHeader {}
|
||||||
|
|
||||||
|
pageStack.initialPage: ConversationList {
|
||||||
|
title: i18n("KDE Connect SMS")
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue