diff --git a/smsapp/main.cpp b/smsapp/main.cpp index 01209f6e..bb73ee89 100644 --- a/smsapp/main.cpp +++ b/smsapp/main.cpp @@ -1,64 +1,72 @@ /** * Copyright (C) 2018 Aleix Pol Gonzalez * Copyright (C) 2018 Simon Redman * * 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 . */ #include "conversationmodel.h" #include "conversationlistmodel.h" #include "kdeconnect-version.h" #include #include #include #include #include #include #include #include int main(int argc, char *argv[]) { QApplication app(argc, argv); KAboutData aboutData("org.kde.kdeconnect.sms", i18n("SMS Instant Messaging"), QStringLiteral(KDECONNECT_VERSION_STRING), i18n("KDE Connect SMS"), KAboutLicense::GPL, i18n("(c) 2018, Aleix Pol Gonzalez")); aboutData.addAuthor(i18n("Aleix Pol Gonzalez"), {}, "aleixpol@kde.org"); aboutData.addAuthor(i18n("Nicolas Fella"), {}, "nicolas.fella@gmx.de"); aboutData.addAuthor(i18n("Simon Redman"), {}, "simon@ergotech.com"); KAboutData::setApplicationData(aboutData); + QString initialMessage; + { QCommandLineParser parser; aboutData.setupCommandLine(&parser); parser.addVersionOption(); parser.addHelpOption(); + parser.addOption(QCommandLineOption(QStringLiteral("message"), i18n("Send a message"), i18n("message"))); parser.process(app); aboutData.processCommandLine(&parser); + + if (parser.isSet(QStringLiteral("message"))) { + initialMessage = parser.value(QStringLiteral("message")); + } } KDBusService service(KDBusService::Unique); qmlRegisterType("org.kde.kdeconnect.sms", 1, 0, "QSortFilterProxyModel"); qmlRegisterType("org.kde.kdeconnect.sms", 1, 0, "ConversationModel"); qmlRegisterType("org.kde.kdeconnect.sms", 1, 0, "ConversationListModel"); QQmlApplicationEngine engine; engine.rootContext()->setContextObject(new KLocalizedContext(&engine)); + engine.rootContext()->setContextProperty(QStringLiteral("_initialMessage"), QVariant(initialMessage)); engine.load(QUrl("qrc:/qml/main.qml")); return app.exec(); } diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml index 3b0ec9d8..ed59cdf1 100644 --- a/smsapp/qml/ConversationDisplay.qml +++ b/smsapp/qml/ConversationDisplay.qml @@ -1,151 +1,160 @@ /** * Copyright (C) 2018 Aleix Pol Gonzalez * Copyright (C) 2018 Nicolas Fella * Copyright (C) 2018 Simon Redman * * 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 . */ import QtQuick 2.1 import QtQuick.Controls 2.2 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 bool deviceConnected property string deviceId - property int conversationId +// property QtObject device + property string conversationId + property string initialMessage property string phoneNumber title: person.person && person.person.name ? person.person.name : phoneNumber + Component.onCompleted: { + if (initialMessage.length > 0) { + message.text = initialMessage; + initialMessage = "" + } + } + /** * Build a chat message which is representative of all chat messages * * In other words, one which I can use to get a reasonable height guess */ ChatMessage { id: genericMessage messageBody: "Generic Message Body" dateTime: new Date('2000-0-0') visible: false enabled: false } function sendMessage() { model.sourceModel.sendReplyToConversation(message.text) message.text = "" } ListView { id: viewport model: QSortFilterProxyModel { id: model sortOrder: Qt.AscendingOrder sortRole: ConversationModel.DateRole sourceModel: ConversationModel { deviceId: page.deviceId threadId: page.conversationId } } spacing: Kirigami.Units.largeSpacing delegate: ChatMessage { messageBody: model.display sentByMe: model.fromMe dateTime: new Date(model.date) ListView.onAdd: { if (index == viewport.count - 1) // This message is being inserted at the newest position // We want to scroll to show it if the user is "almost" looking at it // Define some fudge area. If the message is being drawn offscreen but within // this distance, we move to show it anyway. // Selected to be genericMessage.height because that value scales for different // font sizes / DPI / etc. -- Better ideas are welcome! // Double the value works nicely var offscreenFudge = 2 * genericMessage.height var viewportYBottom = viewport.contentY + viewport.height if (y < viewportYBottom + genericMessage.height) { viewport.currentIndex = index } } } onMovementEnded: { // Unset the highlightRangeMode if it was set previously highlightRangeMode = ListView.ApplyRange highlightMoveDuration: -1 // "Re-enable" the highlight animation if (atYBeginning) { // "Lock" the view to the message currently at the beginning of the view // This prevents the view from snapping to the top of the messages we are about to request currentIndex = 0 // Index 0 is the beginning of the view preferredHighlightBegin = visibleArea.yPosition preferredHighlightEnd = preferredHighlightBegin + currentItem.height highlightRangeMode = ListView.StrictlyEnforceRange highlightMoveDuration = 1 // This is not ideal: I would like to disable the highlight animation altogether // Get more messages model.sourceModel.requestMoreMessages() } } } footer: RowLayout { enabled: page.deviceConnected ScrollView { Layout.maximumHeight: page.height / 3 Layout.fillWidth: true Layout.fillHeight: true clip: true TextArea { id: message Layout.fillWidth: true wrapMode: TextEdit.Wrap placeholderText: i18n("Say hi...") Keys.onPressed: { if ((event.key == Qt.Key_Return) && !(event.modifiers & Qt.ShiftModifier)) { sendMessage() event.accepted = true } } } } Button { text: "Send" onClicked: { sendMessage() } } } } diff --git a/smsapp/qml/ConversationList.qml b/smsapp/qml/ConversationList.qml index 0cc8e0e9..0c9f2e96 100644 --- a/smsapp/qml/ConversationList.qml +++ b/smsapp/qml/ConversationList.qml @@ -1,139 +1,156 @@ /** * Copyright (C) 2018 Aleix Pol Gonzalez * Copyright (C) 2018 Nicolas Fella * Copyright (C) 2018 Simon Redman * * 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 . */ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import org.kde.people 1.0 -import org.kde.kirigami 2.2 as Kirigami +import org.kde.kirigami 2.4 as Kirigami import org.kde.kdeconnect 1.0 import org.kde.kdeconnect.sms 1.0 Kirigami.ScrollablePage { id: page + property string initialMessage + + header: Kirigami.InlineMessage { + Layout.fillWidth: true + visible: page.initialMessage.length > 0 + text: i18n("Choose recipient") + + actions: [ + Kirigami.Action { + iconName: "dialog-cancel" + text: "Cancel" + onTriggered: initialMessage = "" + } + ] + } + footer: ComboBox { id: devicesCombo enabled: count > 0 model: DevicesSortProxyModel { id: devicesModel //TODO: make it possible to filter 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 bool deviceConnected: devicesCombo.enabled readonly property QtObject device: devicesCombo.currentIndex >= 0 ? devicesModel.data(devicesModel.index(devicesCombo.currentIndex, 0), DevicesModel.DeviceRole) : null readonly property alias lastDeviceId: conversationListModel.deviceId Component { id: chatView ConversationDisplay { deviceId: page.lastDeviceId deviceConnected: page.deviceConnected } } ListView { id: view currentIndex: 0 model: QSortFilterProxyModel { sortOrder: Qt.DescendingOrder sortRole: ConversationListModel.DateRole filterCaseSensitivity: Qt.CaseInsensitive sourceModel: ConversationListModel { id: conversationListModel deviceId: device ? device.id() : "" } } header: TextField { /** * Used as the filter of the list of messages */ id: filter placeholderText: i18n("Filter...") width: parent.width z: 10 onTextChanged: { view.model.setFilterFixedString(filter.text); view.currentIndex = 0 } onAccepted: { view.currentItem.startChat() } Keys.onReturnPressed: { event.accepted = true filter.onAccepted() } Keys.onEscapePressed: { event.accepted = filter.text != "" filter.text = "" } Shortcut { sequence: "Ctrl+F" onActivated: filter.forceActiveFocus() } } headerPositioning: ListView.OverlayHeader Keys.forwardTo: [headerItem] delegate: Kirigami.BasicListItem { hoverEnabled: true label: i18n("%1
%2", display, toolTip) icon: decoration function startChat() { applicationWindow().pageStack.push(chatView, { personUri: model.personUri, phoneNumber: address, conversationId: model.conversationId, - }) + initialMessage: page.initialMessage, + device: device}) + initialMessage = "" } onClicked: { startChat(); view.currentIndex = index } // Keep the currently-open chat highlighted even if this element is not focused highlighted: chatView.conversationId == model.conversationId } Component.onCompleted: { currentIndex = -1 focus = true } - } } diff --git a/smsapp/qml/main.qml b/smsapp/qml/main.qml index e115f30a..611d2865 100644 --- a/smsapp/qml/main.qml +++ b/smsapp/qml/main.qml @@ -1,37 +1,38 @@ /** * Copyright (C) 2018 Aleix Pol Gonzalez * Copyright (C) 2018 Nicolas Fella * Copyright (C) 2018 Simon Redman * * 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 . */ 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 pageStack.initialPage: ConversationList { title: i18n("KDE Connect SMS") + initialMessage: _initialMessage } }