diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index a7dae16ac..dfba26ebb 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -872,9 +872,6 @@ void ForumsDialog::insertThreads() subscribeFlags = fi.subscribeFlags; ui.forumName->setText(QString::fromStdWString(fi.forumName)); - - - ui.progressBarLayOut->setEnabled(true); ui.progLayOutTxt->show(); @@ -1068,6 +1065,24 @@ void ForumsDialog::FillChildren(QTreeWidgetItem *Parent, QTreeWidgetItem *NewPar } } +QString ForumsDialog::titleFromInfo(ForumMsgInfo &msgInfo) +{ + if (msgInfo.msgflags & RS_DISTRIB_MISSING_MSG) { + return QApplication::translate("ForumsDialog", "[ ... Missing Message ... ]"); + } + + return QString::fromStdWString(msgInfo.title); +} + +QString ForumsDialog::messageFromInfo(ForumMsgInfo &msgInfo) +{ + if (msgInfo.msgflags & RS_DISTRIB_MISSING_MSG) { + return QApplication::translate("ForumsDialog", "Placeholder for missing Message"); + } + + return QString::fromStdWString(msgInfo.msg); +} + void ForumsDialog::insertPost() { if ((mCurrForumId == "") || (mCurrThreadId == "")) @@ -1124,10 +1139,10 @@ void ForumsDialog::insertPost() } } - QString extraTxt = RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); + QString extraTxt = RsHtml::formatText(messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); ui.postText->setHtml(extraTxt); - ui.threadTitle->setText(QString::fromStdWString(msg.title)); + ui.threadTitle->setText(titleFromInfo(msg)); } void ForumsDialog::previousMessage () @@ -1814,7 +1829,7 @@ void ForumsFillThread::run() item->setText(COLUMN_THREAD_DATE, text); } - item->setText(COLUMN_THREAD_TITLE, QString::fromStdWString(tit->title)); + item->setText(COLUMN_THREAD_TITLE, ForumsDialog::titleFromInfo(msginfo)); text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str()); if (text.isEmpty()) @@ -1928,7 +1943,7 @@ void ForumsFillThread::run() child->setText(COLUMN_THREAD_DATE, text); } - child->setText(COLUMN_THREAD_TITLE, QString::fromStdWString(mit->title)); + child->setText(COLUMN_THREAD_TITLE, ForumsDialog::titleFromInfo(msginfo)); text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str()); if (text.isEmpty()) @@ -1954,7 +1969,7 @@ void ForumsFillThread::run() if (filterColumn == COLUMN_THREAD_CONTENT) { // need content for filter QTextDocument doc; - doc.setHtml(QString::fromStdWString(msginfo.msg)); + doc.setHtml(ForumsDialog::messageFromInfo(msginfo)); child->setText(COLUMN_THREAD_CONTENT, doc.toPlainText().replace(QString("\n"), QString(" "))); } diff --git a/retroshare-gui/src/gui/ForumsDialog.h b/retroshare-gui/src/gui/ForumsDialog.h index 989e42262..e09fd8330 100644 --- a/retroshare-gui/src/gui/ForumsDialog.h +++ b/retroshare-gui/src/gui/ForumsDialog.h @@ -30,6 +30,7 @@ class ForumInfo; class ForumsFillThread; +class ForumMsgInfo; class ForumsDialog : public RsAutoUpdatePage { @@ -44,6 +45,9 @@ public: /* overloaded from RsAuthUpdatePage */ virtual void updateDisplay(); + static QString titleFromInfo(ForumMsgInfo &msgInfo); + static QString messageFromInfo(ForumMsgInfo &msgInfo); + protected: bool eventFilter(QObject *obj, QEvent *ev); diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index 795a1d3ae..9348fcdab 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -346,7 +346,7 @@ bool RetroShareLink::createForum(const std::string& id, const std::string& msgId } else { ForumMsgInfo mi; if (rsForums->getForumMessage(id, msgId, mi)) { - _name = QString::fromStdWString(mi.title); + _name = ForumsDialog::titleFromInfo(mi); } } } diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp index e8da1ded2..5cc20ea71 100644 --- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp @@ -34,6 +34,7 @@ #include "gui/chat/HandleRichText.h" #include "gui/common/AvatarDefs.h" #include "gui/notifyqt.h" +#include "gui/ForumsDialog.h" //#include "gui/settings/rsharesettings.h" /**** @@ -154,8 +155,8 @@ void ForumMsgItem::updateItemStatic() } prevSubLabel->setText(link.toHtml()); - prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); - + prevMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); + QDateTime qtime; qtime.setTime_t(msg.ts); QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm"); @@ -179,7 +180,7 @@ void ForumMsgItem::updateItemStatic() } nextSubLabel->setText(link.toHtml()); - nextMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); + nextMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); QDateTime qtime; qtime.setTime_t(msg.ts); @@ -196,7 +197,7 @@ void ForumMsgItem::updateItemStatic() RetroShareLink linkParent; linkParent.createForum(msgParent.forumId, msgParent.msgId); prevSubLabel->setText(linkParent.toHtml()); - prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msgParent.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); + prevMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msgParent), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); if (rsPeers->getPeerName(msgParent.srcId) !="") { @@ -217,7 +218,7 @@ void ForumMsgItem::updateItemStatic() } /* header stuff */ - subjectLabel->setText(QString::fromStdWString(msg.title)); + subjectLabel->setText(ForumsDialog::titleFromInfo(msg)); //srcLabel->setText(QString::fromStdString(msg.srcId)); } diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index fe6688ed4..1ec92f509 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 eab2b1d45..e9961e7c7 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -691,7 +691,7 @@ p, li { white-space: pre-wrap; } CertificatePage - + Certificate files Zertifikat-Dateien @@ -790,7 +790,7 @@ p, li { white-space: pre-wrap; } - + Expand Erweitern @@ -825,7 +825,7 @@ p, li { white-space: pre-wrap; } Kopiere RetroShare Link - + Channel Feed Kanal @@ -1563,7 +1563,7 @@ p, li { white-space: pre-wrap; } Schriftart auf den Standard setzen - + Paste RetroShare Link RetroShare Link einfügen @@ -1573,7 +1573,7 @@ p, li { white-space: pre-wrap; } tippt... - + Do you really want to physically delete the history? Möchtest du wirklich den Nachrichtenverlauf physisch löschen? @@ -1953,7 +1953,7 @@ und meinen GPG Schlüssel nicht unterzeichnet ConnectFriendWizard - + Certificate Load Failed Das Zertifikat konnte nicht geladen werden @@ -3674,7 +3674,7 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht EmailPage - + Invite Friends by Email Lade Freunde per Email ein @@ -4264,7 +4264,7 @@ p, li { white-space: pre-wrap; } Unterzeichnen - + Forum Post Beitrag @@ -4286,7 +4286,7 @@ p, li { white-space: pre-wrap; } Als Antwort auf - + Please give a Text Message Bitte Nachricht eingeben @@ -4426,7 +4426,17 @@ p, li { white-space: pre-wrap; } - + + [ ... Missing Message ... ] + [ ... Fehlende Nachricht ... ] + + + + Placeholder for missing Message + Platzhalter für fehlende Nachricht + + + RetroShare @@ -4442,7 +4452,7 @@ p, li { white-space: pre-wrap; } Du kannst einem anonymen Autor nicht antworten - + Your Forums Deine Foren @@ -4603,7 +4613,7 @@ p, li { white-space: pre-wrap; } - + Start New Thread Erstelle neues Thema @@ -4631,7 +4641,7 @@ p, li { white-space: pre-wrap; } Inhalt - + Mark as read Als gelesen markieren @@ -4652,7 +4662,7 @@ p, li { white-space: pre-wrap; } ForumsFillThread - + Anonymous Anonym @@ -5203,7 +5213,7 @@ p, li { white-space: pre-wrap; } Reset font to default - + Schriftart auf den Standard setzen Hide Offline Friends @@ -5269,7 +5279,7 @@ p, li { white-space: pre-wrap; } Neuigkeiten - + Welcome to RetroShare's group chat. Willkommen bei RetroShare's Gruppenchat. @@ -5399,7 +5409,7 @@ p, li { white-space: pre-wrap; } Neuer Gruppenchat - + Do you really want to physically delete the history? Möchtest du wirklich den Nachrichtenverlauf physisch löschen? @@ -5752,7 +5762,7 @@ p, li { white-space: pre-wrap; } Generate new Location - Erstelle neues Ort + Erstelle neuen Ort @@ -9263,7 +9273,7 @@ p, li { white-space: pre-wrap; } Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten: - + Examining shared files... Prüfe freigegebene Dateien... @@ -10605,7 +10615,7 @@ Lockdatei: Der Empfänger der Nachricht ist unbekannt. - + Click to add this RetroShare cert to your GPG keyring and open the Make Friend Wizard. @@ -10614,7 +10624,7 @@ und den Assistent zum Hinzufügen von Freunden zu starten. - + Add file Datei hinzufügen @@ -10649,7 +10659,7 @@ und den Assistent zum Hinzufügen von Freunden zu starten. Bestätigung - + %1 of %2 RetroShare links processed. %1 von %2 RetroShare Links verarbeitet. @@ -12131,7 +12141,39 @@ Es hilft auch, wenn Sie sich hinter einer Firewall/VPN befinden. Erlaube RetroShare folgende Webseiten nach Ihrer IP zu fragen: - + + Turtle router + + + + + <!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:'Ubuntu'; font-size:11pt; 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;"><span style=" font-weight:600;">Warning</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;"> </span>This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you're doing. </p></body></html> + + + + + Max average tunnel request forwarded per second: + + + + + This value controls how many tunnel request your peer can forward per second. + +If you have a large internet bandwidth, you may raise this up to 30-40, to allow +statisticlly longuer tunnels to pass. Be very careful though, since this generates +many small packets that can significantly slow down your own file transfer. + +The default value is 20. + + + + Dynamic DNS Dynamisches DNS