mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-23 00:01:21 -04:00
Added a new checbox in the settings (NotifyPage) to enable/disable the new SecurityItem. It is enabled by default, but all existing users need to enable it.
Added new buttons to SecurityItem to add/remove the peer and view peer details. Added new call to notifyListChange with NOTIFY_LIST_FRIENDS in AuthGPGimpl::AllowConnection. Fixed german language. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
2e9d5663c9
commit
01fa9eec3f
17 changed files with 419 additions and 1297 deletions
|
@ -77,8 +77,6 @@ NewsFeed::NewsFeed(QWidget *parent)
|
|||
timer->start(1000);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void NewsFeed::updateFeed()
|
||||
{
|
||||
if (!rsNotify)
|
||||
|
@ -86,9 +84,6 @@ void NewsFeed::updateFeed()
|
|||
|
||||
uint flags = Settings->getNewsFeedFlags();
|
||||
|
||||
/* HACK until SECURITY is in feeds */
|
||||
flags |= RS_FEED_TYPE_SECURITY;
|
||||
|
||||
/* check for new messages */
|
||||
RsFeedItem fi;
|
||||
if (rsNotify->GetFeedItem(fi))
|
||||
|
@ -238,7 +233,6 @@ void NewsFeed::addFeedItemPeerConnect(RsFeedItem &fi)
|
|||
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemPeerDisconnect(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -255,7 +249,6 @@ void NewsFeed::addFeedItemPeerDisconnect(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemPeerHello(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -272,7 +265,6 @@ void NewsFeed::addFeedItemPeerHello(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemPeerNew(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -289,8 +281,6 @@ void NewsFeed::addFeedItemPeerNew(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemSecurityConnectAttempt(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -307,7 +297,6 @@ void NewsFeed::addFeedItemSecurityConnectAttempt(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemSecurityAuthDenied(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -356,8 +345,6 @@ void NewsFeed::addFeedItemSecurityUnknownOut(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemChanNew(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -374,7 +361,6 @@ void NewsFeed::addFeedItemChanNew(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemChanUpdate(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -391,7 +377,6 @@ void NewsFeed::addFeedItemChanUpdate(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemChanMsg(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -408,7 +393,6 @@ void NewsFeed::addFeedItemChanMsg(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemForumNew(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -426,7 +410,6 @@ void NewsFeed::addFeedItemForumNew(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemForumUpdate(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -444,7 +427,6 @@ void NewsFeed::addFeedItemForumUpdate(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemForumMsg(RsFeedItem &fi)
|
||||
{
|
||||
/* make new widget */
|
||||
|
@ -501,7 +483,6 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
void NewsFeed::addFeedItemChatNew(RsFeedItem &fi)
|
||||
{
|
||||
#ifdef NEWS_DEBUG
|
||||
|
@ -555,9 +536,9 @@ void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/)
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
if (item) {
|
||||
item->close ();
|
||||
}
|
||||
if (item) {
|
||||
item->close ();
|
||||
}
|
||||
}
|
||||
|
||||
void NewsFeed::openChat(std::string peerId)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue