mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-28 08:16:59 -05:00
fixed forgotten notify changes for MessageToaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a5b7950065
commit
876e33dc0a
@ -247,13 +247,12 @@ void NotifyQt::UpdateGUI()
|
|||||||
uint32_t type;
|
uint32_t type;
|
||||||
std::string title, id, msg;
|
std::string title, id, msg;
|
||||||
|
|
||||||
if (rsNotify->NotifyPopupMessage(type, id, msg))
|
if (rsNotify->NotifyPopupMessage(type, id, title, msg))
|
||||||
{
|
{
|
||||||
uint popupflags = Settings->getNotifyFlags();
|
uint popupflags = Settings->getNotifyFlags();
|
||||||
|
|
||||||
/* id the name */
|
/* id the name */
|
||||||
std::string name = rsPeers->getPeerName(id);
|
std::string name = rsPeers->getPeerName(id);
|
||||||
//std::cerr << "NotifyQT got message for peer id : " << id << "; name : " << name << std::endl;
|
|
||||||
std::string realmsg = "<strong>" + name + "</strong>";
|
std::string realmsg = "<strong>" + name + "</strong>";
|
||||||
switch(type)
|
switch(type)
|
||||||
{
|
{
|
||||||
@ -261,8 +260,9 @@ void NotifyQt::UpdateGUI()
|
|||||||
if (popupflags & RS_POPUP_MSG)
|
if (popupflags & RS_POPUP_MSG)
|
||||||
{
|
{
|
||||||
MessageToaster * msgToaster = new MessageToaster();
|
MessageToaster * msgToaster = new MessageToaster();
|
||||||
//msgToaster->setMessage(QString::fromStdString(title));
|
msgToaster->setMessage(QString::fromStdString(msg));
|
||||||
msgToaster->setName(QString::fromStdString(realmsg));
|
msgToaster->setName(QString::fromStdString(realmsg));
|
||||||
|
msgToaster->setTitle(QString::fromStdString(title));
|
||||||
msgToaster->displayPopup();
|
msgToaster->displayPopup();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user