d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

add error message and update avatars on avatar change in timeline and user profile dialog

Browse source
This commit is contained in:
Jedi18 2021-02-02 13:30:47 +05:30
parent c3e02240bf
commit d535cc5e75
5 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/MessageView.qml
View file

@ -101,6 +101,7 @@ ListView {
spacing: 8
Avatar {
id: messageUserAvatar
width: avatarSize
height: avatarSize
url: modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
@ -109,6 +110,13 @@ ListView {
onClicked: chat.model.openUserProfile(modelData.userId)
}
Connections {
target: chat.model
onRoomAvatarUrlChanged: {
messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
}
}
Label {
id: userName

31
resources/qml/UserProfile.qml
View file

@ -34,6 +34,37 @@ ApplicationWindow {
onClicked: profile.isSelf ? profile.changeAvatar() : TimelineManager.openImageOverlay(TimelineManager.timeline.avatarUrl(userid), TimelineManager.timeline.data.id)
}
Text {
id: errorText
text: "Error Text"
color: "red"
visible: opacity > 0
opacity: 0
Layout.alignment: Qt.AlignHCenter
}
SequentialAnimation {
id: hideErrorAnimation
running: false
PauseAnimation {
duration: 4000
}
NumberAnimation {
target: errorText
property: 'opacity'
to: 0
duration: 1000
}
}
Connections{
target: profile
onDisplayError: {
errorText.opacity = 1
hideErrorAnimation.restart()
}
}
TextInput {
id: displayUsername

5
src/timeline/TimelineModel.cpp
View file

@ -801,7 +801,10 @@ TimelineModel::viewDecryptedRawMessage(QString id) const
void
TimelineModel::openUserProfile(QString userid, bool global)
{
emit openProfile(new UserProfile(global ? "" : room_id_, userid, manager_, this));
UserProfile *userProfile = new UserProfile(global ? "" : room_id_, userid, manager_, this);
connect(
this, &TimelineModel::roomAvatarUrlChanged, userProfile, &UserProfile::avatarUrlChanged);
emit openProfile(userProfile);
}
void

4
src/ui/UserProfile.cpp
View file

@ -308,12 +308,12 @@ UserProfile::changeAvatar()
QFile file{fileName, this};
if (format != "image") {
// displayErrorMessage(tr("The selected file is not an image"));
emit displayError(tr("The selected file is not an image"));
return;
}
if (!file.open(QIODevice::ReadOnly)) {
// displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString()));
emit displayError(tr("Error while reading file: %1").arg(file.errorString()));
return;
}

4
src/ui/UserProfile.h
View file

@ -83,7 +83,7 @@ class UserProfile : public QObject
Q_OBJECT
Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
Q_PROPERTY(QString userid READ userid CONSTANT)
Q_PROPERTY(QString avatarUrl READ avatarUrl CONSTANT)
Q_PROPERTY(QString avatarUrl READ avatarUrl NOTIFY avatarUrlChanged)
Q_PROPERTY(DeviceInfoModel *deviceList READ deviceList CONSTANT)
Q_PROPERTY(bool isGlobalUserProfile READ isGlobalUserProfile CONSTANT)
Q_PROPERTY(bool isUserVerified READ getUserStatus NOTIFY userStatusChanged)
@ -119,6 +119,8 @@ public:
signals:
void userStatusChanged();
void displayNameChanged();
void avatarUrlChanged();
void displayError(const QString &errorMessage);
void globalUsernameRetrieved(const QString &globalUser);
protected slots: