Activated disabled code in GxsForums before merging.

Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-27 15:56:57 +00:00
parent 10e2ed536e
commit 7e19517451
6 changed files with 202 additions and 138 deletions

View file

@ -79,6 +79,9 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
// HACK - TEMPORARY HIJACKING THIS BUTTON FOR REFRESH.
connect(ui.refreshButton, SIGNAL(clicked()), this, SLOT(forceUpdateDisplay()));
/* Initialize group tree */
ui.forumTreeWidget->initDisplayMenu(ui.displayButton);
/* Set initial size the splitter */
QList<int> sizes;
sizes << 300 << width(); // Qt calculates the right sizes
@ -107,7 +110,7 @@ GxsForumsDialog::~GxsForumsDialog()
delete(mForumQueue);
}
//#AFTER MERGE UserNotify *GxsForumsDialog::getUserNotify(QObject *parent)
//UserNotify *GxsForumsDialog::getUserNotify(QObject *parent)
//{
// return new GxsForumUserNotify(parent);
//}