mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-22 06:09:09 -04:00
Merge 57d4be0909
into c3640306bd
This commit is contained in:
commit
4181ef42f1
2 changed files with 2 additions and 2 deletions
|
@ -1725,7 +1725,7 @@ void ChatWidget::fileHashingFinished(QList<HashedFile> hashedFiles)
|
||||||
{
|
{
|
||||||
QString encodedImage;
|
QString encodedImage;
|
||||||
uint32_t maxMessageSize = this->maxMessageSize();
|
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);
|
{ QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
|
||||||
ui->chatTextEdit->textCursor().insertFragment(fragment);
|
ui->chatTextEdit->textCursor().insertFragment(fragment);
|
||||||
preview=true;
|
preview=true;
|
||||||
|
|
|
@ -201,7 +201,7 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
|
||||||
// additional Qt role only to determine the number of destinations.
|
// additional Qt role only to determine the number of destinations.
|
||||||
|
|
||||||
if(dt == "")
|
if(dt == "")
|
||||||
ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/svg/people2.svg");
|
ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/png/people2.png");
|
||||||
else if(id.isNull())
|
else if(id.isNull())
|
||||||
{
|
{
|
||||||
if (ownOption.icon.isNull())
|
if (ownOption.icon.isNull())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue