Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 08:05:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added notification for VOIP calls (Patch from Phenom)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-21 21:25:17 +00:00
parent 3f116e0e73
commit ed014b0d34
7 changed files with 377 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -62,7 +62,7 @@
*****/
ChatWidget::ChatWidget(QWidget *parent) :
QWidget(parent), ui(new Ui::ChatWidget), sendingBlocked(false)
QWidget(parent), sendingBlocked(false), ui(new Ui::ChatWidget)
{
ui->setupUi(this);
@ -217,6 +217,16 @@ void ChatWidget::addVOIPBarWidget(QWidget *w)
ui->titleBarFrame->layout()->addWidget(w) ;
}
RSButtonOnText* ChatWidget::getNewButtonOnTextBrowser()
{
return new RSButtonOnText(ui->textBrowser);
}
RSButtonOnText* ChatWidget::getNewButtonOnTextBrowser(QString text)
{
return new RSButtonOnText(text, ui->textBrowser);
}
void ChatWidget::init(const ChatId &chat_id, const QString &title)
{
@ -255,7 +265,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
}
uint32_t hist_chat_type = 0xFFFF; // a value larger than the biggest RS_HISTORY_TYPE_* value
int messageCount;
int messageCount=0;
if (chatType() == CHATTYPE_LOBBY) {
hist_chat_type = RS_HISTORY_TYPE_LOBBY;