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 #3528

Browse Source 
Diadlo (1):
      fix(chatform): Fixed call buttons
This commit is contained in:
sudden6 2016-07-28 21:53:26 +02:00
commit a556762c54
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ ChatForm::ChatForm(Friend* chatFriend)
} ); } );
setAcceptDrops(true); setAcceptDrops(true);
disableCallButtons();
retranslateUi(); retranslateUi();
Translator::registerHandler(std::bind(&ChatForm::retranslateUi, this), this); Translator::registerHandler(std::bind(&ChatForm::retranslateUi, this), this);
} }
@ -628,10 +628,17 @@ void ChatForm::onFileSendFailed(uint32_t FriendId, const QString &fname)
void ChatForm::onFriendStatusChanged(uint32_t friendId, Status status) void ChatForm::onFriendStatusChanged(uint32_t friendId, Status status)
{ {
// Disable call buttons if friend is offline // Disable call buttons if friend is offline
if(friendId == f->getFriendID() && status == Status::Offline) if(friendId != f->getFriendID())
return;
Status old = oldStatus.value(friendId, Status::Offline);
if (old != Status::Offline && status == Status::Offline)
disableCallButtons(); disableCallButtons();
else else if (old == Status::Offline && status != Status::Offline)
onEnableCallButtons(); enableCallButtons();
oldStatus[friendId] = status;
} }
void ChatForm::onAvatarChange(uint32_t FriendId, const QPixmap &pic) void ChatForm::onAvatarChange(uint32_t FriendId, const QPixmap &pic)
@ -935,12 +942,6 @@ void ChatForm::show(ContentLayout* contentLayout)
{ {
GenericChatForm::show(contentLayout); GenericChatForm::show(contentLayout);
// Disable call buttons if friend is offline
if(f->getStatus() == Status::Offline)
disableCallButtons();
else
onEnableCallButtons();
if (callConfirm) if (callConfirm)
callConfirm->show(); callConfirm->show();
} }

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

@ -122,6 +122,7 @@ private:
QAction* copyStatusAction; QAction* copyStatusAction;
QHash<uint, FileTransferInstance*> ftransWidgets; QHash<uint, FileTransferInstance*> ftransWidgets;
QMap<uint32_t, Status> oldStatus;
CallConfirmWidget *callConfirm; CallConfirmWidget *callConfirm;
bool isTyping; bool isTyping;
}; };