Changeset 4550

Timestamp:

08/04/06 05:46:03 (2 years ago)

Author:

erijo

Message:

Implement the second part of #646 "When copying from a licq window,
the underlying text should be copied, not skipped just because licq
interprets it as an emoticon". Closes #646.

Also fixes an issue reported by Arne Schmitz where
text[space]:)[space]text would be replaced with text[space]:)text.
It looks like Qt removes a space after every img-tag. So the solution
is to add an extra space for Qt to remove.

Location:

trunk/qt-gui/src

Files:

• emoticon.cpp (modified) (3 diffs)
• emoticon.h (modified) (1 diff)
• mlview.cpp (modified) (3 diffs)
• mlview.h (modified) (1 diff)

trunk/qt-gui/src/emoticon.cpp

@@ -30 +30 @@
 #include <qdir.h>
 #include <qdom.h>
+#include <qregexp.h>
 #include <qstylesheet.h>
 
@@ -457 +458 @@
           }
 
-          const QString img = QString::fromLatin1("<img src=\"%1\" title=\"%2\" />").arg(emo.file).arg(emo.escapedSmiley);
+          const QString img = QString::fromLatin1("<img alt=\"%1\" src=\"%2\" > ").arg(emo.escapedSmiley).arg(emo.file);
 //           qDebug(" Replacing '%s' with '%s'", message.mid(pos, emo.escapedSmiley.length()).latin1(), img.latin1());
           message.replace(pos, emo.escapedSmiley.length(), img);
@@ -472 +473 @@
 }
 
+/**
+ * "unparse" the message, removing all <img> tags and replacing them with the smiley.
+ */
+void CEmoticons::unparseMessage(QString &message)
+{
+  const QRegExp imageAlt("<img alt=([^>]*) src=[^>]* >");
+  message.replace(imageAlt, "\\1");
+}
+
 #include "emoticon.moc"

trunk/qt-gui/src/emoticon.h

@@ -80 +80 @@
     void parseMessage(QString &message, ParseMode mode) const;
 
+    /// Replace all emoticons with their smiley
+    static void unparseMessage(QString &message);
+
   signals:
     void themeChanged();
 
   private:
+    CEmoticons(const CEmoticons&);
+    CEmoticons& operator=(const CEmoticons&);
+
     static CEmoticons *m_self;
 

trunk/qt-gui/src/mlview.cpp

@@ -28 +28 @@
 #include <qapplication.h>
 #include <qclipboard.h>
+#include <qdragobject.h>
+#include <qmime.h>
 #include <qpopupmenu.h>
 #include <qregexp.h>
@@ -35 +37 @@
 
 MLView::MLView (QWidget* parent, const char *name)
-  : QTextBrowser(parent, name), m_handleLinks(true)
+  : QTextBrowser(parent, name), m_handleLinks(true), m_clipboardMode(-1)
 {
   setWordWrap(WidgetWidth);
@@ -179 +181 @@
     // and the selection clipboard (paste with middle mouse button).
     QClipboard *cb = QApplication::clipboard();
-    cb->setText(m_url);
+    cb->setText(m_url, QClipboard::Clipboard);
     if (cb->supportsSelection())
+      cb->setText(m_url, QClipboard::Selection);
+  }
+}
+
+/** @see MLView::copy() */
+void MLView::slotClipboardSelectionChanged()
+{
+  m_clipboardMode = QClipboard::Selection;
+}
+
+/** @see MLView::copy() */
+void MLView::slotClipboardDataChanged()
+{
+  m_clipboardMode = QClipboard::Clipboard;
+}
+
+/**
+ * After we have copied the text, we update the copy so that all emoticons are
+ * replaced with their respective smiley.
+ */
+void MLView::copy()
+{
+  m_clipboardMode = -1;
+
+  // We connect these so that we know which clipboard changed (selection or data)
+  connect(QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(slotClipboardSelectionChanged()));
+  connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()));
+
+  QTextBrowser::copy();
+
+  disconnect(QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(slotClipboardSelectionChanged()));
+  disconnect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()));
+
+  // m_clipboardMode is set in one of slotClipboard{Selection,Data}Changed()
+  if (m_clipboardMode != -1)
+  {
+    // QTextEdit copies the text both as rich text and as regular text.
+    // We parse the rich text and then update the regular text.
+    QMimeSource *m = QApplication::clipboard()->data(static_cast<QClipboard::Mode>(m_clipboardMode));
+    if (m->provides("application/x-qrichtext") && QTextDrag::canDecode(m))
     {
-      bool enabled = cb->selectionModeEnabled();
-      cb->setSelectionMode(!enabled);
-      cb->setText(m_url);
-      cb->setSelectionMode(enabled);
+      if (QTextDrag *drag = dynamic_cast<QTextDrag*>(m))
+      {
+        QString text = QString::fromUtf8(m->encodedData("application/x-qrichtext").data());
+
+        CEmoticons::unparseMessage(text);
+
+        const QRegExp newline("<br( /)?>");
+        text.replace(newline, "\n");
+
+        const QRegExp htmlTags("</?[^>]+>");
+        text.remove(htmlTags);
+
+        text.replace("&lt;", "<");
+        text.replace("&gt;", ">");
+        text.replace("&amp;", "&");
+
+        drag->setText(text);
+      }
     }
   }

trunk/qt-gui/src/mlview.h

@@ -48 +48 @@
 public slots:
   virtual void setSource(const QString& name);
+  virtual void copy();
+
+private slots:
   void slotCopyUrl();
+  void slotClipboardSelectionChanged();
+  void slotClipboardDataChanged();
 
 private:
   bool m_handleLinks;
   QString m_url;
+  int m_clipboardMode;
 
 signals: