From b4a4ce07af5c8ecd5779f8550943e5e4d55f5621 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 23 May 2010 23:02:15 +0000 Subject: [PATCH] Enabled Post to Forum for ForumNewItem git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2985 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/feeds/ForumMsgItem.cpp | 4 ++-- retroshare-gui/src/gui/feeds/ForumNewItem.cpp | 9 ++++++--- retroshare-gui/src/gui/feeds/ForumNewItem.ui | 14 +++++++++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp index 49a15f4de..412a34511 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp @@ -269,8 +269,8 @@ void ForumMsgItem::replyToPost() if (mParent) { //mParent->openMsg(FEEDHOLDER_MSG_FORUM, mForumId, mPostId); - CreateForumMsg *cfm = new CreateForumMsg(mForumId, mPostId); - cfm->show(); + CreateForumMsg *cfm = new CreateForumMsg(mForumId, mPostId); + cfm->show(); } } diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp index 4b11a5826..b51698d57 100644 --- a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp @@ -24,6 +24,7 @@ #include "FeedHolder.h" #include "rsiface/rsforums.h" +#include "gui/forums/CreateForumMsg.h" #include @@ -49,7 +50,7 @@ ForumNewItem::ForumNewItem(FeedHolder *parent, uint32_t feedId, std::string foru /* specific ones */ connect( subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeForum ( void ) ) ); // To Cheeky to post on a brand new forum.... - //connect( postButton, SIGNAL( clicked( void ) ), this, SLOT( postToForum ( void ) ) ); + connect( postButton, SIGNAL( clicked( void ) ), this, SLOT( postToForum ( void ) ) ); small(); updateItemStatic(); @@ -79,12 +80,12 @@ void ForumNewItem::updateItemStatic() if (fi.subscribeFlags & RS_DISTRIB_SUBSCRIBED) { subscribeButton->setEnabled(false); - //postButton->setEnabled(true); + postButton->setEnabled(true); } else { subscribeButton->setEnabled(true); - //postButton->setEnabled(false); + postButton->setEnabled(false); } @@ -209,6 +210,8 @@ void ForumNewItem::postToForum() if (mParent) { //mParent->openMsg(FEEDHOLDER_MSG_FORUM, mForumId, ""); + CreateForumMsg *cfm = new CreateForumMsg(mForumId, ""); + cfm->show(); } } diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.ui b/retroshare-gui/src/gui/feeds/ForumNewItem.ui index a11720a09..09f618b3b 100644 --- a/retroshare-gui/src/gui/feeds/ForumNewItem.ui +++ b/retroshare-gui/src/gui/feeds/ForumNewItem.ui @@ -157,6 +157,17 @@ border-radius: 10px} + + + + + + + + :/images/mail_new.png:/images/mail_new.png + + + @@ -211,7 +222,7 @@ border-radius: 10px} 0 - + Forum Description @@ -285,6 +296,7 @@ border-radius: 10px} +