mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 10:54:22 -05:00
- Changes for Message Toaster
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
5b0aa33995
commit
5107fbdd0a
@ -78,7 +78,7 @@ bool p3Notify::NotifyLogMessage(uint32_t &sysid, uint32_t &type,
|
||||
}
|
||||
|
||||
|
||||
bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &msg)
|
||||
bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &title, std::string &msg)
|
||||
{
|
||||
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/
|
||||
if (pendingPopupMsgs.size() > 0)
|
||||
@ -88,6 +88,7 @@ bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::strin
|
||||
|
||||
ptype = pmsg.type;
|
||||
name = pmsg.name;
|
||||
title = pmsg.title;
|
||||
msg = pmsg.msg;
|
||||
|
||||
return true;
|
||||
@ -121,7 +122,7 @@ bool p3Notify::SetPopupMessageMode(uint32_t ptype, uint32_t mode)
|
||||
|
||||
|
||||
/* Input from libretroshare */
|
||||
bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string msg)
|
||||
bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string title, std::string msg)
|
||||
{
|
||||
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/
|
||||
|
||||
@ -129,6 +130,7 @@ bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string msg
|
||||
|
||||
pmsg.type = ptype;
|
||||
pmsg.name = name;
|
||||
pmsg.title = title;
|
||||
pmsg.msg = msg;
|
||||
|
||||
pendingPopupMsgs.push_back(pmsg);
|
||||
|
@ -57,6 +57,7 @@ class p3NotifyPopupMsg
|
||||
|
||||
uint32_t type;
|
||||
std::string name;
|
||||
std::string title;
|
||||
std::string msg;
|
||||
};
|
||||
|
||||
@ -71,7 +72,7 @@ virtual ~p3Notify() { return; }
|
||||
/* Output for retroshare-gui */
|
||||
virtual bool NotifySysMessage(uint32_t &sysid, uint32_t &type,
|
||||
std::string &title, std::string &msg);
|
||||
virtual bool NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &msg);
|
||||
virtual bool NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &title, std::string &msg);
|
||||
virtual bool NotifyLogMessage(uint32_t &sysid, uint32_t &type, std::string &title, std::string &msg);
|
||||
|
||||
/* Control over Messages */
|
||||
@ -84,7 +85,7 @@ virtual bool SetPopupMessageMode(uint32_t ptype, uint32_t mode);
|
||||
virtual bool GetFeedItem(RsFeedItem &item);
|
||||
|
||||
/* Overloaded from pqiNotify */
|
||||
virtual bool AddPopupMessage(uint32_t ptype, std::string name, std::string msg);
|
||||
virtual bool AddPopupMessage(uint32_t ptype, std::string name, std::string title, std::string msg);
|
||||
virtual bool AddSysMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg);
|
||||
virtual bool AddLogMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg);
|
||||
virtual bool AddFeedItem(uint32_t type, std::string id1, std::string id2, std::string id3);
|
||||
|
Loading…
Reference in New Issue
Block a user