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

Activated disabled code in GxsForums before merging.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/GxsForumsDialog.cpp
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);
//}

2
retroshare-gui/src/gui/GxsForumsDialog.h
View file

@ -46,7 +46,7 @@ public:
GxsForumsDialog(QWidget *parent = 0);
~GxsForumsDialog();
//#AFTER MERGE virtual UserNotify *getUserNotify(QObject *parent);
// virtual UserNotify *getUserNotify(QObject *parent);
bool navigate(const std::string& forumId, const std::string& msgId);

39
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -36,6 +36,7 @@
#include "gui/gxs/GxsForumGroupDialog.h"
#include "CreateGxsForumMsg.h"
#include "gui/msgs/MessageComposer.h"
#include "util/DateTime.h"
#include <retroshare/rsgxsforums.h>
#include <retroshare/rspeers.h>
@ -140,22 +141,12 @@ GxsForumThreadWidget::GxsForumThreadWidget(const std::string &forumId, QWidget *
QTreeWidgetItem *headerItem = ui->threadTreeWidget->headerItem();
headerItem->setText(COLUMN_THREAD_READ, "");
//#AFTER MERGE
setTextColorNotSubscribed(Qt::black);
setTextColorUnread(Qt::black);
setTextColorUnreadChildren(Qt::gray);
setTextColorRead(Qt::gray);
setTextColorMissing(Qt::darkRed);
/* Initialize group tree */
//#AFTER MERGE ui.forumTreeWidget->initDisplayMenu(ui.displayButton);
/* add filter actions */
//#AFTER MERGE ui.filterLineEdit->addFilter(QIcon(), tr("Title"), COLUMN_THREAD_TITLE, tr("Search Title"));
//#AFTER MERGE ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_THREAD_DATE, tr("Search Date"));
//#AFTER MERGE ui.filterLineEdit->addFilter(QIcon(), tr("Author"), COLUMN_THREAD_AUTHOR, tr("Search Author"));
//#AFTER MERGE ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_THREAD_CONTENT, tr("Search Content"));
//#AFTER MERGE ui.filterLineEdit->setCurrentFilter(COLUMN_THREAD_TITLE);
ui->filterLineEdit->addFilter(QIcon(), tr("Title"), COLUMN_THREAD_TITLE, tr("Search Title"));
ui->filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_THREAD_DATE, tr("Search Date"));
ui->filterLineEdit->addFilter(QIcon(), tr("Author"), COLUMN_THREAD_AUTHOR, tr("Search Author"));
ui->filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_THREAD_CONTENT, tr("Search Content"));
ui->filterLineEdit->setCurrentFilter(COLUMN_THREAD_TITLE);
mLastViewType = -1;
@ -219,7 +210,7 @@ void GxsForumThreadWidget::processSettings(bool load)
togglethreadview_internal();
// filterColumn
//#AFTER MERGE ui.filterLineEdit->setCurrentFilter(Settings->value("filterColumn", COLUMN_THREAD_TITLE).toInt());
ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", COLUMN_THREAD_TITLE).toInt());
// index of viewBox
ui->viewBox->setCurrentIndex(Settings->value("viewBox", VIEW_THREADED).toInt());
@ -797,14 +788,14 @@ QTreeWidgetItem *GxsForumThreadWidget::convertMsgToThreadWidget(const RsGxsForum
else
qtime.setTime_t(msg.mMeta.mPublishTs);
//#AFTER MERGE text = DateTime::formatDateTime(qtime);
text = DateTime::formatDateTime(qtime);
sort = qtime.toString("yyyyMMdd_hhmmss");
if (useChildTS)
{
qtime.setTime_t(msg.mMeta.mPublishTs);
text += " / ";
//#AFTER MERGE text += DateTime::formatDateTime(qtime);
text += DateTime::formatDateTime(qtime);
sort += "_" + qtime.toString("yyyyMMdd_hhmmss");
}
item->setText(COLUMN_THREAD_DATE, text);
@ -948,7 +939,7 @@ void GxsForumThreadWidget::insertForumThreads(const RsGroupMetaData &fi)
// set data
mFillThread->mCompareRole = mThreadCompareRole;
mFillThread->mForumId = mForumId;
//#AFTER MERGE mFillThread->mFilterColumn = ui->filterLineEdit->currentFilter();
mFillThread->mFilterColumn = ui->filterLineEdit->currentFilter();
mFillThread->mFilterColumn = COLUMN_THREAD_TITLE;
mFillThread->mSubscribeFlags = mSubscribeFlags;
mFillThread->mExpandNewMessages = Settings->getExpandNewMessages();
@ -1229,12 +1220,11 @@ void GxsForumThreadWidget::insertPostData(const RsGxsForumMsg &msg)
}
}
//#AFTER MERGE ui.time_label->setText(DateTime::formatLongDateTime(msg.mMeta.mPublishTs));
ui->time_label->setText(DateTime::formatLongDateTime(msg.mMeta.mPublishTs));
std::string authorName = rsPeers->getPeerName(msg.mMeta.mAuthorId);
QString text = QString::fromUtf8(authorName.c_str());
//#AFTER MERGE merge from ForumsDialog
if (text.isEmpty())
{
ui->by_label->setText( tr("By") + " " + tr("Anonymous"));
@ -1561,11 +1551,11 @@ static QString buildReplyHeader(const RsMsgMetaData &meta)
QString header = QString("<span>-----%1-----").arg(QApplication::translate("GxsForumsDialog", "Original Message"));
header += QString("<br><font size='3'><strong>%1: </strong>%2</font><br>").arg(QApplication::translate("GxsForumsDialog", "From"), from);
//#AFTER MERGE header += QString("<br><font size='3'><strong>%1: </strong>%2</font><br>").arg(QApplication::translate("GxsForumsDialog", "Sent"), DateTime::formatLongDateTime(meta.mPublishTs));
header += QString("<br><font size='3'><strong>%1: </strong>%2</font><br>").arg(QApplication::translate("GxsForumsDialog", "Sent"), DateTime::formatLongDateTime(meta.mPublishTs));
header += QString("<font size='3'><strong>%1: </strong>%2</font></span><br>").arg(QApplication::translate("GxsForumsDialog", "Subject"), QString::fromUtf8(meta.mMsgName.c_str()));
header += "<br>";
//#AFTER MERGE header += QApplication::translate("GxsForumsDialog", "On %1, %2 wrote:").arg(DateTime::formatDateTime(meta.mPublishTs), from);
header += QApplication::translate("GxsForumsDialog", "On %1, %2 wrote:").arg(DateTime::formatDateTime(meta.mPublishTs), from);
return header;
}
@ -1644,8 +1634,7 @@ void GxsForumThreadWidget::filterColumnChanged(int column)
void GxsForumThreadWidget::filterItems(const QString& text)
{
//#AFTER MERGE int filterColumn = ui.filterLineEdit->currentFilter();
int filterColumn = COLUMN_THREAD_TITLE;
int filterColumn = ui->filterLineEdit->currentFilter();
int count = ui->threadTreeWidget->topLevelItemCount();
for (int index = 0; index < count; ++index) {

2
retroshare-gui/src/gui/qss/stylesheet/qss.default
View file

@ -13,7 +13,7 @@ AvatarWidget[frameState="BUSY"]{border-image:url(:/images/avatarstatus-bg-busy-1
/* Color definitions */
ForumsDialog
ForumsDialog, GxsForumThreadWidget
{
qproperty-textColorRead: gray;
qproperty-textColorUnread: black;

64
retroshare-gui/src/lang/retroshare_en.ts
View file

@ -2373,6 +2373,42 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
<source>Forums/channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Abnormal size read is bigger than memory block.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid location id.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid external IP.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid local IP.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid checksum section.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Checksum mismatch. Certificate is corrupted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown section type found (Certificate might be corrupted).</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Missing checksum.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown certificate error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateBlog</name>
@ -5829,6 +5865,26 @@ p, li { white-space: pre-wrap; }
<source>You cant reply to an Anonymous Author</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Author</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Content</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GxsForumsDialog</name>
@ -5924,6 +5980,14 @@ p, li { white-space: pre-wrap; }
<source>My Forums</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>On %1, %2 wrote:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GxsForumsFillThread</name>