StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fixup merge

Browse Source
This commit is contained in:
krepa098 2015-01-03 13:13:12 +01:00
parent 64e0116476
commit d88aa965fa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res.qrc
View File

@ -220,7 +220,6 @@
<file>ui/videoButton/videoButtonYellow.png</file>
<file>ui/videoButton/videoButtonYellowHover.png</file>
<file>ui/videoButton/videoButtonYellowPressed.png</file>
<file>ui/fileTransferWidget/fileTransferWidget.css</file>
<file>ui/fileTransferInstance/red.css</file>
<file>ui/fileTransferInstance/green.css</file>
<file>ui/fileTransferInstance/grey.css</file>

5
src/widget/form/genericchatform.cpp
View File

@ -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)