forked from blue/squawk
corrected messages now are supposed to display correctly
This commit is contained in:
parent
fe1ae8567a
commit
ff2c9831cf
9 changed files with 202 additions and 63 deletions
|
@ -121,6 +121,9 @@ Message::Message(const Shared::Message& source, bool p_outgoing, const QString&
|
|||
layout->addStretch();
|
||||
statusLay->addWidget(date);
|
||||
}
|
||||
if (msg.getEdited()) {
|
||||
setEdited();
|
||||
}
|
||||
|
||||
bodyLayout->addWidget(statusBar);
|
||||
layout->setAlignment(avatar, Qt::AlignTop);
|
||||
|
@ -315,20 +318,7 @@ bool Message::change(const QMap<QString, QVariant>& data)
|
|||
text->hide();
|
||||
}
|
||||
if (msg.getEdited()) {
|
||||
if (!hasEditedLabel) {
|
||||
editedLabel = new QLabel();
|
||||
QFont eFont = editedLabel->font();
|
||||
eFont.setItalic(true);
|
||||
eFont.setPointSize(eFont.pointSize() - 2);
|
||||
editedLabel->setFont(eFont);
|
||||
hasEditedLabel = true;
|
||||
QHBoxLayout* statusLay = static_cast<QHBoxLayout*>(statusBar->layout());
|
||||
if (hasStatusIcon) {
|
||||
statusLay->insertWidget(1, editedLabel);
|
||||
} else {
|
||||
statusLay->insertWidget(0, editedLabel);
|
||||
}
|
||||
}
|
||||
setEdited();
|
||||
}
|
||||
if (hasStatusIcon) {
|
||||
setState();
|
||||
|
@ -338,6 +328,20 @@ bool Message::change(const QMap<QString, QVariant>& data)
|
|||
return idChanged;
|
||||
}
|
||||
|
||||
void Message::setEdited()
|
||||
{
|
||||
if (!hasEditedLabel) {
|
||||
editedLabel = new QLabel();
|
||||
hasEditedLabel = true;
|
||||
QIcon q(Shared::icon("edit-rename"));
|
||||
editedLabel->setPixmap(q.pixmap(12, 12));
|
||||
QHBoxLayout* statusLay = static_cast<QHBoxLayout*>(statusBar->layout());
|
||||
statusLay->insertWidget(1, editedLabel);
|
||||
}
|
||||
editedLabel->setToolTip("Last time edited: " + msg.getLastModified().toLocalTime().toString()
|
||||
+ "\nOriginal message: " + msg.getOriginalBody());
|
||||
}
|
||||
|
||||
void Message::setState()
|
||||
{
|
||||
Shared::Message::State state = msg.getState();
|
||||
|
|
|
@ -94,6 +94,7 @@ private:
|
|||
void hideProgress();
|
||||
void hideFile();
|
||||
void setState();
|
||||
void setEdited();
|
||||
};
|
||||
|
||||
#endif // MESSAGE_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue