From 6112badb087e424d6a6f82301922ccd2c93e178c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 22 May 2021 15:19:44 +0200 Subject: [PATCH] Reenable userInfo settings menu --- resources/qml/MatrixTextField.qml | 1 + resources/qml/RoomList.qml | 82 ++++++++++++++++++++++++++++--- src/ui/NhekoGlobalObject.cpp | 5 ++ src/ui/NhekoGlobalObject.h | 1 + 4 files changed, 82 insertions(+), 7 deletions(-) diff --git a/resources/qml/MatrixTextField.qml b/resources/qml/MatrixTextField.qml index 2ba648b5..3c660bac 100644 --- a/resources/qml/MatrixTextField.qml +++ b/resources/qml/MatrixTextField.qml @@ -11,6 +11,7 @@ TextField { id: input palette: Nheko.colors + color: Nheko.colors.text Rectangle { id: blueBar diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index cde744c5..40669eda 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later +import Qt.labs.platform 1.1 as Platform import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.3 @@ -206,20 +207,87 @@ Page { spacing: 0 Rectangle { + id: userInfoPanel + + function openUserProfile() { + Nheko.updateUserProfile(); + var userProfile = userProfileComponent.createObject(timelineRoot, { + "profile": Nheko.currentUser + }); + userProfile.show(); + } + color: Nheko.colors.window Layout.fillWidth: true Layout.alignment: Qt.AlignBottom Layout.preferredHeight: userInfoGrid.implicitHeight + 2 * Nheko.paddingMedium Layout.minimumHeight: 40 - TapHandler { - onSingleTapped: { - Nheko.updateUserProfile(); - var userProfile = userProfileComponent.createObject(timelineRoot, { - "profile": Nheko.currentUser - }); - userProfile.show(); + ApplicationWindow { + id: statusDialog + + modality: Qt.NonModal + flags: Qt.Dialog + title: qsTr("Status Message") + width: 350 + height: fontMetrics.lineSpacing * 7 + + ColumnLayout { + anchors.margins: Nheko.paddingLarge + anchors.fill: parent + + Label { + color: Nheko.colors.text + text: qsTr("Enter your status message:") + } + + MatrixTextField { + id: statusInput + + Layout.fillWidth: true + } + } + + footer: DialogButtonBox { + standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel + onAccepted: { + Nheko.setStatusMessage(statusInput.text); + statusDialog.close(); + } + onRejected: { + statusDialog.close(); + } + } + + } + + Platform.Menu { + id: userInfoMenu + + Platform.MenuItem { + text: qsTr("Profile settings") + onTriggered: userInfoPanel.openUserProfile() + } + + Platform.MenuItem { + text: qsTr("Set status message") + onTriggered: statusDialog.show() + } + + } + + TapHandler { + acceptedButtons: Qt.LeftButton + onSingleTapped: userInfoPanel.openUserProfile() + onLongPressed: userInfoMenu.open() + gesturePolicy: TapHandler.ReleaseWithinBounds + } + + TapHandler { + acceptedButtons: Qt.RightButton + onSingleTapped: userInfoMenu.open() + gesturePolicy: TapHandler.ReleaseWithinBounds } RowLayout { diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp index 70abfbb8..fd572b4b 100644 --- a/src/ui/NhekoGlobalObject.cpp +++ b/src/ui/NhekoGlobalObject.cpp @@ -100,6 +100,11 @@ Nheko::openLink(QString link) const QDesktopServices::openUrl(url); } } +void +Nheko::setStatusMessage(QString msg) const +{ + ChatPage::instance()->setStatus(msg); +} UserProfile * Nheko::currentUser() const diff --git a/src/ui/NhekoGlobalObject.h b/src/ui/NhekoGlobalObject.h index fc35fe22..593514fa 100644 --- a/src/ui/NhekoGlobalObject.h +++ b/src/ui/NhekoGlobalObject.h @@ -39,6 +39,7 @@ public: UserProfile *currentUser() const; Q_INVOKABLE void openLink(QString link) const; + Q_INVOKABLE void setStatusMessage(QString msg) const; public slots: void updateUserProfile();