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

Merge branch 'badPacketMessage'

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-05-05 13:35:36 +00:00
parent 16231dea2b
commit 698425ba9e
7 changed files with 75 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/rsiface/notifyqt.cpp
View file

@ -267,6 +267,24 @@ void NotifyQt::UpdateGUI()
break;
}
}
if (rsNotify->NotifyLogMessage(sysid, type, title, msg))
{
/* make a log message */
std::string logMesString = title + " " + msg;
switch(type)
{
case RS_SYS_ERROR:
cDialog->setLogInfo(QString(logMesString.c_str()));
break;
case RS_SYS_WARNING:
cDialog->setLogInfo(QString(logMesString.c_str()));
break;
default:
case RS_SYS_INFO:
cDialog->setLogInfo(QString(logMesString.c_str()));
break;
}
}
}
}

2
retroshare-gui/src/rsiface/rsnotify.h
View file

@ -106,6 +106,8 @@ virtual ~RsNotify() { return; }
virtual bool NotifySysMessage(uint32_t &sysid, uint32_t &type,
std::string &title, std::string &msg) = 0;
virtual bool NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &msg) = 0;
virtual bool NotifyLogMessage(uint32_t &sysid, uint32_t &type,
std::string &title, std::string &msg) = 0;
/* Control over Messages */
virtual bool GetSysMessageList(std::map<uint32_t, std::string> &list) = 0;