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 pull request #160 from retuxx/chat

Browse Source 
Placeholder text for chat input and friend invite
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-07-24 01:49:00 +02:00
commit 5072eb5d92
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widget/form/addfriendform.cpp
View File

@ -35,6 +35,7 @@ AddFriendForm::AddFriendForm() : dns(this)
toxIdLabel.setText(tr("Tox ID","Tox ID of the person you're sending a friend request to"));
messageLabel.setText(tr("Message","The message you send in friend requests"));
sendButton.setText(tr("Send friend request"));
message.setPlaceholderText(tr("Tox me maybe?","Default message in friend requests if the field is left blank. Write something appropriate!"));
main->setLayout(&layout);
layout.addWidget(&toxIdLabel);
@ -81,7 +82,7 @@ void AddFriendForm::showWarning(const QString &message) const
QString AddFriendForm::getMessage() const
{
const QString msg = message.toPlainText();
return !msg.isEmpty() ? msg : tr("Tox me maybe?","Default message in friend requests if the field is left blank. Write something appropriate!");
return !msg.isEmpty() ? msg : message.placeholderText();
}
void AddFriendForm::onSendTriggered()

1
widget/tool/chattextedit.cpp
View File

@ -20,6 +20,7 @@
ChatTextEdit::ChatTextEdit(QWidget *parent) :
QTextEdit(parent)
{
setPlaceholderText("Type your message here...");
}
void ChatTextEdit::keyPressEvent(QKeyEvent * event)