[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation/src
From:       Mickael Marchand <marchand () kde ! org>
Date:       2006-01-16 17:25:59
Message-ID: 1137432359.401687.29659.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 498934 by marchand:

some more fixes for the colored nick stuff
it also works for actions(/me) and queries now
it also makes the <> bold when required (following the nick's policy chosen by the \
user)



 M  +12 -14    ircview.cpp  


--- trunk/extragear/network/konversation/src/ircview.cpp #498933:498934
@@ -561,9 +561,6 @@
     if(Preferences::useClickableNicks())
         nickLine = "<a href=\"#" + nick + "\">%2</a>";
 
-    if(Preferences::useBoldNicks())
-        nickLine = "<b>"+nickLine+"</b>";
-
     if(Preferences::useColoredNicks())
     {
         if(nick != m_server->getNickname())
@@ -587,6 +584,9 @@
         }
     }
 
+    if(Preferences::useBoldNicks())
+        nickLine = "<b>"+nickLine+"</b>";
+
     if(basicDirection(message) == QChar::DirR)
     {
         line = RLO;
@@ -637,12 +637,8 @@
     if(Preferences::useClickableNicks())
         nickLine = "<a href=\"#" + nick + "\">%2</a>";
 
-    if(Preferences::useBoldNicks())
-        nickLine = "<b>"+nickLine+"</b>";
-
     if(Preferences::useColoredNicks())
     {
-
         if(nick != m_server->getNickname())
             color = m_server->obtainNickInfo(nick)->getNickColor();
         else
@@ -653,25 +649,28 @@
             color = "#000001";                    // HACK Working around \
QTextBrowser's auto link coloring  }
 
-        nickLine = "<font color=\"" + color + "\">"+nickLine+"</font>";
+        nickLine = "<font color=\"" + color + "\">&lt;"+nickLine+"&gt;</font>";
     }
     else
     {
+        nickLine = "&lt;"+nickLine+"&gt;";
         if(queryColor  == "#000000")
         {
             queryColor = "#000001";                // HACK Working around \
QTextBrowser's auto link coloring  }
     }
+    if(Preferences::useBoldNicks())
+        nickLine = "<b>"+nickLine+"</b>";
 
     if(basicDirection(message) == QChar::DirR)
     {
         line = RLO;
         line += LRE;
-        line += "<p><font color=\"" + queryColor + "\"><b>&lt;</b>" + nickLine + \
"<b>&gt;</b> %1" + PDF + " %3</font></p>\n"; +        line += "<p><font color=\"" + \
queryColor + "\">" + nickLine + " %1" + PDF + " %3</font></p>\n";  }
     else
     {
-        line = "<p><font color=\"" + queryColor + "\">%1 <b>&lt;</b>" + nickLine + \
"<b>&gt;</b> %3</font></p>\n"; +        line = "<p><font color=\"" + queryColor + \
"\">%1 " + nickLine + " %3</font></p>\n";  }
 
     line = line.arg(timeStamp(), nick, filter(message, queryColor, nick, true));
@@ -695,12 +694,8 @@
     if(Preferences::useClickableNicks())
         nickLine = "<a href=\"#" + nick + "\">%2</a>";
 
-    if(Preferences::useBoldNicks())
-        nickLine = "<b>"+nickLine+"</b>";
-
     if(Preferences::useColoredNicks())
     {
-
         if(nick != m_server->getNickname())
             color = m_server->obtainNickInfo(nick)->getNickColor();
         else
@@ -720,7 +715,10 @@
             actionColor = "#000001";               // HACK Working around \
QTextBrowser's auto link coloring  }
     }
+    if(Preferences::useBoldNicks())
+        nickLine = "<b>"+nickLine+"</b>";
 
+
     if(basicDirection(message) == QChar::DirR)
     {
         line = RLO;


[prev in list] [next in list] [prev in thread] [next in thread]