Fixed rendering for CTCP ACTION, closing BR #27.

diff --git a/core/server.cpp b/core/server.cpp
index af08810..09e1583 100644 (file)
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -842,7 +842,7 @@ void Server::handleServer433(QString prefix, QStringList params) {
 // CTCP HANDLER
 
 void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target, QString param) {
-  emit displayMsg(Message::Action, target, param, userFromMask(prefix));
+  emit displayMsg(Message::Action, target, param, prefix);
 }
 
 void Server::defaultCtcpHandler(CtcpType ctcptype, QString prefix, QString cmd, QString target, QString param) {

diff --git a/gui/chatwidget.cpp b/gui/chatwidget.cpp
index 9bd4fc9..51ab625 100644 (file)
--- a/gui/chatwidget.cpp
+++ b/gui/chatwidget.cpp
@@ -590,6 +590,10 @@ void ChatLine::formatMsg(Message msg) {
       if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(msg.text);
       else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(msg.text, nick);
       break;
+    case Message::Action:
+      s = tr("%Da-*-");
+      t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(msg.text);
+      break;
     default:
       s = tr("%De%1").arg(msg.sender);
       t = tr("%De[%1]").arg(msg.text);

diff --git a/gui/style.cpp b/gui/style.cpp
index 9b845d3..5488986 100644 (file)
--- a/gui/style.cpp
+++ b/gui/style.cpp
@@ -116,6 +116,11 @@ void Style::init() {
   QTextCharFormat mode;
   mode.setForeground(QBrush("steelblue"));
   formats["%Dm"] = mode;
+  // %Da - ctcp action
+  QTextCharFormat action;
+  action.setFontItalic(true);
+  action.setForeground(QBrush("darkmagenta"));
+  formats["%Da"] = action;
 
   // %DT - timestamp
   QTextCharFormat ts;