Changeset 6427

Timestamp:

07/05/08 12:44:11 (8 weeks ago)

Author:

eugene

Message:

Revised emoticon (un)parsing. It's not a hyperlink now. It removes annoying tab-switching and possibility to click on it.

Files:

• trunk/qt4-gui/src/config/emoticons.cpp (modified) (2 diffs)

trunk/qt4-gui/src/config/emoticons.cpp

@@ -490 +490 @@
           }
 
-          QString img = QString::fromLatin1("<a href=\"#%1\"><img src=\"%2\"></a>").arg(emo.escapedSmiley).arg(emo.file);
-          TRACE(" Replacing '%s' with '%s'", message.mid(pos, emo.escapedSmiley.length()).toLatin1().data(), img.toLatin1().data());
+          QString img = QString::fromLocal8Bit("<img src=\"file://%1#LICQ%2\">")
+            .arg(emo.file)
+            .arg(emo.escapedSmiley);
+          TRACE("Replacing '%s' with '%s'",
+              message.mid(pos, emo.escapedSmiley.length()).toLatin1().data(),
+              img.toLatin1().data());
           message.replace(pos, emo.escapedSmiley.length(), img);
           pos += img.length() - 1; // Point pos at '>'
@@ -510 +514 @@
 void Emoticons::unparseMessage(QString& message)
 {
-  QRegExp deicon("<a href=\"#([^\"]*).*</a>");
+  QRegExp deicon("<img src=\"file://.*#LICQ(.*)\".*>");
   deicon.setMinimal(true);
   message.replace(deicon, "\\1");