forked from blue/squawk
file comment fix, avatar dropping bug fix, url detection bug fix
This commit is contained in:
parent
13a1970047
commit
626227db93
@ -423,9 +423,9 @@ Shared::VCard Core::RosterItem::handleResponseVCard(const QXmppVCardIq& card, co
|
|||||||
} else {
|
} else {
|
||||||
if (!hasAvatar || !info.autogenerated) {
|
if (!hasAvatar || !info.autogenerated) {
|
||||||
setAutoGeneratedAvatar(resource);
|
setAutoGeneratedAvatar(resource);
|
||||||
type = Shared::Avatar::autocreated;
|
|
||||||
path = avatarPath(resource) + ".png";
|
|
||||||
}
|
}
|
||||||
|
type = Shared::Avatar::autocreated;
|
||||||
|
path = avatarPath(resource) + ".png";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,9 +27,9 @@ const QRegularExpression urlReg("(?<!<a\\shref=['\"])(?<!<img\\ssrc=['\"])("
|
|||||||
"(?:https?|ftp):\\/\\/"
|
"(?:https?|ftp):\\/\\/"
|
||||||
"\\w+"
|
"\\w+"
|
||||||
"(?:"
|
"(?:"
|
||||||
"[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]?"
|
"[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]?"
|
||||||
"(?:"
|
"(?:"
|
||||||
"\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]+\\)"
|
"\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]+\\)"
|
||||||
")?"
|
")?"
|
||||||
")*"
|
")*"
|
||||||
")");
|
")");
|
||||||
@ -207,6 +207,7 @@ void Message::hideComment()
|
|||||||
bodyLayout->removeWidget(fileComment);
|
bodyLayout->removeWidget(fileComment);
|
||||||
fileComment->hide();
|
fileComment->hide();
|
||||||
fileComment->setWordWrap(false);
|
fileComment->setWordWrap(false);
|
||||||
|
commentAdded = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user