forked from blue/squawk
progress spinner fix, new lines in messages now display again
This commit is contained in:
parent
565449f176
commit
a4136ff9fe
@ -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);
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user