mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-21 04:44:25 -04:00
Added three new toasters - private chat, group chat and chat lobby.
Fixed some utf8 issues in toasters and feeds. Fixed german language. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0778e8f691
commit
37986e00a3
35 changed files with 1335 additions and 239 deletions
|
@ -331,7 +331,7 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const QDateTime
|
|||
if (incoming && chatType == TYPE_NORMAL) {
|
||||
emit newMessage(this);
|
||||
|
||||
if (!isVisible() || (window() && (!window()->isActiveWindow() || window()->isMinimized()))) {
|
||||
if (!isActive()) {
|
||||
newMessages = true;
|
||||
}
|
||||
|
||||
|
@ -339,6 +339,15 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const QDateTime
|
|||
}
|
||||
}
|
||||
|
||||
bool ChatWidget::isActive()
|
||||
{
|
||||
if (!isVisible() || (window() && (!window()->isActiveWindow() || window()->isMinimized()))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ChatWidget::pasteLink()
|
||||
{
|
||||
std::cerr << "In paste link" << std::endl;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue