From 58ff1d5f702a42a9bcccfb36f7a3f4402059fa8e Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 13 Apr 2016 12:45:45 +0200
Subject: [PATCH] Display message title as HTML too.

---
 resources/text/CHANGELOG     |  7 +++++++
 src/gui/messagepreviewer.cpp | 25 ++++---------------------
 src/gui/messagepreviewer.h   |  1 -
 src/gui/messagepreviewer.ui  | 24 ------------------------
 4 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 0a76c5290..49496ea61 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -1,3 +1,10 @@
+3.3.0 (not yet released)
+—————
+
+Changed:
+
+▪ Internal message viewer now displays title as part of main HTML view.
+
 3.2.0
 —————
 
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index 8cfa238d6..8728e2dfa 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -101,14 +101,9 @@ void MessagePreviewer::reloadFontSettings() {
                                  SETTING(Messages::PreviewerFontStandard)).toString());
 
   m_ui->m_txtMessage->setFont(fon);
-
-  fon.setPointSize(fon.pointSize() + 5);
-
-  m_ui->m_lblTitle->setFont(fon);
 }
 
 void MessagePreviewer::clear() {
-  m_ui->m_lblTitle->clear();
   m_ui->m_txtMessage->clear();
 
   hide();
@@ -121,11 +116,8 @@ void MessagePreviewer::loadMessage(const Message &message, RootItem *root) {
   if (!m_root.isNull()) {
     updateButtons();
     m_actionSwitchImportance->setChecked(m_message.m_isImportant);
-
-    m_ui->m_lblTitle->setText(m_message.m_title);
     m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(m_message));
 
-    updateTitle();
     show();
 
     m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
@@ -147,7 +139,6 @@ void MessagePreviewer::markMessageAsRead() {
       emit requestMessageListReload(false);
       m_message.m_isRead = true;
       updateButtons();
-      updateTitle();
     }
   }
 }
@@ -167,7 +158,6 @@ void MessagePreviewer::markMessageAsUnread() {
       emit requestMessageListReload(false);
       m_message.m_isRead = false;
       updateButtons();
-      updateTitle();
     }
   }
 }
@@ -199,23 +189,16 @@ void MessagePreviewer::updateButtons() {
   m_actionMarkUnread->setEnabled(m_message.m_isRead);
 }
 
-void MessagePreviewer::updateTitle() {
-  QFont fon = m_ui->m_lblTitle->font();
-  fon.setBold(!m_message.m_isRead);
-  m_ui->m_lblTitle->setFont(fon);
-}
-
 QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
-  QString html = QString("<p>[url] <a href=\"%1\">%1</a></p>").arg(message.m_url);
+  QString html = QString("<h2 align=\"center\">%1</h2>").arg(message.m_title);
+
+  html += QString("<p>[url] <a href=\"%1\">%1</a></p>").arg(message.m_url);
 
   foreach (const Enclosure &enc, message.m_enclosures) {
     html += QString("<p>[%2] <a href=\"%1\">%1</a></p>").arg(enc.m_url, enc.m_mimeType);
   }
 
-  if (!message.m_enclosures.isEmpty()) {
-    html += "<hr/>";
-  }
-
+  html += "<hr/>";
   html += message.m_contents;
 
   return html;
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index f23cc5ff4..d42aa2c02 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -57,7 +57,6 @@ class MessagePreviewer : public QWidget {
 
   private:
     void updateButtons();
-    void updateTitle();
     QString prepareHtmlForMessage(const Message &message);
 
     QToolBar *m_toolBar;
diff --git a/src/gui/messagepreviewer.ui b/src/gui/messagepreviewer.ui
index 99b6606e1..2fc7b7604 100644
--- a/src/gui/messagepreviewer.ui
+++ b/src/gui/messagepreviewer.ui
@@ -24,30 +24,6 @@
     <number>0</number>
    </property>
    <item row="0" column="1">
-    <widget class="QLabel" name="m_lblTitle">
-     <property name="font">
-      <font>
-       <pointsize>18</pointsize>
-      </font>
-     </property>
-     <property name="autoFillBackground">
-      <bool>true</bool>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
     <widget class="MessageTextBrowser" name="m_txtMessage">
      <property name="autoFillBackground">
       <bool>true</bool>