diff --git a/res.qrc b/res.qrc index 73b1f34d8..2623438f5 100644 --- a/res.qrc +++ b/res.qrc @@ -220,7 +220,6 @@ ui/videoButton/videoButtonYellow.png ui/videoButton/videoButtonYellowHover.png ui/videoButton/videoButtonYellowPressed.png - ui/fileTransferWidget/fileTransferWidget.css ui/fileTransferInstance/red.css ui/fileTransferInstance/green.css ui/fileTransferInstance/grey.css diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 8612b5c0e..495156f70 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -211,7 +211,7 @@ ChatMessage* GenericChatForm::addSelfMessage(const QString &message, bool isActi void GenericChatForm::addAlertMessage(const ToxID &author, QString message, QDateTime datetime) { QString authorStr = Core::getInstance()->getPeerName(author); - chatWidget->addChatMessage(author != previousId ? authorStr : QString(), message, author.isMine(), true); + chatWidget->addChatMessage(author != previousId ? authorStr : QString(), message, datetime, author.isMine(), true); previousId = author; } @@ -250,8 +250,11 @@ void GenericChatForm::focusInput() void GenericChatForm::addSystemInfoMessage(const QString &message, const QString &type, const QDateTime &datetime) { + //TODO: respect type previousId.clear(); chatWidget->addSystemMessage(message, datetime); + + Q_UNUSED(type) } void GenericChatForm::clearChatArea(bool notinform)