diff options
49 files changed, 13 insertions, 52 deletions
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index 07e68e10..f53dfe3a 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index e1b5c129..993ccbea 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml index 58805f48..5fcc0ada 100644 --- a/resources/qml/EncryptionIndicator.qml +++ b/resources/qml/EncryptionIndicator.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml index 76cc0b42..f25705f0 100644 --- a/resources/qml/ImageButton.qml +++ b/resources/qml/ImageButton.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml index dfe7122d..073956f4 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index 7b651bc0..cf3013ba 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./voip" diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index 49d648b8..baf6b800 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" @@ -232,6 +231,13 @@ ScrollView { displayName: modelData ? modelData.userName : "" userid: modelData ? modelData.userId : "" onClicked: chat.model.openUserProfile(modelData.userId) + ToolTip.visible: avatarHover.hovered + ToolTip.text: userid + + HoverHandler { + id: avatarHover + } + } Connections { @@ -247,10 +253,10 @@ ScrollView { text: modelData ? TimelineManager.escapeEmoji(modelData.userName) : "" color: TimelineManager.userColor(modelData ? modelData.userId : "", colors.window) textFormat: Text.RichText + ToolTip.visible: displayNameHover.hovered + ToolTip.text: modelData ? modelData.userId : "" TapHandler { - //cursorShape: Qt.PointingHandCursor - onSingleTapped: chat.model.openUserProfile(modelData.userId) } @@ -259,6 +265,10 @@ ScrollView { cursorShape: Qt.PointingHandCursor } + HoverHandler { + id: displayNameHover + } + } Label { diff --git a/resources/qml/NhekoBusyIndicator.qml b/resources/qml/NhekoBusyIndicator.qml index 917e11dc..e45d71ec 100644 --- a/resources/qml/NhekoBusyIndicator.qml +++ b/resources/qml/NhekoBusyIndicator.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index ca73cfd7..bd146dac 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtGraphicalEffects 1.0 diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index f53c89ad..335d5b29 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.6 diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml index 37b6f6cc..eb70585e 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates/" diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index 2117e513..ed1a5bd9 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import Qt.labs.platform 1.1 as Platform diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml index 2dd56f27..2d315a6d 100644 --- a/resources/qml/ScrollHelper.qml +++ b/resources/qml/ScrollHelper.qml @@ -1,9 +1,7 @@ // Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net> // Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsystems.com> // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later - /* * Shamelessly stolen from: * https://cgit.kde.org/kube.git/tree/framework/qml/ScrollHelper.qml diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml index 3d2d8278..f2b6c12d 100644 --- a/resources/qml/StatusIndicator.qml +++ b/resources/qml/StatusIndicator.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index ace7fc87..2761de26 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 905926c4..4efada8d 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml index bd82e4f9..3791a5b4 100644 --- a/resources/qml/ToggleButton.qml +++ b/resources/qml/ToggleButton.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 444a4572..e158a8ba 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml index ffe88fb6..2e36e8ad 100644 --- a/resources/qml/TypingIndicator.qml +++ b/resources/qml/TypingIndicator.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index dbf13796..05d2a391 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "./device-verification" diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml index 293b7a78..e73d6a50 100644 --- a/resources/qml/delegates/FileMessage.qml +++ b/resources/qml/delegates/FileMessage.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 0521258e..829d29ed 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index 211e03a6..dcf6eb3b 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.6 diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml index 4f8fbfd2..6c604c5e 100644 --- a/resources/qml/delegates/NoticeMessage.qml +++ b/resources/qml/delegates/NoticeMessage.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later TextMessage { diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml index a3fa0d9e..8efa491c 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/delegates/Placeholder.qml b/resources/qml/delegates/Placeholder.qml index addbc7e7..50486439 100644 --- a/resources/qml/delegates/Placeholder.qml +++ b/resources/qml/delegates/Placeholder.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import ".." diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index f871e492..7d00de21 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtMultimedia 5.6 diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index 6763b71b..728e9739 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index 1624d95c..ec0866ad 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import ".." diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml index ae62c334..8d57c8d6 100644 --- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml +++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml index fee0284a..cb3cd8ab 100644 --- a/resources/qml/device-verification/DeviceVerification.qml +++ b/resources/qml/device-verification/DeviceVerification.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.10 diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml index a387756d..cf5f75ed 100644 --- a/resources/qml/device-verification/DigitVerification.qml +++ b/resources/qml/device-verification/DigitVerification.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/EmojiElement.qml b/resources/qml/device-verification/EmojiElement.qml index f5c87a56..1b1ecbcf 100644 --- a/resources/qml/device-verification/EmojiElement.qml +++ b/resources/qml/device-verification/EmojiElement.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml index be9e3938..e179b0ed 100644 --- a/resources/qml/device-verification/EmojiVerification.qml +++ b/resources/qml/device-verification/EmojiVerification.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Failed.qml b/resources/qml/device-verification/Failed.qml index 5c71b02e..bc7dd5fc 100644 --- a/resources/qml/device-verification/Failed.qml +++ b/resources/qml/device-verification/Failed.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml index e8589cf7..7af19b42 100644 --- a/resources/qml/device-verification/NewVerificationRequest.qml +++ b/resources/qml/device-verification/NewVerificationRequest.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml index f2657b12..a454d56e 100644 --- a/resources/qml/device-verification/Success.qml +++ b/resources/qml/device-verification/Success.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml index 3bfa153d..c8dc2a77 100644 --- a/resources/qml/device-verification/Waiting.qml +++ b/resources/qml/device-verification/Waiting.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/emoji/EmojiButton.qml b/resources/qml/emoji/EmojiButton.qml index cec51d75..71f8bc01 100644 --- a/resources/qml/emoji/EmojiButton.qml +++ b/resources/qml/emoji/EmojiButton.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index 2db9dc07..ed8fdec4 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/ui/Ripple.qml b/resources/qml/ui/Ripple.qml index b240f421..7a8688f5 100644 --- a/resources/qml/ui/Ripple.qml +++ b/resources/qml/ui/Ripple.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtGraphicalEffects 1.0 diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml index 68d3bc4a..c8bd6037 100644 --- a/resources/qml/voip/ActiveCallBar.qml +++ b/resources/qml/voip/ActiveCallBar.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml index 11644797..02340b4b 100644 --- a/resources/qml/voip/CallDevices.qml +++ b/resources/qml/voip/CallDevices.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/voip/CallInvite.qml b/resources/qml/voip/CallInvite.qml index 15d987e7..ed706f12 100644 --- a/resources/qml/voip/CallInvite.qml +++ b/resources/qml/voip/CallInvite.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml index fe3f791f..c8474264 100644 --- a/resources/qml/voip/CallInviteBar.qml +++ b/resources/qml/voip/CallInviteBar.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml index 05cfd409..a1ec7f12 100644 --- a/resources/qml/voip/DeviceError.qml +++ b/resources/qml/voip/DeviceError.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml index c9aa8ea1..f340bb4e 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors -// |