diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp index d6a687d72..d11d5fd43 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp @@ -26,7 +26,7 @@ #include #include "gui/forums/CreateForumMsg.h" - +#include "gui/chat/HandleRichText.h" /**** * #define DEBUG_ITEM 1 @@ -89,7 +89,7 @@ void ForumMsgItem::updateItemStatic() } else { - titleLabel->setText("Unknown Forum Post"); + titleLabel->setText(tr("Unknown Forum Post")); } /* get actual Message */ @@ -115,7 +115,7 @@ void ForumMsgItem::updateItemStatic() { prevSHLabel->setText("Subject: "); prevSubLabel->setText(QString::fromStdWString(msg.title)); - prevMsgLabel->setText(QString::fromStdWString(msg.msg)); + prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); QDateTime qtime; qtime.setTime_t(msg.ts); @@ -127,7 +127,7 @@ void ForumMsgItem::updateItemStatic() else { nextSubLabel->setText(QString::fromStdWString(msg.title)); - nextMsgLabel->setText(QString::fromStdWString(msg.msg)); + nextMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); QDateTime qtime; qtime.setTime_t(msg.ts); @@ -140,7 +140,7 @@ void ForumMsgItem::updateItemStatic() if (rsForums->getForumMessage(mForumId, msg.parentId, msgParent)) { prevSubLabel->setText(QString::fromStdWString(msgParent.title)); - prevMsgLabel->setText(QString::fromStdWString(msgParent.msg)); + prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msgParent.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); } else { diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui index 205cea2a7..0f57ca026 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui @@ -64,7 +64,7 @@ border-radius: 10px} - :/images/konversation.png + :/images/konversation.png Qt::AlignCenter @@ -144,7 +144,7 @@ border-radius: 10px} - + :/images/edit_add24.png:/images/edit_add24.png @@ -164,7 +164,7 @@ border-radius: 10px} - + :/images/close_normal.png:/images/close_normal.png @@ -260,7 +260,7 @@ border-radius: 10px} - + :/images/mail_delete.png:/images/mail_delete.png @@ -296,7 +296,7 @@ border-radius: 10px} - + :/images/replymail24.png:/images/replymail24.png @@ -380,6 +380,9 @@ border-radius: 10px} true + + true + @@ -496,6 +499,9 @@ border-radius: 10px} true + + true + @@ -508,8 +514,6 @@ border-radius: 10px} - - - + diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp index c78ae4ec0..662e43ef9 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp @@ -26,6 +26,7 @@ #include "FeedHolder.h" #include "SubFileItem.h" #include "gui/msgs/MessageComposer.h" +#include "gui/chat/HandleRichText.h" #include #include @@ -81,18 +82,18 @@ void MsgItem::updateItemStatic() mPeerId = mi.srcId; QString title; - QString timestamp; + QString timestamp; QString srcName = QString::fromStdString(rsPeers->getPeerName(mi.srcId)); { QDateTime qtime; qtime.setTime_t(mi.ts); - timestamp = qtime.toString("yyyy-MM-dd hh:mm:ss"); + timestamp = qtime.toString("yyyy-MM-dd hh:mm:ss"); } if (!mIsHome) { - title = "Message From: "; + title = tr("Message From") + ": "; } else { @@ -101,15 +102,15 @@ void MsgItem::updateItemStatic() switch(box) { case RS_MSG_SENTBOX: - title = "Sent Msg: "; + title = tr("Sent Msg") + ": "; replyButton->setEnabled(false); break; case RS_MSG_DRAFTBOX: - title = "Draft Msg: "; + title = tr("Draft Msg") + ": "; replyButton->setEnabled(false); break; case RS_MSG_OUTBOX: - title = "Pending Msg: "; + title = tr("Pending Msg") + ": "; //deleteButton->setEnabled(false); replyButton->setEnabled(false); break; @@ -121,11 +122,10 @@ void MsgItem::updateItemStatic() } title += srcName + " @ " + timestamp; - titleLabel->setText(title); subjectLabel->setText(QString::fromStdWString(mi.title)); - msgLabel->setText(QString::fromStdWString(mi.msg)); + msgLabel->setText(RsHtml::formatText(QString::fromStdWString(mi.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); std::list::iterator it; for(it = mi.files.begin(); it != mi.files.end(); it++) diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui index f79fa3ca9..0565daf15 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.ui +++ b/retroshare-gui/src/gui/feeds/MsgItem.ui @@ -122,7 +122,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); - + :/images/edit_add24.png:/images/edit_add24.png @@ -142,7 +142,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); - + :/images/close_normal.png:/images/close_normal.png @@ -174,7 +174,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); Reply Message - + :/images/mail_reply.png:/images/mail_reply.png @@ -213,7 +213,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); - + :/images/mail_delete.png:/images/mail_delete.png @@ -233,7 +233,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); - + :/images/startall.png:/images/startall.png @@ -262,6 +262,9 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); true + + true + @@ -272,8 +275,6 @@ stop: 0 #2291E0, stop: 1 #3EB3FF); - - - + diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index f54cd028b..cb7e9c3b0 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 6e84c1f39..0a88f83b4 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -2423,7 +2423,7 @@ p, li { white-space: pre-wrap; } Als Antwort auf - + RetroShare @@ -3446,12 +3446,12 @@ p, li { white-space: pre-wrap; } - + Subject: Betreff: - + Unsubscribe To Forum Forum abbestellen @@ -3461,7 +3461,12 @@ p, li { white-space: pre-wrap; } Antwort - + + Unknown Forum Post + Unbekannter Forumbeitrag + + + In Reply to Als Antwort auf @@ -6578,7 +6583,27 @@ p, li { white-space: pre-wrap; } Auf Nachricht antworten - + + Message From + Nachricht von + + + + Sent Msg + Gesendet + + + + Draft Msg + Entwurf + + + + Pending Msg + Wartend + + + Hide Verbergen