diff --git a/TODO.txt b/TODO.txt index 6ca4be3b5..3bf8063ed 100644 --- a/TODO.txt +++ b/TODO.txt @@ -65,10 +65,10 @@ To be done 0020 [ ] double click on completed download must open the file. or folder, configurable in options (from noname) -0028 [ ] RTT statistics shouldn't show curves for offline peers -0029 [ ] In options, rename "server"->"network", "transfer"->"file transfer". +0028 [X] RTT statistics shouldn't show curves for offline peers +0029 [X] In options, rename "server"->"network", "transfer"->"file transfer". -0030 [ ] forums - middle horisontal bar - post time is duplicate to the one in the list. also thread name. +0030 [X] forums - middle horisontal bar - post time is duplicate to the one in the list. also thread name. forum name (the line with view mode) is duplicate to tab header. button for new thread must have text, *reply to selected post* button must be placed next to it the big subscribe button on the top, but never used. @@ -87,7 +87,7 @@ To be done 0033 [ ] Selecting different options in messages composer -> contact list then come back, shows disappearing / re-appearing people. What causes this??? -0034 [ ] Show forum/channel/posted admin name in details window +0034 [X] Show forum/channel/posted admin name in details window **Not sure** diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp index 0e38541de..4227c7b2c 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp @@ -369,10 +369,13 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList< /* Set tooltip */ if (itemInfo.privatekey) { - tooltip += "\n" + tr("Private Key Available"); + tooltip += "\n" + tr("You have admin rights"); } if(!IS_GROUP_SUBSCRIBED(itemInfo.subscribeFlags)) + { tooltip += "\n" + QString::number(itemInfo.max_visible_posts) + " messages available" ; + tooltip += "\n" + tr("Subscribe to download and read messages") ; + } item->setToolTip(COLUMN_NAME, tooltip); item->setToolTip(COLUMN_POPULARITY, tooltip); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index 7a48596c6..97a938815 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -132,6 +132,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget connect(ui->threadTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(threadListCustomPopupMenu(QPoint))); + ui->subscribeToolButton->hide() ; connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool))); connect(ui->newmessageButton, SIGNAL(clicked()), this, SLOT(createmessage())); connect(ui->newthreadButton, SIGNAL(clicked()), this, SLOT(createthread())); @@ -201,6 +202,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget ui->line_2->hide() ; ui->by_text_label->hide() ; ui->by_label->hide() ; + + ui->subscribeToolButton->setToolTip(tr("

Subscribing to the forum will gather \ + available posts from your subscribed friends, and make the \ + forum visible to all other friends.

Afterwards you can unsubscribe from the context menu of the forum list at left.

")); } GxsForumThreadWidget::~GxsForumThreadWidget() @@ -387,10 +392,10 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) QAction *replyAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply"), &contextMnu); connect(replyAct, SIGNAL(triggered()), this, SLOT(createmessage())); - QAction *replyauthorAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply to Author"), &contextMnu); - connect(replyauthorAct, SIGNAL(triggered()), this, SLOT(replytomessage())); - - QAction *newthreadAct = new QAction(QIcon(IMAGE_MESSAGE), tr("Start New Thread"), &contextMnu); + QAction *replyauthorAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply with private message"), &contextMnu); + connect(replyauthorAct, SIGNAL(triggered()), this, SLOT(replytomessage())); + + QAction *newthreadAct = new QAction(QIcon(IMAGE_MESSAGE), tr("Start New Thread"), &contextMnu); newthreadAct->setEnabled (IS_GROUP_SUBSCRIBED(mSubscribeFlags)); connect(newthreadAct , SIGNAL(triggered()), this, SLOT(createthread())); @@ -441,10 +446,10 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) if (nCount == 1) { replyAct->setEnabled (true); - replyauthorAct->setEnabled (true); + replyauthorAct->setEnabled (true); } else { replyAct->setDisabled (true); - replyauthorAct->setDisabled (true); + replyauthorAct->setDisabled (true); } } else { markMsgAsRead->setDisabled(true); @@ -452,11 +457,10 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) markMsgAsUnread->setDisabled(true); markMsgAsUnreadChildren->setDisabled(true); replyAct->setDisabled (true); - replyauthorAct->setDisabled (true); + replyauthorAct->setDisabled (true); } contextMnu.addAction(replyAct); - contextMnu.addAction(replyauthorAct); contextMnu.addAction(newthreadAct); QAction* action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyMessageLink())); action->setEnabled(!groupId().isNull() && !mThreadId.isNull()); @@ -465,11 +469,14 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) contextMnu.addAction(markMsgAsReadChildren); contextMnu.addAction(markMsgAsUnread); contextMnu.addAction(markMsgAsUnreadChildren); - contextMnu.addSeparator(); - contextMnu.addAction(expandAll); + contextMnu.addSeparator(); + contextMnu.addAction(expandAll); contextMnu.addAction(collapseAll); - contextMnu.exec(QCursor::pos()); + contextMnu.addSeparator(); + contextMnu.addAction(replyauthorAct); + + contextMnu.exec(QCursor::pos()); } bool GxsForumThreadWidget::eventFilter(QObject *obj, QEvent *event) @@ -1821,8 +1828,10 @@ void GxsForumThreadWidget::loadGroupData(const uint32_t &token) mForumGroup = groups[0]; insertGroupData(); - mStateHelper->setActive(mTokenTypeGroupData, true); - } + mStateHelper->setActive(mTokenTypeGroupData, true); + + ui->subscribeToolButton->setHidden(IS_GROUP_SUBSCRIBED(mSubscribeFlags)) ; + } else { std::cerr << "GxsForumThreadWidget::loadGroupSummary_CurrentForum() ERROR Invalid Number of Groups..."; @@ -1886,7 +1895,7 @@ void GxsForumThreadWidget::loadMessageData(const uint32_t &token) mStateHelper->setActive(mTokenTypeMessageData, false); mStateHelper->clear(mTokenTypeMessageData); - } + } } /*********************** **** **** **** ***********************/ diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index e0fec1a3f..b50dfc0ce 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -81,6 +81,34 @@ + + + + + 2 + 0 + + + + + 0 + 0 + + + + + 16777215 + 1677215 + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + @@ -126,6 +154,25 @@ + + + + + Last Post + + + + + Threaded View + + + + + Flat View + + + + @@ -153,60 +200,6 @@ 3 - - - - Forum: - - - - - - - - 2 - 0 - - - - - 0 - 0 - - - - - 16777215 - 1677215 - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - Last Post - - - - - Threaded View - - - - - Flat View - - - - @@ -484,6 +477,11 @@ + + RSTextBrowser + QTextBrowser +
gui/common/RSTextBrowser.h
+ LineEditClear QLineEdit @@ -494,11 +492,6 @@ QToolButton
gui/common/SubscribeToolButton.h
 - - RSTextBrowser - QTextBrowser -
gui/common/RSTextBrowser.h
- RSTreeWidget QTreeWidget