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 'pr1232'

Browse Source
This commit is contained in:
tux3 2015-02-22 11:54:10 +01:00
commit 5e27d64a95
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,11 +901,6 @@ QString ChatForm::secondsToDHMS(quint32 duration)
return cD + res.sprintf("%dd%02dh %02dm %02ds", days, hours, minutes, seconds); return cD + res.sprintf("%dd%02dh %02dm %02ds", days, hours, minutes, seconds);
} }
bool ChatForm::getIsTyping()
{
return isTyping;
}
void ChatForm::setFriendTyping(bool isTyping) void ChatForm::setFriendTyping(bool isTyping)
{ {
chatWidget->setTypingNotificationVisible(isTyping); chatWidget->setTypingNotificationVisible(isTyping);

1
src/widget/form/chatform.h
View File

@ -44,7 +44,6 @@ public:
void loadHistory(QDateTime since, bool processUndelivered = false); void loadHistory(QDateTime since, bool processUndelivered = false);
void dischargeReceipt(int receipt); void dischargeReceipt(int receipt);
bool getIsTyping();
void setFriendTyping(bool isTyping); void setFriendTyping(bool isTyping);
OfflineMsgEngine* getOfflineMsgEngine(); OfflineMsgEngine* getOfflineMsgEngine();

4
src/widget/widget.cpp
View File

@ -694,10 +694,6 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
if (isActualChange && status != Status::Offline) if (isActualChange && status != Status::Offline)
{ // wait a little { // wait a little
QTimer::singleShot(250, f->getChatForm()->getOfflineMsgEngine(), SLOT(deliverOfflineMsgs())); QTimer::singleShot(250, f->getChatForm()->getOfflineMsgEngine(), SLOT(deliverOfflineMsgs()));
// Send another typing notification if the contact comes back online
if (f->getChatForm()->getIsTyping() && Settings::getInstance().isTypingNotificationEnabled())
Core::getInstance()->sendTyping(f->getFriendID(), true);
} }
} }