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

- Added comment tabs to GxsGroupFrameDialog

Browse source 
- Switched channels from GxsCommentContainer to new tabbed GxsGroupFrameDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7350 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-05-08 00:00:21 +00:00
parent dacc60d28f
commit 2da8acd967
14 changed files with 134 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -91,7 +91,7 @@
#include <retroshare/rsfiles.h>
#include <retroshare/rsnotify.h>
#include "gui/gxschannels/ChannelDialog.h"
#include "gui/gxschannels/GxsChannelDialog.h"
#include "gui/gxsforums/GxsForumsDialog.h"
#include "gui/Identity/IdDialog.h"
#include "gui/Circles/CirclesDialog.h"
@ -272,9 +272,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
action = createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp));
notify.push_back(QPair<MainPage*, QAction*>(messagesDialog, action));
ui->stackPages->add(gxschannelDialog = new ChannelDialog(ui->stackPages),
ui->stackPages->add(gxschannelDialog = new GxsChannelDialog(ui->stackPages),
action = createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("Channels"), grp));
gxschannelDialog->setup();
notify.push_back(QPair<MainPage*, QAction*>(gxschannelDialog, action));
ui->stackPages->add(gxsforumDialog = new GxsForumsDialog(ui->stackPages),
@ -436,6 +435,8 @@ MainWindow::~MainWindow()
#ifdef UNFINISHED
delete applicationWindow;
#endif
delete(ui);
}
void MainWindow::displayDiskSpaceWarning(int loc,int size_limit_mb)