Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-14 00:49:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display Friends activities on Friends Storm Tab in PeersDialog. removed from MainWindow NewsFeed action.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3360 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-08-12 16:00:21 +00:00
parent c904eb54de
commit 3d9aa943ba
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -43,7 +43,6 @@
#include "NetworkView.h"
#include "LinksDialog.h"
#include "ForumsDialog.h"
#include "NewsFeed.h"
#include "PeersDialog.h"
#include "HelpDialog.h"
#include "AboutDialog.h"
@ -231,11 +230,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp));
#endif
#ifndef RS_RELEASE_VERSION
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages),
createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp));
#endif
#ifndef RS_RELEASE_VERSION
#ifdef PLUGINMGR
ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages),

2
retroshare-gui/src/gui/MainWindow.h
View File

@ -49,7 +49,6 @@ class BandwidthGraph;
#ifndef RS_RELEASE_VERSION
class LinksDialog;
class NewsFeed;
#endif
#ifdef BLOGS
@ -116,7 +115,6 @@ public:
#ifndef RS_RELEASE_VERSION
LinksDialog *linksDialog;
NewsFeed *newsFeed;
#endif
#ifdef BLOGS

2
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -54,6 +54,7 @@
#include "RetroShareLink.h"
#include "MainWindow.h"
#include "NewsFeed.h"
#include <sstream>
#include <time.h>
@ -159,6 +160,7 @@ PeersDialog::PeersDialog(QWidget *parent)
ui.peertabWidget->setTabPosition(QTabWidget::North);
ui.peertabWidget->addTab(new ProfileWidget(),QString(tr("Profile")));
ui.peertabWidget->addTab(new NewsFeed(),QString(tr("Friend Storm")));
ui.peertreeWidget->setColumnCount(4);
ui.peertreeWidget->setColumnHidden ( 3, true);