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

Merge branch 'pr560'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-29 17:37:28 +01:00
commit 3ec3a01abc
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widget/tool/chattextedit.cpp
View File

@ -20,7 +20,7 @@
ChatTextEdit::ChatTextEdit(QWidget *parent) : ChatTextEdit::ChatTextEdit(QWidget *parent) :
QTextEdit(parent) QTextEdit(parent)
{ {
setPlaceholderText("Type your message here..."); setPlaceholderText(tr("Type your message here..."));
setAcceptRichText(false); setAcceptRichText(false);
} }

4
src/widget/widget.cpp
View File

@ -1016,7 +1016,7 @@ void Widget::onMessageSendResult(int friendId, const QString& message, int messa
return; return;
if (!messageId) if (!messageId)
f->chatForm->addSystemInfoMessage("Message failed to send", "red", QDateTime::currentDateTime()); f->chatForm->addSystemInfoMessage(tr("Message failed to send"), "red", QDateTime::currentDateTime());
} }
void Widget::onGroupSendResult(int groupId, const QString& message, int result) void Widget::onGroupSendResult(int groupId, const QString& message, int result)
@ -1027,7 +1027,7 @@ void Widget::onGroupSendResult(int groupId, const QString& message, int result)
return; return;
if (result == -1) if (result == -1)
g->chatForm->addSystemInfoMessage("Message failed to send", "red", QDateTime::currentDateTime()); g->chatForm->addSystemInfoMessage(tr("Message failed to send"), "red", QDateTime::currentDateTime());
} }
void Widget::getPassword(QString info, int passtype, uint8_t* salt) void Widget::getPassword(QString info, int passtype, uint8_t* salt)