From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 3 Aug 2008 23:11:42 +0000 (+0200)
Subject: Bring back topic display
X-Git-Tag: 0.3.0~131
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=759834aef5d75034e7092013801d1f957a989b8f

Bring back topic display
---

diff --git a/src/qtui/topiclabel.cpp b/src/qtui/topiclabel.cpp
index 1e1e1da4..d3a01778 100644
--- a/src/qtui/topiclabel.cpp
+++ b/src/qtui/topiclabel.cpp
@@ -48,17 +48,17 @@ void TopicLabel::paintEvent(QPaintEvent *event) {
   Q_UNUSED(event);
 
   textPartOffset.clear();
-  
+
   QPainter painter(this);
   painter.setBackgroundMode(Qt::OpaqueMode);
 
-  // FIXME re-enable topic painting
-  /*
+  // FIXME use QTextLayout instead
+
   QRect drawRect = rect().adjusted(offset, 0, 0, 0);
   QRect brect;
   QString textPart;
-  foreach(QTextLayout::FormatRange fr, styledContents.formatList) {
-    textPart = styledContents.plainText.mid(fr.start, fr.length);
+  foreach(QTextLayout::FormatRange fr, formatList) {
+    textPart = plainText.mid(fr.start, fr.length);
     textPartOffset << drawRect.left();
     painter.setFont(fr.format.font());
     painter.setPen(QPen(fr.format.foreground(), 0));
@@ -67,7 +67,6 @@ void TopicLabel::paintEvent(QPaintEvent *event) {
     drawRect.setLeft(brect.right());
   }
   textWidth = brect.right();
-  */
 }
 
 void TopicLabel::setText(const QString &text) {
@@ -78,19 +77,19 @@ void TopicLabel::setText(const QString &text) {
   offset = 0;
   update();
 
-  /* FIXME SPUTDEV reenable
-  styledContents = QtUi::style()->styleString(Message::mircToInternal(text));
+  UiStyle::StyledString styledContents = QtUi::style()->styleString(QtUi::style()->mircToInternal(text));
+  plainText = styledContents.plainText;
+  formatList = QtUi::style()->toTextLayoutList(styledContents.formatList, plainText.length());
   int height = 1;
-  foreach(QTextLayout::FormatRange fr, styledContents.formatList) {
+  foreach(QTextLayout::FormatRange fr, formatList) {
     height = qMax(height, QFontMetrics(fr.format.font()).height());
   }
 
   // ensure the label is editable (height != 1) if there is no text to show
   if(text.isEmpty())
     height = QFontMetrics(qApp->font()).height();
-  
+
   // setFixedHeight(height);
-  */
   // show topic in tooltip
 }
 
@@ -127,7 +126,6 @@ void TopicLabel::mouseReleaseEvent(QMouseEvent *event) {
 }
 
 void TopicLabel::mouseDoubleClickEvent(QMouseEvent *event) {
-  /* FIXME SPUTDEV reenable
   event->accept();
   if(textPartOffset.isEmpty())
     return;
@@ -144,11 +142,11 @@ void TopicLabel::mouseDoubleClickEvent(QMouseEvent *event) {
   int textOffset = textPartOffset[textPart];
 
   // we've Identified the needed text part \o/
-  QString text = styledContents.plainText.mid(styledContents.formatList[textPart].start, styledContents.formatList[textPart].length);
+  QString text = plainText.mid(formatList[textPart].start, formatList[textPart].length);
 
   // now we have to find the the left and right word delimiters of the clicked word
-  QFontMetrics fontMetric(styledContents.formatList[textPart].format.font());
-  
+  QFontMetrics fontMetric(formatList[textPart].format.font());
+
   int start = 0;
   int spacePos = text.indexOf(" ");
   x -= offset; // offset needs to go here as it's already in the textOffset
@@ -171,6 +169,4 @@ void TopicLabel::mouseDoubleClickEvent(QMouseEvent *event) {
   if(regex.indexIn(word) != -1) {
     QDesktopServices::openUrl(QUrl(word));
   }
-  */
-  
 }
diff --git a/src/qtui/topiclabel.h b/src/qtui/topiclabel.h
index 3c697d58..8072ed2e 100644
--- a/src/qtui/topiclabel.h
+++ b/src/qtui/topiclabel.h
@@ -41,7 +41,7 @@ protected:
   void mousePressEvent(QMouseEvent *event);
   void mouseReleaseEvent(QMouseEvent *event);
   void mouseDoubleClickEvent(QMouseEvent *event);
-  
+
 private:
   QString _text;
   QSize _sizeHint;
@@ -51,6 +51,8 @@ private:
   int textWidth;
   bool dragMode;
 
+  QString plainText;
+  QList<QTextLayout::FormatRange> formatList;
   QList<int> textPartOffset; // needed for location url positions
 };
 
diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 2926a754..99325dc1 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -242,7 +242,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) {
   return result;
 }
 
-QString UiStyle::mircToInternal(const QString &mirc_) {
+QString UiStyle::mircToInternal(const QString &mirc_) const {
   QString mirc = mirc_;
   mirc.replace('%', "%%");      // escape % just to be sure
   mirc.replace('\x02', "%B");
diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 8745d117..70144c82 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -130,6 +130,7 @@ class UiStyle {
 
     StyledString styleString(const QString &);
     StyledMessage styleMessage(const Message &);
+    QString mircToInternal(const QString &) const;
 
     void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
     QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
@@ -147,7 +148,6 @@ class UiStyle {
 
 
   private:
-    QString mircToInternal(const QString &);
 
     QFont _defaultFont;
     QTextCharFormat _defaultPlainFormat;