mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-04-19 14:55:54 -04:00
Merge a9859d11c056ed8b24406843c60d3527c2fb1565 into 1d1138d0cb941845632cc4a8f74336818d63bcc4
This commit is contained in:
commit
8848249eef
@ -1725,7 +1725,7 @@ void ChatWidget::fileHashingFinished(QList<HashedFile> hashedFiles)
|
||||
{
|
||||
QString encodedImage;
|
||||
uint32_t maxMessageSize = this->maxMessageSize();
|
||||
if (RsHtml::makeEmbeddedImage(hashedFile.filepath, encodedImage, 640*480, maxMessageSize - 200 - link.toHtmlSize().length()))
|
||||
if (RsHtml::makeEmbeddedImage(hashedFile.filepath, encodedImage, 800*600, maxMessageSize - 200 - link.toHtmlSize().length()))
|
||||
{ QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
|
||||
ui->chatTextEdit->textCursor().insertFragment(fragment);
|
||||
preview=true;
|
||||
|
@ -201,7 +201,7 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
|
||||
// additional Qt role only to determine the number of destinations.
|
||||
|
||||
if(dt == "")
|
||||
ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/svg/people2.svg");
|
||||
ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/png/people2.png");
|
||||
else if(id.isNull())
|
||||
{
|
||||
if (ownOption.icon.isNull())
|
||||
|
Loading…
x
Reference in New Issue
Block a user