d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 17:40:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make lint

Browse source
This commit is contained in:
trilene 2021-02-07 13:58:32 -05:00
parent 8d68534456
commit 974c336c5e
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/MessageView.qml
View file

@ -102,6 +102,7 @@ ListView {
Avatar {
id: messageUserAvatar
width: avatarSize
height: avatarSize
url: modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
@ -113,7 +114,7 @@ ListView {
Connections {
target: chat.model
onRoomAvatarUrlChanged: {
messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : "";
}
}

11
resources/qml/UserProfile.qml
View file

@ -49,6 +49,7 @@ ApplicationWindow {
Text {
id: errorText
text: "Error Text"
color: "red"
visible: opacity > 0
@ -58,24 +59,28 @@ ApplicationWindow {
SequentialAnimation {
id: hideErrorAnimation
running: false
PauseAnimation {
duration: 4000
}
NumberAnimation {
target: errorText
property: 'opacity'
to: 0
duration: 1000
}
}
Connections {
target: profile
onDisplayError: {
errorText.text = errorMessage
errorText.opacity = 1
hideErrorAnimation.restart()
errorText.text = errorMessage;
errorText.opacity = 1;
hideErrorAnimation.restart();
}
}

3
src/ChatPage.cpp
View file

@ -449,8 +449,7 @@ ChatPage::deleteConfigs()
{
QSettings settings;
if (UserSettings::instance()->profile() != "")
{
if (UserSettings::instance()->profile() != "") {
settings.beginGroup("profile");
settings.beginGroup(UserSettings::instance()->profile());
}

3
src/Utils.cpp
View file

@ -70,7 +70,8 @@ utils::replaceEmoji(const QString &body)
for (auto &code : utf32_string) {
if (utils::codepointIsEmoji(code)) {
if (!insideFontBlock) {
fmtBody += QString("<font face=\"" + UserSettings::instance()->font() + "\">");
fmtBody += QString("<font face=\"" +
UserSettings::instance()->font() + "\">");
insideFontBlock = true;
}