Mercurial > hg > octave-thorsten

changeset 13612:7d893674a427

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Newlines work in chat.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 17 Aug 2011 02:57:44 +0200
parents 7f6f339761f9
children 8728061cd0ec
files gui/src/IRCWidget.cpp
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/IRCWidget.cpp
+++ b/gui/src/IRCWidget.cpp
@@ -265,11 +265,15 @@
     }
 
   QString output;
+  QString htmlMessage = message;
+  htmlMessage.replace ("<", "&lt;");
+  htmlMessage.replace (">", "&gt;");
+  htmlMessage.replace ("\n", "<br>");
   if (message.contains (m_ircClientInterface->nickname ()))
     {
       output =
         QString ("<font color=\"#990000\"><b>%1:</b> %2</font>").arg (sender).
-        arg (message);
+        arg (htmlMessage);
 
       QApplication::alert (this);
     }
@@ -277,7 +281,7 @@
     {
       output =
         QString ("<b>%1:</b> %2").arg (sender).
-        arg (message);
+        arg (htmlMessage);
     }
   m_chatWindow->append (output);
 }
@@ -344,6 +348,7 @@
       m_octaveChannel->sendMessage (message);
       message.replace ("<", "&lt;");
       message.replace (">", "&gt;");
+      message.replace ("\n", "<br>");
       m_chatWindow->append (QString ("<b>%1:</b> %2").
                             arg (m_ircClientInterface->nickname ()).arg (message));
     }