diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index 4f11e07bd..a0400fceb 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -42,6 +42,7 @@ #include #include #include +#include /* Images for context menu icons */ #define IMAGE_MESSAGE ":/images/folder-draft.png" @@ -76,7 +77,7 @@ ForumsDialog::ForumsDialog(QWidget *parent) connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum())); connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(createmessage())); - + connect(ui.newthreadButton, SIGNAL(clicked()), this, SLOT(showthread())); connect( ui.forumTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem *) ), this, SLOT( changedForum( QTreeWidgetItem *, QTreeWidgetItem * ) ) ); @@ -830,10 +831,12 @@ void ForumsDialog::showthread() { if (mCurrForumId == "") { + QMessageBox::information(this, tr("RetroShare"),tr("No Forum Selected!")); return; } CreateForumMsg *cfm = new CreateForumMsg(mCurrForumId, ""); + cfm->setWindowTitle(tr("Start New Thread")); cfm->show(); } @@ -878,10 +881,3 @@ static ForumDisplay *fui = new ForumDisplay(); } - - - - - - - diff --git a/retroshare-gui/src/gui/ForumsDialog.h b/retroshare-gui/src/gui/ForumsDialog.h index 7b27cb283..04a3ae204 100644 --- a/retroshare-gui/src/gui/ForumsDialog.h +++ b/retroshare-gui/src/gui/ForumsDialog.h @@ -32,8 +32,8 @@ class ForumsDialog : public MainPage public: ForumsDialog(QWidget *parent = 0); - void insertForums(); - void insertPost(); + void insertForums(); + void insertPost(); private slots: @@ -44,14 +44,14 @@ private slots: void newforum(); -void checkUpdate(); + void checkUpdate(); -void changedForum( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); -void changedThread( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); -void changedThread2(); + void changedForum( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); + void changedThread( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); + void changedThread2(); -void changeBox( int newrow ); -void updateMessages ( QTreeWidgetItem * item, int column ); + void changeBox( int newrow ); + void updateMessages ( QTreeWidgetItem * item, int column ); void newmessage(); diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index 68ff2da4c..a9d008fba 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -570,9 +570,13 @@ - + - New Message + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Start new Thread for Selected Forum</p></body></html> @@ -583,6 +587,24 @@ + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Reply Message</p></body></html> + + + + + + + :/images/mail_reply.png:/images/mail_reply.png + + +