blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

progress spinner fix, new lines in messages now display again

Browse Source
This commit is contained in:
Blue 2020-01-27 18:07:38 +03:00
parent 565449f176
commit a4136ff9fe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/utils/message.cpp
View File

@ -60,6 +60,7 @@ Message::Message(const Shared::Message& source, bool outgoing, const QString& p_
QString bd = msg.getBody(); QString bd = msg.getBody();
//bd.replace(imgReg, "<img src=\"\\1\"/>"); //bd.replace(imgReg, "<img src=\"\\1\"/>");
bd.replace(urlReg, "<a href=\"\\1\">\\1</a>"); bd.replace(urlReg, "<a href=\"\\1\">\\1</a>");
bd.replace("\n", "<br>");
text->setTextFormat(Qt::RichText); text->setTextFormat(Qt::RichText);
text->setText(bd);; text->setText(bd);;
text->setTextInteractionFlags(text->textInteractionFlags() | Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse); text->setTextInteractionFlags(text->textInteractionFlags() | Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);

4
ui/utils/progress.cpp
View File

@ -39,9 +39,9 @@ Progress::Progress(quint16 p_size, QWidget* parent):
pixmap->setTransformationMode(Qt::SmoothTransformation); pixmap->setTransformationMode(Qt::SmoothTransformation);
pixmap->setOffset(0, 0); pixmap->setOffset(0, 0);
animation.setDuration(500); animation.setDuration(1000);
animation.setStartValue(0.0f); animation.setStartValue(0.0f);
animation.setEndValue(180.0f); animation.setEndValue(360.0f);
animation.setLoopCount(-1); animation.setLoopCount(-1);
connect(&animation, &QVariantAnimation::valueChanged, this, &Progress::onValueChanged); connect(&animation, &QVariantAnimation::valueChanged, this, &Progress::onValueChanged);