From 602ae72d7d90e549f3ccbfc0a37d001553fe242f Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 31 Jan 2012 00:06:24 +0000 Subject: [PATCH] Added new compact style for chat. Improved the HTML optimizer. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4867 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/FriendsDialog.cpp | 5 +- retroshare-gui/src/gui/chat/ChatStyle.cpp | 18 ++- .../src/gui/chat/HandleRichText.cpp | 106 ++++++++++++++++-- retroshare-gui/src/gui/chat/HandleRichText.h | 1 + retroshare-gui/src/gui/images.qrc | 72 ++++++++---- .../qss/chat/compact/history/hincoming.htm | 11 ++ .../qss/chat/compact/history/houtgoing.htm | 11 ++ .../gui/qss/chat/compact/history/incoming.htm | 11 ++ .../src/gui/qss/chat/compact/history/info.xml | 12 ++ .../src/gui/qss/chat/compact/history/main.css | 66 +++++++++++ .../qss/chat/compact/history/ooutgoing.htm | 11 ++ .../gui/qss/chat/compact/history/outgoing.htm | 11 ++ .../history/variants/Standard.css | 0 .../qss/chat/compact/private/hincoming.htm | 7 ++ .../qss/chat/compact/private/houtgoing.htm | 7 ++ .../gui/qss/chat/compact/private/incoming.htm | 7 ++ .../src/gui/qss/chat/compact/private/info.xml | 12 ++ .../src/gui/qss/chat/compact/private/main.css | 27 +++++ .../qss/chat/compact/private/ooutgoing.htm | 7 ++ .../gui/qss/chat/compact/private/outgoing.htm | 7 ++ .../private/variants/Standard.css | 0 .../gui/qss/chat/compact/public/hincoming.htm | 7 ++ .../gui/qss/chat/compact/public/houtgoing.htm | 7 ++ .../gui/qss/chat/compact/public/incoming.htm | 7 ++ .../src/gui/qss/chat/compact/public/info.xml | 12 ++ .../src/gui/qss/chat/compact/public/main.css | 43 +++++++ .../gui/qss/chat/compact/public/ooutgoing.htm | 7 ++ .../gui/qss/chat/compact/public/outgoing.htm | 7 ++ .../public/variants/Standard.css | 0 .../src/gui/qss/chat/images/Thumbs.db | Bin 3584 -> 0 bytes .../src/gui/qss/chat/images/rstray3.png | Bin 1290 -> 0 bytes .../chat/{ => standard}/history/hincoming.htm | 0 .../chat/{ => standard}/history/houtgoing.htm | 0 .../chat/{ => standard}/history/incoming.htm | 0 .../qss/chat/{ => standard}/history/info.xml | 0 .../qss/chat/{ => standard}/history/main.css | 8 +- .../chat/{ => standard}/history/ooutgoing.htm | 0 .../chat/{ => standard}/history/outgoing.htm | 0 .../standard/history/variants/Standard.css | 0 .../chat/{ => standard}/private/hincoming.htm | 0 .../chat/{ => standard}/private/houtgoing.htm | 0 .../chat/{ => standard}/private/incoming.htm | 0 .../qss/chat/{ => standard}/private/info.xml | 0 .../qss/chat/{ => standard}/private/main.css | 0 .../chat/{ => standard}/private/ooutgoing.htm | 0 .../chat/{ => standard}/private/outgoing.htm | 0 .../standard/private/variants/Standard.css | 0 .../chat/{ => standard}/public/hincoming.htm | 2 +- .../chat/{ => standard}/public/houtgoing.htm | 2 +- .../chat/{ => standard}/public/incoming.htm | 2 +- .../qss/chat/{ => standard}/public/info.xml | 0 .../qss/chat/{ => standard}/public/main.css | 15 ++- .../chat/{ => standard}/public/ooutgoing.htm | 2 +- .../chat/{ => standard}/public/outgoing.htm | 2 +- .../standard/public/variants/Standard.css | 0 retroshare-gui/src/gui/settings/ChatPage.cpp | 26 ++--- .../src/gui/settings/rsharesettings.cpp | 18 ++- retroshare-gui/src/lang/retroshare_de.qm | Bin 339903 -> 340426 bytes retroshare-gui/src/lang/retroshare_de.ts | 37 +++++- 59 files changed, 530 insertions(+), 83 deletions(-) create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/hincoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/houtgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/incoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/info.xml create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/main.css create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/ooutgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/history/outgoing.htm rename retroshare-gui/src/gui/qss/chat/{ => compact}/history/variants/Standard.css (100%) create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/hincoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/houtgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/incoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/info.xml create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/main.css create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/ooutgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/private/outgoing.htm rename retroshare-gui/src/gui/qss/chat/{ => compact}/private/variants/Standard.css (100%) create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/hincoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/houtgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/incoming.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/info.xml create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/main.css create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/ooutgoing.htm create mode 100644 retroshare-gui/src/gui/qss/chat/compact/public/outgoing.htm rename retroshare-gui/src/gui/qss/chat/{ => compact}/public/variants/Standard.css (100%) delete mode 100644 retroshare-gui/src/gui/qss/chat/images/Thumbs.db delete mode 100644 retroshare-gui/src/gui/qss/chat/images/rstray3.png rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/hincoming.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/houtgoing.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/incoming.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/info.xml (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/main.css (85%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/ooutgoing.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/history/outgoing.htm (100%) create mode 100644 retroshare-gui/src/gui/qss/chat/standard/history/variants/Standard.css rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/hincoming.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/houtgoing.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/incoming.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/info.xml (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/main.css (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/ooutgoing.htm (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/private/outgoing.htm (100%) create mode 100644 retroshare-gui/src/gui/qss/chat/standard/private/variants/Standard.css rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/hincoming.htm (61%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/houtgoing.htm (61%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/incoming.htm (59%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/info.xml (100%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/main.css (63%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/ooutgoing.htm (59%) rename retroshare-gui/src/gui/qss/chat/{ => standard}/public/outgoing.htm (59%) create mode 100644 retroshare-gui/src/gui/qss/chat/standard/public/variants/Standard.css diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 7d4fa50d2..21f70f4f2 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -370,7 +370,10 @@ void FriendsDialog::addChatMsg(bool incoming, bool history, const QString &name, type = ChatStyle::FORMATMSG_OUTGOING; } } - QString formatMsg = style.formatMessage(type, name, incoming ? recvTime : sendTime, message, formatFlag); + // Remove

's from older RetroShare versions before 31.01.2012 (can be removed later) + QString optimizedMessage = message; + RsHtml::optimizeHtml(optimizedMessage); + QString formatMsg = style.formatMessage(type, name, incoming ? recvTime : sendTime, optimizedMessage, formatFlag); ui.msgText->append(formatMsg); } diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp index 1ae88feed..cdaa5b134 100644 --- a/retroshare-gui/src/gui/chat/ChatStyle.cpp +++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp @@ -435,24 +435,36 @@ static QString getBaseDir() switch (styleType) { case TYPE_PUBLIC: - if (getStyleInfo(":/qss/chat/public", ":/qss/chat/public", standardInfo)) { + if (getStyleInfo(":/qss/chat/standard/public", ":/qss/chat/standard/public", standardInfo)) { standardInfo.styleDescription = tr("Standard style for group chat"); styles.append(standardInfo); } + if (getStyleInfo(":/qss/chat/compact/public", ":/qss/chat/compact/public", standardInfo)) { + standardInfo.styleDescription = tr("Compact style for group chat"); + styles.append(standardInfo); + } stylePath = "stylesheets/public"; break; case TYPE_PRIVATE: - if (getStyleInfo(":/qss/chat/private", ":/qss/chat/private", standardInfo)) { + if (getStyleInfo(":/qss/chat/standard/private", ":/qss/chat/standard/private", standardInfo)) { standardInfo.styleDescription = tr("Standard style for private chat"); styles.append(standardInfo); } + if (getStyleInfo(":/qss/chat/compact/private", ":/qss/chat/compact/private", standardInfo)) { + standardInfo.styleDescription = tr("Compact style for private chat"); + styles.append(standardInfo); + } stylePath = "stylesheets/private"; break; case TYPE_HISTORY: - if (getStyleInfo(":/qss/chat/history", ":/qss/chat/history", standardInfo)) { + if (getStyleInfo(":/qss/chat/standard/history", ":/qss/chat/standard/history", standardInfo)) { standardInfo.styleDescription = tr("Standard style for history"); styles.append(standardInfo); } + if (getStyleInfo(":/qss/chat/compact/history", ":/qss/chat/compact/history", standardInfo)) { + standardInfo.styleDescription = tr("Compact style for history"); + styles.append(standardInfo); + } stylePath = "stylesheets/history"; break; case TYPE_UNKNOWN: diff --git a/retroshare-gui/src/gui/chat/HandleRichText.cpp b/retroshare-gui/src/gui/chat/HandleRichText.cpp index eed0f5583..84d6c7bb8 100644 --- a/retroshare-gui/src/gui/chat/HandleRichText.cpp +++ b/retroshare-gui/src/gui/chat/HandleRichText.cpp @@ -173,7 +173,10 @@ QString formatText(const QString &text, unsigned int flag) embedHtml(doc, body, defEmbedAhref); } - return doc.toString(-1); // -1 removes any annoying carriage return misinterpreted by QTextEdit + QString formattedText = doc.toString(-1); // -1 removes any annoying carriage return misinterpreted by QTextEdit + optimizeHtml(formattedText); + + return formattedText; } static void findElements(QDomDocument& doc, QDomElement& currentElement, const QString& nodeName, const QString& nodeAttribute, QStringList &elements) @@ -217,28 +220,100 @@ bool findAnchors(const QString &text, QStringList& urls) return true; } +static void removeElement(QDomElement& parentElement, QDomElement& element) +{ + QDomNodeList children = element.childNodes(); + while (children.length() > 0) { + QDomNode childElement = element.removeChild(children.item(children.length() - 1)); + parentElement.insertAfter(childElement, element); + } + parentElement.removeChild(element); +} + static void optimizeHtml(QDomDocument& doc, QDomElement& currentElement) { + if (currentElement.tagName().toLower() == "html") { + // change to + currentElement.setTagName("span"); + } + + QDomNode styleNode; + QDomAttr styleAttr; + bool addBR = false; + QDomNodeList children = currentElement.childNodes(); for (uint index = 0; index < children.length(); ) { QDomNode node = children.item(index); + + // compress style attribute + styleNode = node.attributes().namedItem("style"); + if (styleNode.isAttr()) { + styleAttr = styleNode.toAttr(); + QString value = styleAttr.value().simplified(); + value.replace("margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;", "margin:0px 0px 0px 0px;"); + value.replace("; ", ";"); + styleAttr.setValue(value); + } + if (node.isElement()) { QDomElement element = node.toElement(); + + // not

+ if (addBR && element.tagName().toLower() != "p") { + // add
after a removed

but not before a

+ QDomElement elementBr = doc.createElement("br"); + currentElement.insertBefore(elementBr, element); + addBR = false; + ++index; + } + + // + if (element.tagName().toLower() == "body") { + if (element.attributes().length() == 0) { + // remove without attributes + removeElement(currentElement, element); + // no ++index; + continue; + } + // change to + element.setTagName("span"); + } + + // if (element.tagName().toLower() == "head") { - // remove head + // remove currentElement.removeChild(node); + // no ++index; continue; } - QDomNode style = element.attributes().namedItem("style"); - if (style.isAttr()) { - QDomAttr attr = style.toAttr(); - // compress style attribute - QString value = attr.value().simplified(); - value.replace("margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;", "margin:0px 0px 0px 0px;"); - value.replace("; ", ";"); - attr.setValue(value); - } + + // iterate children optimizeHtml(doc, element); + + //

+ if (element.tagName().toLower() == "p") { + //

+ //styleNode = element.attributes().namedItem("style"); + if (element.attributes().size() == 1 && styleNode.isAttr()) { + QString value = styleAttr.toAttr().value().simplified(); + if (value == "margin:0px 0px 0px 0px;-qt-block-indent:0;text-indent:0px;" || + value.startsWith("-qt-paragraph-type:empty;margin:0px 0px 0px 0px;-qt-block-indent:0;text-indent:0px;")) { + + if (addBR) { + // add
after a removed

before a removed

+ QDomElement elementBr = doc.createElement("br"); + currentElement.insertBefore(elementBr, element); + ++index; + } + // remove Qt standard

or empty

+ index += element.childNodes().length(); + removeElement(currentElement, element); + addBR = true; + continue; + } + } + addBR = false; + } } ++index; } @@ -254,6 +329,13 @@ void optimizeHtml(QTextEdit *textEdit, QString &text) text = textEdit->toHtml(); + optimizeHtml(text); +} + +void optimizeHtml(QString &text) +{ + int originalLength = text.length(); + // remove doctype text.remove(QRegExp("]*>")); @@ -266,7 +348,7 @@ void optimizeHtml(QTextEdit *textEdit, QString &text) optimizeHtml(doc, body); text = doc.toString(-1); - std::cerr << "Optimized text to " << text.length() << " bytes , instead of " << textEdit->toHtml().length() << std::endl; + std::cerr << "Optimized text to " << text.length() << " bytes , instead of " << originalLength << std::endl; } QString toHtml(QString text, bool realHtml) diff --git a/retroshare-gui/src/gui/chat/HandleRichText.h b/retroshare-gui/src/gui/chat/HandleRichText.h index dfe9ce6b2..13e6b1f2f 100644 --- a/retroshare-gui/src/gui/chat/HandleRichText.h +++ b/retroshare-gui/src/gui/chat/HandleRichText.h @@ -114,6 +114,7 @@ QString formatText(const QString &text, unsigned int flag); bool findAnchors(const QString &text, QStringList& urls); void optimizeHtml(QTextEdit *textEdit, QString &text); +void optimizeHtml(QString &text); QString toHtml(QString text, bool realHtml = true); } // namespace RsHtml diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 659803c00..4a3147d57 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -474,30 +474,54 @@ images/window_fullscreen.png images/window_nofullscreen.png layouts/default.ui - qss/chat/private/info.xml - qss/chat/private/incoming.htm - qss/chat/private/outgoing.htm - qss/chat/private/hincoming.htm - qss/chat/private/houtgoing.htm - qss/chat/private/ooutgoing.htm - qss/chat/private/main.css - qss/chat/private/variants/Standard.css - qss/chat/public/info.xml - qss/chat/public/incoming.htm - qss/chat/public/outgoing.htm - qss/chat/public/hincoming.htm - qss/chat/public/houtgoing.htm - qss/chat/public/ooutgoing.htm - qss/chat/public/main.css - qss/chat/public/variants/Standard.css - qss/chat/history/info.xml - qss/chat/history/incoming.htm - qss/chat/history/outgoing.htm - qss/chat/history/hincoming.htm - qss/chat/history/houtgoing.htm - qss/chat/history/ooutgoing.htm - qss/chat/history/main.css - qss/chat/history/variants/Standard.css + qss/chat/standard/private/info.xml + qss/chat/standard/private/incoming.htm + qss/chat/standard/private/outgoing.htm + qss/chat/standard/private/hincoming.htm + qss/chat/standard/private/houtgoing.htm + qss/chat/standard/private/ooutgoing.htm + qss/chat/standard/private/main.css + qss/chat/standard/private/variants/Standard.css + qss/chat/standard/public/info.xml + qss/chat/standard/public/incoming.htm + qss/chat/standard/public/outgoing.htm + qss/chat/standard/public/hincoming.htm + qss/chat/standard/public/houtgoing.htm + qss/chat/standard/public/ooutgoing.htm + qss/chat/standard/public/main.css + qss/chat/standard/public/variants/Standard.css + qss/chat/standard/history/info.xml + qss/chat/standard/history/incoming.htm + qss/chat/standard/history/outgoing.htm + qss/chat/standard/history/hincoming.htm + qss/chat/standard/history/houtgoing.htm + qss/chat/standard/history/ooutgoing.htm + qss/chat/standard/history/main.css + qss/chat/standard/history/variants/Standard.css + qss/chat/compact/private/info.xml + qss/chat/compact/private/incoming.htm + qss/chat/compact/private/outgoing.htm + qss/chat/compact/private/hincoming.htm + qss/chat/compact/private/houtgoing.htm + qss/chat/compact/private/ooutgoing.htm + qss/chat/compact/private/main.css + qss/chat/compact/private/variants/Standard.css + qss/chat/compact/public/info.xml + qss/chat/compact/public/incoming.htm + qss/chat/compact/public/outgoing.htm + qss/chat/compact/public/hincoming.htm + qss/chat/compact/public/houtgoing.htm + qss/chat/compact/public/ooutgoing.htm + qss/chat/compact/public/main.css + qss/chat/compact/public/variants/Standard.css + qss/chat/compact/history/info.xml + qss/chat/compact/history/incoming.htm + qss/chat/compact/history/outgoing.htm + qss/chat/compact/history/hincoming.htm + qss/chat/compact/history/houtgoing.htm + qss/chat/compact/history/ooutgoing.htm + qss/chat/compact/history/main.css + qss/chat/compact/history/variants/Standard.css smileys/amorous.png smileys/angry.png smileys/bad.png diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/hincoming.htm b/retroshare-gui/src/gui/qss/chat/compact/history/hincoming.htm new file mode 100644 index 000000000..fc424dde4 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/hincoming.htm @@ -0,0 +1,11 @@ + + + +
+%date% %time% +%name%: +%message% +
+ \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/history/houtgoing.htm new file mode 100644 index 000000000..b55089c3a --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/houtgoing.htm @@ -0,0 +1,11 @@ + + + +
+%date% %time% +%name%: +%message% +
+ \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/incoming.htm b/retroshare-gui/src/gui/qss/chat/compact/history/incoming.htm new file mode 100644 index 000000000..967bff6c4 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/incoming.htm @@ -0,0 +1,11 @@ + + + +
+%date% %time% +%name%: +%message% +
+ \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/info.xml b/retroshare-gui/src/gui/qss/chat/compact/history/info.xml new file mode 100644 index 000000000..578124d18 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/info.xml @@ -0,0 +1,12 @@ + + + + + + RetroShare Team + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/main.css b/retroshare-gui/src/gui/qss/chat/compact/history/main.css new file mode 100644 index 000000000..a5307dc8c --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/main.css @@ -0,0 +1,66 @@ +.name { + font-weight: bold; +} + +.time { +} + +.incomingTable { + background-color:#dfedff; +} + +.incomingTime { + color: #295b07; +} + +.incomingName { + color: #295b07; +} + +.outgoingTable { + background-color:#f5f5f5; +} + +.outgoingTime { + color: #244578; +} + +.outgoingName { + color: #244578; +} + +.hincomingTable { + background-color:#dfedff; +} + +.hincomingTime { + color: #295b07; +} + +.hincomingName { + color: #295b07; +} + +.houtgoingTable{ + background-color:#f5f5f5; +} + +.houtgoingTime { + color: #244578; +} + +.houtgoingName { + color: #244578; +} + +.ooutgoingTable { + background-color:#ffbebe; +} + +.ooutgoingTime { + color: #244578; +} + +.ooutgoingName { + color: #244578; +} diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/history/ooutgoing.htm new file mode 100644 index 000000000..a82504278 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/ooutgoing.htm @@ -0,0 +1,11 @@ + + + +
+%date% %time% +%name%: +%message% +
+ \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/history/outgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/history/outgoing.htm new file mode 100644 index 000000000..b159c809d --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/history/outgoing.htm @@ -0,0 +1,11 @@ + + + +
+%date% %time% +%name%: +%message% +
+ \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/history/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/compact/history/variants/Standard.css similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/variants/Standard.css rename to retroshare-gui/src/gui/qss/chat/compact/history/variants/Standard.css diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/hincoming.htm b/retroshare-gui/src/gui/qss/chat/compact/private/hincoming.htm new file mode 100644 index 000000000..3166d5896 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/hincoming.htm @@ -0,0 +1,7 @@ + + +%date% %time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/private/houtgoing.htm new file mode 100644 index 000000000..0f3f45aa2 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/houtgoing.htm @@ -0,0 +1,7 @@ + + +%date% %time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/incoming.htm b/retroshare-gui/src/gui/qss/chat/compact/private/incoming.htm new file mode 100644 index 000000000..8b2842482 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/incoming.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/info.xml b/retroshare-gui/src/gui/qss/chat/compact/private/info.xml new file mode 100644 index 000000000..578124d18 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/info.xml @@ -0,0 +1,12 @@ + + + + + + RetroShare Team + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/main.css b/retroshare-gui/src/gui/qss/chat/compact/private/main.css new file mode 100644 index 000000000..614f8661d --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/main.css @@ -0,0 +1,27 @@ +.name { + font-weight: bold; +} + +.time { + color:#808080; +} + +.incomingName { + color:#42940C; +} + +.outgoingName { + color:#2F5A9B; +} + +.hincomingName { + color:#88f042; +} + +.houtgoingName { + color:#6491d2; +} + +.ooutgoingName { + color:#ff0000; +} diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/private/ooutgoing.htm new file mode 100644 index 000000000..a342ea0a9 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/ooutgoing.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/private/outgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/private/outgoing.htm new file mode 100644 index 000000000..d781f860e --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/private/outgoing.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/private/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/compact/private/variants/Standard.css similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/variants/Standard.css rename to retroshare-gui/src/gui/qss/chat/compact/private/variants/Standard.css diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/hincoming.htm b/retroshare-gui/src/gui/qss/chat/compact/public/hincoming.htm new file mode 100644 index 000000000..320f2a2ef --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/hincoming.htm @@ -0,0 +1,7 @@ + + +%date% %time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/public/houtgoing.htm new file mode 100644 index 000000000..1a7b1ecc0 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/houtgoing.htm @@ -0,0 +1,7 @@ + + +%date% %time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/incoming.htm b/retroshare-gui/src/gui/qss/chat/compact/public/incoming.htm new file mode 100644 index 000000000..bcc98bab0 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/incoming.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/info.xml b/retroshare-gui/src/gui/qss/chat/compact/public/info.xml new file mode 100644 index 000000000..578124d18 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/info.xml @@ -0,0 +1,12 @@ + + + + + + RetroShare Team + + + \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/main.css b/retroshare-gui/src/gui/qss/chat/compact/public/main.css new file mode 100644 index 000000000..25b2f4686 --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/main.css @@ -0,0 +1,43 @@ +.name { + font-weight: bold; +} + +.incomingTime { + color:#C00000; +} + +.incomingName { + color:#2D84C9; +} + +.outgoingTime { + color:#C00000; +} + +.outgoingName { + color:#2D84C9; +} + +.hincomingTime { + color:#800000; +} + +.hincomingName { + color:#1E5684; +} + +.houtgoingTime { + color:#800000; +} + +.houtgoingName { + color:#1E5684; +} + +.ooutgoingTime { + color:#C00000; +} + +.ooutgoingName { + color:#ff0000; +} diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/public/ooutgoing.htm new file mode 100644 index 000000000..2ad258edb --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/ooutgoing.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/compact/public/outgoing.htm b/retroshare-gui/src/gui/qss/chat/compact/public/outgoing.htm new file mode 100644 index 000000000..2ce0ac8ea --- /dev/null +++ b/retroshare-gui/src/gui/qss/chat/compact/public/outgoing.htm @@ -0,0 +1,7 @@ + + +%time% +%name%: +%message% \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/chat/public/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/compact/public/variants/Standard.css similarity index 100% rename from retroshare-gui/src/gui/qss/chat/public/variants/Standard.css rename to retroshare-gui/src/gui/qss/chat/compact/public/variants/Standard.css diff --git a/retroshare-gui/src/gui/qss/chat/images/Thumbs.db b/retroshare-gui/src/gui/qss/chat/images/Thumbs.db deleted file mode 100644 index d4795cf890dd2c0898647bce1883a0f29278d9e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3584 zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt z1pWfu3W`4vW&uVbD>OcbkQYXsN;Sr0E8 zaOiAs`hE7N!%0SFp!@+)Vgmw02t_u@!ob7`vL93yfoNh4a)jFN%#aB5bs|F!Fci{> z)r_Q009Xow?1cd&DV$6ppo|qxS<)q7c7teAb%Wvz6n3CEf#rWtna>Wy96-zo#9Tnk z4a7V^%nQVPK+F%sz$$=25Qt&r2eLax*+U})KyeC61E#>p|9|8E0|o&vH%~VPMn*=4 z1R!Mif1AOXftiU3gn)nrh*&vTSy@7L_|eEhA=V%^{}vVva)iD@N)BtkPQAGU=ZYB5MvNyW>jKe5@ci+ zWc+`GK_2LQR-kJ^4u%3oCZHSH*f}`4xPc0`0&^%MGcywlGsx9I)wMu*1{Oh9Aw@$+ zHsQcTcBMiQqsEB~Ih36?9uy6__(8=usi=vQOH5osQc6`#T|-mL#MI2(!qUpw#nsK- z!_zA`Bs45MA~GsDB{eNQBQvYGq_nKOqOz*FrM0cSqqA$$M%n)zEeTL>QL7=~wSXh`@*g^hcWGV+@WL#dKj%j53VsWg&&?;E^!+}vUu=HNhq~2;54~mG z1J%xXD(>FUa4P)id3MF}WEI}uyJ~hSgwKquJ7gz&p(e9%-OK6I!p(Z0aeSGZ?E5<= zQPS&Ybk7V1=7!rw46^>}mnJ`&@WCXoqUyW%C;hd$pC;^Sl1OZ1W8Shu`Sbyc1mjN= z+(LUxKAI_Owffk}YtMNwCwk7EV88fN+n;8tS1(&Kf7fN7#|QicokR^S{zbd4)_${l z-}jeSOYPFP{Fwf+r()W}J*vxXUfM1RUfQ}z=iCMhzD*t;mdQJW{J-ybxKsPZ{hOB` z$@M?_ZJTxN)W3W0eyV#u5wI-PQs~lYI_UY#?m?+Y__5R*R#OXJEk5FXZ}-J@{~3(m zXBGPK%Vu3MC`px8ndN)$R!R1s-}6q!+x@#bpF{soabo`38`-|gU9;J5=CA!Opw_Yf z^mgXS(-fK;9A6*fbgho~Ww5?&u2t8|^{U=<0Reqnk0VW+vOssEBrZMd>whgHdn zV;8sG+qL=sO<1lYlNJEhG@zWD0L5BB8l00Id01cao@6XyC?ptz0syWwP>%or diff --git a/retroshare-gui/src/gui/qss/chat/images/rstray3.png b/retroshare-gui/src/gui/qss/chat/images/rstray3.png deleted file mode 100644 index d03d450638166fbd8f9740c48c38278dcd4984e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1290 zcmV+l1@-!gP)oTc9WpE%GRIJS-sLAp^D%HW4Cw7`M3%bcqg(Q|HXKWD|6AN<<{t zfWS5bnVKz-*=^!rD&XYN@Q@-tfFklP5TLEJNK5J6EiO)$u!w%i$-Oz>$?tsUf6n|ph1?&@i`^%Ktm%}j_&-L-jRiHolc;PL_eBwB9XQJo$z z#L=G?8X6WZ$w>&Sb@h@0Vi%yi5IC0$R}N#9)ohM6i{{T;Ru3QP?t{0Ovs{lZhqiIr6w0&oH+5yi({kTe;6oqJ zf~_QpB$6bk#!AwXv7gS7tYj_8^3OW5)F#$9DzPVH+iT?XRkEfCWLLME*V1}@;Xu&F zHJXZX9blQKbY%k0BH&sb;mMZU-U6xdKH;H~moZ-O;^E!6j~7x$SG7gYNNuT29W% zPP>tBUbc=_Ht@}@U`)56?H=d;p^`Nfy3SAFG@FCeEunce7mlB|o%R2M9YkCYn7T1* zS`1#$qq(IOJRXnEX0urYLC`D~i`i&2&YjN>N_{U8d7j>ZLOAci(70Lk(Pu?zWxsdy zrGEK-8eK$BabY7a(%pix{L@*b7jSqH`2S){Jk}j}2a53EH6C!5g%w7N0hMEw=rVLJ%HN!(@sy} zuh}cOXY6^jO?1Mxa9fR5bl$&3Y~m+kS$;fYXB2DXBgtd48kk8lg(SdZ@F)*n4F{GJ zICKuomrUPYDy(W)7TCvLI>3-J-g0qu6L9HVII~y6hvx@(YU5Tg`OtUkbb?<6J0>S5 zA1q7bW5yIL5-C{~T4V5T?5i2E~m|8}kbaC!gxgyIfrZkx*!V z_)OMzzMH@cAfX+Y>T%LKmhVc>7_<3@E&di@0H@u-*Cu4(lmGw#07*qoM6N<$f-Q_( AUH||9 diff --git a/retroshare-gui/src/gui/qss/chat/history/hincoming.htm b/retroshare-gui/src/gui/qss/chat/standard/history/hincoming.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/hincoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/history/hincoming.htm diff --git a/retroshare-gui/src/gui/qss/chat/history/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/history/houtgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/houtgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/history/houtgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/history/incoming.htm b/retroshare-gui/src/gui/qss/chat/standard/history/incoming.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/incoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/history/incoming.htm diff --git a/retroshare-gui/src/gui/qss/chat/history/info.xml b/retroshare-gui/src/gui/qss/chat/standard/history/info.xml similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/info.xml rename to retroshare-gui/src/gui/qss/chat/standard/history/info.xml diff --git a/retroshare-gui/src/gui/qss/chat/history/main.css b/retroshare-gui/src/gui/qss/chat/standard/history/main.css similarity index 85% rename from retroshare-gui/src/gui/qss/chat/history/main.css rename to retroshare-gui/src/gui/qss/chat/standard/history/main.css index ebd5d18bd..af0cd950d 100644 --- a/retroshare-gui/src/gui/qss/chat/history/main.css +++ b/retroshare-gui/src/gui/qss/chat/standard/history/main.css @@ -5,7 +5,7 @@ .time { } -.incomingTable{ +.incomingTable { background-color:#dfedff; } @@ -18,7 +18,7 @@ color: #295b07; } -.outgoingTable{ +.outgoingTable { background-color:#f5f5f5; } @@ -31,7 +31,7 @@ color: #244578; } -.hincomingTable{ +.hincomingTable { background-color:#dfedff; } @@ -57,7 +57,7 @@ color: #244578; } -.ooutgoingTable{ +.ooutgoingTable { background-color:#ffbebe; } diff --git a/retroshare-gui/src/gui/qss/chat/history/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/history/ooutgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/ooutgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/history/ooutgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/history/outgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/history/outgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/history/outgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/history/outgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/standard/history/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/standard/history/variants/Standard.css new file mode 100644 index 000000000..e69de29bb diff --git a/retroshare-gui/src/gui/qss/chat/private/hincoming.htm b/retroshare-gui/src/gui/qss/chat/standard/private/hincoming.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/hincoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/private/hincoming.htm diff --git a/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/private/houtgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/houtgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/private/houtgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/private/incoming.htm b/retroshare-gui/src/gui/qss/chat/standard/private/incoming.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/incoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/private/incoming.htm diff --git a/retroshare-gui/src/gui/qss/chat/private/info.xml b/retroshare-gui/src/gui/qss/chat/standard/private/info.xml similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/info.xml rename to retroshare-gui/src/gui/qss/chat/standard/private/info.xml diff --git a/retroshare-gui/src/gui/qss/chat/private/main.css b/retroshare-gui/src/gui/qss/chat/standard/private/main.css similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/main.css rename to retroshare-gui/src/gui/qss/chat/standard/private/main.css diff --git a/retroshare-gui/src/gui/qss/chat/private/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/private/ooutgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/ooutgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/private/ooutgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/private/outgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/private/outgoing.htm similarity index 100% rename from retroshare-gui/src/gui/qss/chat/private/outgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/private/outgoing.htm diff --git a/retroshare-gui/src/gui/qss/chat/standard/private/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/standard/private/variants/Standard.css new file mode 100644 index 000000000..e69de29bb diff --git a/retroshare-gui/src/gui/qss/chat/public/hincoming.htm b/retroshare-gui/src/gui/qss/chat/standard/public/hincoming.htm similarity index 61% rename from retroshare-gui/src/gui/qss/chat/public/hincoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/public/hincoming.htm index 6b20807d5..e4734b0d3 100644 --- a/retroshare-gui/src/gui/qss/chat/public/hincoming.htm +++ b/retroshare-gui/src/gui/qss/chat/standard/public/hincoming.htm @@ -3,5 +3,5 @@ %date% %time% -%name% +%name%
%message% diff --git a/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/public/houtgoing.htm similarity index 61% rename from retroshare-gui/src/gui/qss/chat/public/houtgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/public/houtgoing.htm index b9c22da01..305eaf838 100644 --- a/retroshare-gui/src/gui/qss/chat/public/houtgoing.htm +++ b/retroshare-gui/src/gui/qss/chat/standard/public/houtgoing.htm @@ -3,5 +3,5 @@ %date% %time% -%name% +%name%
%message% diff --git a/retroshare-gui/src/gui/qss/chat/public/incoming.htm b/retroshare-gui/src/gui/qss/chat/standard/public/incoming.htm similarity index 59% rename from retroshare-gui/src/gui/qss/chat/public/incoming.htm rename to retroshare-gui/src/gui/qss/chat/standard/public/incoming.htm index f65d02b56..bdb1a1a43 100644 --- a/retroshare-gui/src/gui/qss/chat/public/incoming.htm +++ b/retroshare-gui/src/gui/qss/chat/standard/public/incoming.htm @@ -3,5 +3,5 @@ %time% -%name% +%name%
%message% diff --git a/retroshare-gui/src/gui/qss/chat/public/info.xml b/retroshare-gui/src/gui/qss/chat/standard/public/info.xml similarity index 100% rename from retroshare-gui/src/gui/qss/chat/public/info.xml rename to retroshare-gui/src/gui/qss/chat/standard/public/info.xml diff --git a/retroshare-gui/src/gui/qss/chat/public/main.css b/retroshare-gui/src/gui/qss/chat/standard/public/main.css similarity index 63% rename from retroshare-gui/src/gui/qss/chat/public/main.css rename to retroshare-gui/src/gui/qss/chat/standard/public/main.css index d276a74ca..4750522cb 100644 --- a/retroshare-gui/src/gui/qss/chat/public/main.css +++ b/retroshare-gui/src/gui/qss/chat/standard/public/main.css @@ -1,8 +1,12 @@ +.name { + font-weight: bold; +} + .incomingTime { color:#C00000; } -.incomingName{ +.incomingName { color:#2D84C9; } @@ -10,7 +14,7 @@ color:#C00000; } -.outgoingName{ +.outgoingName { color:#2D84C9; } @@ -18,7 +22,7 @@ color:#800000; } -.hincomingName{ +.hincomingName { color:#1E5684; } @@ -26,7 +30,7 @@ color:#800000; } -.houtgoingName{ +.houtgoingName { color:#1E5684; } @@ -34,7 +38,6 @@ color:#C00000; } -.ooutgoingName{ +.ooutgoingName { color:#2D84C9; } - diff --git a/retroshare-gui/src/gui/qss/chat/public/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/public/ooutgoing.htm similarity index 59% rename from retroshare-gui/src/gui/qss/chat/public/ooutgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/public/ooutgoing.htm index 715c9375a..dc8f97008 100644 --- a/retroshare-gui/src/gui/qss/chat/public/ooutgoing.htm +++ b/retroshare-gui/src/gui/qss/chat/standard/public/ooutgoing.htm @@ -3,5 +3,5 @@ %time% -%name% +%name%
%message% diff --git a/retroshare-gui/src/gui/qss/chat/public/outgoing.htm b/retroshare-gui/src/gui/qss/chat/standard/public/outgoing.htm similarity index 59% rename from retroshare-gui/src/gui/qss/chat/public/outgoing.htm rename to retroshare-gui/src/gui/qss/chat/standard/public/outgoing.htm index 59e07d67f..dad318ffd 100644 --- a/retroshare-gui/src/gui/qss/chat/public/outgoing.htm +++ b/retroshare-gui/src/gui/qss/chat/standard/public/outgoing.htm @@ -3,5 +3,5 @@ %time% -%name% +%name%
%message% diff --git a/retroshare-gui/src/gui/qss/chat/standard/public/variants/Standard.css b/retroshare-gui/src/gui/qss/chat/standard/public/variants/Standard.css new file mode 100644 index 000000000..e69de29bb diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 1f7b1be34..45eda072a 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -202,27 +202,15 @@ void ChatPage::setPreviewMessages(QString &stylePath, QString styleVariant, QTex textBrowser->clear(); - QString nameIncoming = "Incoming"; - QString nameOutgoing = "Outgoing"; + QString nameIncoming = tr("Incoming"); + QString nameOutgoing = tr("Outgoing"); QDateTime timestmp = QDateTime::fromTime_t(time(NULL)); - QTextEdit textEdit; - QString message; - textEdit.setText(tr("Incoming message in history")); - message = textEdit.toHtml(); - textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HINCOMING, nameIncoming, timestmp, message, CHAT_FORMATTEXT_EMBED_SMILEYS)); - textEdit.setText(tr("Outgoing message in history")); - message = textEdit.toHtml(); - textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HOUTGOING, nameOutgoing, timestmp, message, CHAT_FORMATTEXT_EMBED_SMILEYS)); - textEdit.setText(tr("Incoming message")); - message = textEdit.toHtml(); - textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_INCOMING, nameIncoming, timestmp, message, CHAT_FORMATTEXT_EMBED_SMILEYS)); - textEdit.setText(tr("Outgoing message")); - message = textEdit.toHtml(); - textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, nameOutgoing, timestmp, message, CHAT_FORMATTEXT_EMBED_SMILEYS)); - textEdit.setText(tr("Outgoing offline message")); - message = textEdit.toHtml(); - textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OOUTGOING, nameOutgoing, timestmp, message, CHAT_FORMATTEXT_EMBED_SMILEYS)); + textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HINCOMING, nameIncoming, timestmp, tr("Incoming message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS)); + textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HOUTGOING, nameOutgoing, timestmp, tr("Outgoing message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS)); + textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_INCOMING, nameIncoming, timestmp, tr("Incoming message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); + textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, nameOutgoing, timestmp, tr("Outgoing message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); + textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OOUTGOING, nameOutgoing, timestmp, tr("Outgoing offline message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); } void ChatPage::fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser) diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index e52a2285b..086c97731 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -381,7 +381,11 @@ void RshareSettings::setChatScreenFont(const QString &font) void RshareSettings::getPublicChatStyle(QString &stylePath, QString &styleVariant) { - stylePath = valueFromGroup("Chat", "StylePublic", ":/qss/chat/public").toString(); + stylePath = valueFromGroup("Chat", "StylePublic", ":/qss/chat/standard/public").toString(); + // Correct changed standard path for older RetroShare versions before 31.01.2012 (can be removed later) + if (stylePath == ":/qss/chat/public") { + stylePath = ":/qss/chat/standard/public"; + } styleVariant = valueFromGroup("Chat", "StylePublicVariant", "").toString(); } @@ -393,7 +397,11 @@ void RshareSettings::setPublicChatStyle(const QString &stylePath, const QString void RshareSettings::getPrivateChatStyle(QString &stylePath, QString &styleVariant) { - stylePath = valueFromGroup("Chat", "StylePrivate", ":/qss/chat/private").toString(); + stylePath = valueFromGroup("Chat", "StylePrivate", ":/qss/chat/standard/private").toString(); + // Correct changed standard path for older RetroShare versions before 31.01.2012 (can be removed later) + if (stylePath == ":/qss/chat/private") { + stylePath = ":/qss/chat/standard/private"; + } styleVariant = valueFromGroup("Chat", "StylePrivateVariant", "").toString(); } @@ -405,7 +413,11 @@ void RshareSettings::setPrivateChatStyle(const QString &stylePath, const QString void RshareSettings::getHistoryChatStyle(QString &stylePath, QString &styleVariant) { - stylePath = valueFromGroup("Chat", "StyleHistory", ":/qss/chat/history").toString(); + stylePath = valueFromGroup("Chat", "StyleHistory", ":/qss/chat/standard/history").toString(); + // Correct changed standard path for older RetroShare versions before 31.01.2012 (can be removed later) + if (stylePath == ":/qss/chat/history") { + stylePath = ":/qss/chat/standard/history"; + } styleVariant = valueFromGroup("Chat", "StylePrivateVariant", "").toString(); } diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index b2c8fdebaf8ecec1a8033dfc5f6113d34604549f..4be1bcf6a19797ed743eae0d552937979fab9174 100644 GIT binary patch delta 17942 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 HC_nvw>m|vT diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index c52680404..f4033c244 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -1384,27 +1384,37 @@ p, li { white-space: pre-wrap; } Verlauf - + + Incoming + Eingehend + + + + Outgoing + Ausgehend + + + Incoming message in history Eingehehende Nachricht aus dem Verlauf - + Outgoing message in history Ausgehende Nachricht aus dem Verlauf - + Incoming message Eingehehende Nachricht - + Outgoing message Ausgehehende Nachricht - + Outgoing offline message Ausgehehende offline Nachricht @@ -1416,16 +1426,31 @@ p, li { white-space: pre-wrap; } Standard style for group chat Standard Stil für den Gruppenchat + + + Compact style for group chat + Kompakter Stil für den Gruppenchat + Standard style for private chat Standard Stil für den privaten Chat + + + Compact style for private chat + Kompakter Stil für den privaten Chat + Standard style for history Standard Stil für den Verlauf + + + Compact style for history + Kompakter Stil für den Verlauf + ChatWidget @@ -5307,7 +5332,7 @@ p, li { white-space: pre-wrap; } tippt... - + New group chat Neuer Gruppenchat