Changeset 4791

Timestamp:

11/30/06 03:02:49 (23 months ago)

Author:

erijo

Message:

Patch from Anders Olofsson to make the history layout configurable. Also adds a new style format that can be used in the history. Fixes part of #1449.

With this commit, <font> tags are removed before the message is displayed. This means that the sender can no longer choose the font or color to show the message in. IMHO, this is a good thing. But if you have an other opinion, speak up and maybe I'll make it configurable.

Location:

trunk/qt-gui/src

Files:

• ewidgets.cpp (modified) (13 diffs)
• ewidgets.h (modified) (4 diffs)
• mainwin.cpp (modified) (4 diffs)
• mainwin.h (modified) (2 diffs)
• mlview.cpp (modified) (1 diff)
• mlview.h (modified) (1 diff)
• optionsdlg.cpp (modified) (7 diffs)
• optionsdlg.h (modified) (3 diffs)
• userinfodlg.cpp (modified) (6 diffs)

trunk/qt-gui/src/ewidgets.cpp

@@ -45 +45 @@
 #include <qlayout.h>
 #include <qheader.h>
+#include <qstringlist.h>
 #include <ctype.h>
 #include <algorithm>
@@ -662 +663 @@
 
 //- Message View Widget ---------------------------------------------------------
+
+QStringList CMessageViewWidget::getStyleNames(bool includeHistoryStyles)
+{
+  static const char *const styleNames[] = {
+    QT_TR_NOOP("Default"),
+    QT_TR_NOOP("Compact"),
+    QT_TR_NOOP("Tiny"),
+    QT_TR_NOOP("Table"),
+    QT_TR_NOOP("Long"),
+    QT_TR_NOOP("Wide")
+  };
+
+  int listLength;
+
+  // Style 5 (Wide) is currently only supported in buffered mode which is not used for chat
+  if(includeHistoryStyles)
+    listLength = 6;
+  else
+    listLength = 5;
+
+  QStringList styleList;
+  for(int i = 0; i < listLength; ++i)
+    styleList.append(tr(styleNames[i]));
+
+  return styleList;
+}
+
 CMessageViewWidget::CMessageViewWidget(const char *szId, unsigned long nPPID,
-  CMainWindow *m, QWidget* parent, const char * name)
+  CMainWindow *m, QWidget* parent, const char *name, bool historyMode)
   : CHistoryWidget(parent, name)
 {
   m_szId = szId ? strdup(szId) : 0;
   m_nPPID = nPPID;
-  m_nMsgStyle = m->m_nMsgStyle;
-  m_nDateFormat = m->m_nDateFormat;
-  m_bAppendLineBreak = m->m_bAppendLineBreak;
+  if (historyMode)
+  {
+    m_useBuffer = true;
+    m_nMsgStyle = m->m_histMsgStyle;
+    m_nDateFormat = m->m_histDateFormat;
+    m_extraSpacing = m->m_histVertSpacing;
+    m_appendLineBreak = false;
+  }
+  else
+  {
+    m_useBuffer = false;
+    m_nMsgStyle = m->m_chatMsgStyle;
+    m_nDateFormat = m->m_chatDateFormat;
+    m_extraSpacing = m->m_chatVertSpacing;
+    m_appendLineBreak = m->m_chatAppendLineBreak;
+  }
   m_colorRcv = m->m_colorRcv;
   m_colorSnt = m->m_colorSnt;
@@ -679 +720 @@
   mainwin = m;
 
+  clear();
+
 /*
   // add all unread messages.
@@ -698 +741 @@
 }
 
-CMessageViewWidget::CMessageViewWidget(unsigned long _nUin, CMainWindow *m, QWidget* parent, const char * name)
+CMessageViewWidget::CMessageViewWidget(unsigned long _nUin, CMainWindow *m, QWidget *parent, const char *name, bool historyMode)
 :CHistoryWidget(parent,name)
 {
   m_nUin= _nUin;
   m_szId = NULL; // avoid desalocation error at destructor
-  m_nMsgStyle = m->m_nMsgStyle;
-  m_nDateFormat = m->m_nDateFormat;
-  m_bAppendLineBreak = m->m_bAppendLineBreak;
+  if (historyMode)
+  {
+    m_useBuffer = true;
+    m_nMsgStyle = m->m_histMsgStyle;
+    m_nDateFormat = m->m_histDateFormat;
+    m_extraSpacing = m->m_histVertSpacing;
+    m_appendLineBreak = false;
+  }
+  else
+  {
+    m_useBuffer = false;
+    m_nMsgStyle = m->m_chatMsgStyle;
+    m_nDateFormat = m->m_chatDateFormat;
+    m_extraSpacing = m->m_chatVertSpacing;
+    m_appendLineBreak = m->m_chatAppendLineBreak;
+  }
   m_colorRcv = m->m_colorRcv;
   m_colorSnt = m->m_colorSnt;
@@ -713 +769 @@
   setPaletteBackgroundColor(m->m_colorChatBkg);
   mainwin = m;
+
+  clear();
+
 /*
   // add all unread messages.
@@ -746 +805 @@
 }
 
+void CMessageViewWidget::clear()
+{
+  CHistoryWidget::clear();
+
+  m_buffer = "";
+
+  switch (m_nMsgStyle)
+  {
+    case 5:
+      // table doesn't work when appending so must buffer when using this style
+      m_buffer.append("<table border=\"0\">");
+      m_useBuffer = true;
+      break;
+  }
+  if (m_useBuffer)
+    m_buffer.prepend("<html><body>");
+}
+
+void CMessageViewWidget::updateContent()
+{
+  if (m_useBuffer)
+    setText(m_buffer);
+}
+
+void CMessageViewWidget::internalAddMsg(QString s)
+{
+  if (m_extraSpacing)
+  {
+    if (m_nMsgStyle != 5)
+    {
+      if (m_useBuffer)
+      {
+        s.prepend("<p>");
+        s.append("</p>");
+      }
+      else
+      {
+        s.append("<br>");
+      }
+    }
+    else
+    {
+      s.append("<tr><td colspan=\"3\"></td></tr>");
+    }
+  }
+
+  if (m_useBuffer)
+  {
+    if (!m_extraSpacing && m_nMsgStyle != 5)
+      s.append("<br>");
+
+    m_buffer.append(s);
+    if (m_appendLineBreak)
+      m_buffer.append("<hr>");
+  }
+  else
+  {
+    append(s);
+    if (m_appendLineBreak)
+      append("<hr>");
+  }
+}
+
 void CMessageViewWidget::addMsg(ICQEvent * _e)
 {
@@ -759 +881 @@
   QString s;
   QString color;
-  bool bAIM = (m_nPPID == LICQ_PPID) && !isdigit(m_szId[0]);
-
-  if (fromHistory) 
+
+  if (fromHistory)
+  {
     if (dir == D_RECEIVER) 
       color = m_colorRcvHistory.name();
     else 
-      color = m_colorSntHistory.name();  
+      color = m_colorSntHistory.name();
+  }
   else
+  {
     if (dir == D_RECEIVER) 
       color = m_colorRcv.name();
     else 
-      color = m_colorSnt.name();  
-  
-  /* Remove trailing line breaks. */
-  for (unsigned int i = messageText.length() - 1; i>=0; i--) {
-    if (messageText.at(i) == '\n' || messageText.at(i) == '\r') {
+      color = m_colorSnt.name();
+  }
+
+  // Remove trailing line breaks.
+  for (int i = messageText.length(); i >= 0; i--)
+  {
+    if (messageText.at(i - 1) != '\n' && messageText.at(i - 1) != '\r')
+    {
       messageText.truncate(i);
-    } else {
       break;
     }
   }
-     
+
+  // Extract everything inside <body>...</body>
+  // Leaving <html> and <body> messes with our message display
+  QRegExp body("<body[^>]*>(.*)</body>");
+  if (body.search(messageText) != -1)
+    messageText = body.cap(1);
+
+  // Remove all font tags
+  messageText.replace(QRegExp("</?font[^>]*>"), "");
+
   QString my_date = date.toString( m_nDateFormat );
-  
+
   switch (m_nMsgStyle) {
     case 0:
-      s = QString("<html><body><font color=\"%1\"><b>%2%3 [%4%5%6%7] %8:</b></font><br>")
+      s = QString("<font color=\"%1\"><b>%2%3 [%4%5%6%7] %8:</b></font><br>")
                   .arg(color)
                   .arg(eventDescription)
@@ -794 +929 @@
                   .arg(isEncrypted ? 'E' : '-')
                   .arg(contactName);
-      s.append(QString("<font color=\"%1\">%2</font></body></html>")
+      s.append(QString("<font color=\"%1\">%2</font>")
                       .arg(color)
                       .arg(messageText));
@@ -811 +946 @@
                       .arg(color)
                       .arg(messageText));
-      if (bAIM)
-      {
-        s.prepend("<html><body>");
-        s.append("</body></html>");
-      }
-
       break;
     case 2:
@@ -827 +956 @@
                       .arg(color)
                       .arg(messageText));
-
-      if (bAIM)
-      {
-        s.prepend("<html><body>");
-        s.append("</body></html>");
-      }
-
       break;  
     case 3:
@@ -864 +986 @@
                   .arg(color)
                   .arg(messageText));
-    break;     
-  }
-  
-  append(s);
-  if (m_bAppendLineBreak) {
-    append("<hr>");
-  }
+      break;
+    case 5:
+      // Mode 5 is a table so it cannot be displayed in paragraphs
+      s = QString("<tr><td><nobr><b><font color=\"%1\">%2</font><b></nobr></td>")
+                  .arg(color)
+                  .arg(my_date);
+      s.append(QString("<td><b><font color=\"%3\">%4</font></b></font></td>")
+                       .arg(color)
+                       .arg(contactName));
+      s.append(QString("<td><font color=\"%1\">%2</font></td></tr>")
+                      .arg(color)
+                      .arg(messageText));
+      break;
+  }
+
+  internalAddMsg(s);
 }
 
@@ -989 +1120 @@
       break; 
 
+    case 5:
+      s = QString("<tr><td><b><font color=\"%1\">%2</font><b></td><td colspan=\"2\"><b><font color=\"%3\">%4</font></b></font></td></tr>")
+                  .arg(color)
+                  .arg(dateTime)
+                  .arg(color)
+                  .arg(messageText);
+      break;
+
     case 0:
     default:
-      s = QString("<html><body><font color=\"%1\"><b>[%2] %3</b></font><br></body></html>")
+      s = QString("<font color=\"%1\"><b>[%2] %3</b></font><br>")
                   .arg(color)
                   .arg(dateTime)
@@ -998 +1137 @@
   }
 
-  append(s);
-  if (m_bAppendLineBreak)
-    append("<hr>");
+  internalAddMsg(s);
 }
 

trunk/qt-gui/src/ewidgets.h

@@ -33 +33 @@
 #include <qsize.h>
 #include <qlistview.h>
+#include <qstringlist.h>
 
 #include "mlview.h"
@@ -199 +200 @@
   CMainWindow *mainwin;
 public:
+  static QStringList getStyleNames(bool includeHistoryStyles = false);
+
   CMessageViewWidget(const char *szId, unsigned long nPPID,
-    CMainWindow *m, QWidget *parent = 0, const char *name = 0);
+    CMainWindow *m, QWidget *parent = 0, const char *name = 0, bool historyMode = false);
   CMessageViewWidget(unsigned long _nUin, CMainWindow *m,
-             QWidget* parent=0, const char * name =0);
+    QWidget* parent = 0, const char *name = 0, bool historyMode = false);
   virtual ~CMessageViewWidget();
 
   void setOwner(const char *szId);
+  void updateContent();
+  void clear();
   void addMsg(direction dir, bool fromHistory, QString eventDescription, QDateTime date, 
     bool isDirect, bool isMultiRec, bool isUrgent, bool isEncrypted, 
@@ -213 +218 @@
   unsigned short m_nMsgStyle;
   QString m_nDateFormat;
-  bool m_bAppendLineBreak;
+  bool m_extraSpacing;
+  bool m_appendLineBreak;
+  bool m_useBuffer;
   QColor m_colorRcvHistory;
   QColor m_colorSntHistory;
@@ -223 +230 @@
   virtual void addMsg(CUserEvent *, const char * = 0, unsigned long = 0);
   void addMsg(ICQEvent *);
+
+private:
+  void internalAddMsg(QString s);
+  QString m_buffer;
 };
 

trunk/qt-gui/src/mainwin.cpp

@@ -433 +433 @@
   licqConf.ReadBool("AutoSendThroughServer", m_bAutoSendThroughServer, false);
   licqConf.ReadBool("EnableMainwinMouseMovement", m_bEnableMainwinMouseMovement, true);
-  licqConf.ReadNum("ChatMessageStyle", m_nMsgStyle, 0);
-  licqConf.ReadBool("ChatAppendLinebreak", m_bAppendLineBreak, false);
+  licqConf.ReadNum("ChatMessageStyle", m_chatMsgStyle, 0);
+  licqConf.ReadBool("ChatVerticalSpacing", m_chatVertSpacing, true);
+  licqConf.ReadBool("ChatAppendLinebreak", m_chatAppendLineBreak, false);
   licqConf.ReadBool("FlashTaskbar", m_bFlashTaskbar, true);
   licqConf.ReadBool("ShowUserIcons", m_bShowUserIcons, true);
@@ -442 +443 @@
   licqConf.ReadBool("CheckSpellingEnabled", m_bCheckSpellingEnabled, false);
   licqConf.ReadStr("DateFormat", szTemp, "hh:mm:ss");
-  m_nDateFormat = QString::fromLatin1(szTemp);
+  m_chatDateFormat = QString::fromLatin1(szTemp);
+  licqConf.ReadNum("HistoryMessageStyle", m_histMsgStyle, 0);
+  licqConf.ReadBool("HistoryVerticalSpacing", m_histVertSpacing, true);
+  licqConf.ReadStr("HistoryDateFormat", szTemp, "yyyy-MM-dd hh:mm:ss");
+  m_histDateFormat = QString::fromLatin1(szTemp);
 
   licqConf.ReadStr("ReceiveMessageColor", szTemp, "red");
@@ -3577 +3582 @@
   licqConf.WriteBool("CheckSpellingEnabled", m_bCheckSpellingEnabled);
 
-  licqConf.WriteNum("ChatMessageStyle", m_nMsgStyle);
-  licqConf.WriteBool("ChatAppendLinebreak", m_bAppendLineBreak);
+  licqConf.WriteNum("ChatMessageStyle", m_chatMsgStyle);
+  licqConf.WriteBool("ChatVerticalSpacing", m_chatVertSpacing);
+  licqConf.WriteBool("ChatAppendLinebreak", m_chatAppendLineBreak);
   licqConf.WriteStr("ReceiveMessageColor", m_colorRcv.name());
   licqConf.WriteStr("ReceiveHistoryColor", m_colorRcvHistory.name());
@@ -3587 +3593 @@
   licqConf.WriteStr("TabOnTypingColor", m_colorTabTyping.name());
   licqConf.WriteStr("ChatBackground", m_colorChatBkg.name());
-  licqConf.WriteStr("DateFormat", m_nDateFormat.latin1());
+  licqConf.WriteStr("DateFormat", m_chatDateFormat.latin1());
+  licqConf.WriteNum("HistoryMessageStyle", m_histMsgStyle);
+  licqConf.WriteBool("HistoryVerticalSpacing", m_histVertSpacing);
+  licqConf.WriteStr("HistoryDateFormat", m_histDateFormat.latin1());
 
   licqConf.WriteBool("showPopPicture", m_bPopPicture);

trunk/qt-gui/src/mainwin.h

@@ -162 +162 @@
        m_bDisableDockIcon,
        m_bSortColumnAscending,
-       m_bAppendLineBreak,
+       m_chatVertSpacing,
+       m_chatAppendLineBreak,
+       m_histVertSpacing,
        m_bFlashTaskbar,
        m_bMainWinSticky,
@@ -180 +182 @@
   unsigned short m_nSortByStatus,
                  m_nSortColumn,
-                 m_nMsgStyle;
-  QString m_nDateFormat;
-                 
+                 m_chatMsgStyle,
+                 m_histMsgStyle;
+
+  QString m_chatDateFormat,
+          m_histDateFormat;
+
   QColor m_colorRcvHistory,
          m_colorSntHistory,

trunk/qt-gui/src/mlview.cpp

@@ -157 +157 @@
 }
 
+void MLView::GotoHome()
+{
+  setContentsPos(0, 0);
+}
+
 void MLView::GotoEnd()
 {

trunk/qt-gui/src/mlview.h

@@ -32 +32 @@
   void appendNoNewLine(const QString& s);
   void append(const QString& s);
+  void GotoHome();
   void GotoEnd();
 

trunk/qt-gui/src/optionsdlg.cpp

@@ -213 +213 @@
   chkSendFromClipboard->setChecked(mainwin->m_bSendFromClipboard);
   chkMsgChatView->setChecked(mainwin->m_bMsgChatView);
-
-  bool isCustomDate = true;
-  for (int i = 0; i < cmbDateFormat->count(); i++)
-  {
-    if (cmbDateFormat->text(i) == mainwin->m_nDateFormat)
-    {
-      cmbDateFormat->setCurrentItem(i);
-      isCustomDate = false;
-      break;
-    }
-  }
-
-  // Make sure the checkbox is actually toggled, so that widgets are enabled/disabled.
-  chkCustomDateFormat->setChecked(!isCustomDate);
-  chkCustomDateFormat->setChecked(isCustomDate);
-
-  customDateFormat->setText(mainwin->m_nDateFormat);
-
-  chkLineBreak->setChecked(mainwin->m_bAppendLineBreak);
-  cmbStyle->setCurrentItem(mainwin->m_nMsgStyle);
+  cmbChatDateFormat->lineEdit()->setText(mainwin->m_chatDateFormat);
+  chkChatVertSpacing->setChecked(mainwin->m_chatVertSpacing);
+  chkChatLineBreak->setChecked(mainwin->m_chatAppendLineBreak);
+  cmbChatStyle->setCurrentItem(mainwin->m_chatMsgStyle);
+  cmbHistStyle->setCurrentItem(mainwin->m_histMsgStyle);
+  chkHistVertSpacing->setChecked(mainwin->m_histVertSpacing);
+  cmbHistDateFormat->lineEdit()->setText(mainwin->m_histDateFormat);
   btnColorRcv->setPaletteBackgroundColor(mainwin->m_colorRcv);
   btnColorSnt->setPaletteBackgroundColor(mainwin->m_colorSnt);
@@ -528 +515 @@
   mainwin->m_bSendFromClipboard = chkSendFromClipboard->isChecked();
   mainwin->m_bMsgChatView = chkMsgChatView->isChecked();
-  mainwin->m_bAppendLineBreak = chkLineBreak->isChecked();
-  mainwin->m_nMsgStyle = cmbStyle->currentItem();
-  mainwin->m_nDateFormat = getCurrentDateFormat();
+  mainwin->m_chatVertSpacing = chkChatVertSpacing->isChecked();
+  mainwin->m_chatAppendLineBreak = chkChatLineBreak->isChecked();
+  mainwin->m_chatMsgStyle = cmbChatStyle->currentItem();
+  mainwin->m_chatDateFormat = cmbChatDateFormat->currentText();
+  mainwin->m_histMsgStyle = cmbHistStyle->currentItem();
+  mainwin->m_histVertSpacing = chkHistVertSpacing->isChecked();
+  mainwin->m_histDateFormat = cmbHistDateFormat->currentText();
   mainwin->m_colorRcv = btnColorRcv->paletteBackgroundColor();
   mainwin->m_colorSnt = btnColorSnt->paletteBackgroundColor();
@@ -1567 +1558 @@
   lay->addWidget(boxRight);
 
-  QGroupBox* boxOptions = new QGroupBox(1, Horizontal, tr("Options"), boxRight);
-
-  new QLabel(tr("Style:"), boxOptions);
-  cmbStyle = new QComboBox(false, boxOptions);
-  cmbStyle->insertItem("Default");
-  cmbStyle->insertItem("Compact");
-  cmbStyle->insertItem("Tiny");
-  cmbStyle->insertItem("Table");
-  cmbStyle->insertItem("History");
-  connect(cmbStyle, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
-
-  chkLineBreak = new QCheckBox(tr("Insert Horizontal Line"), boxOptions);
-  connect(chkLineBreak, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
-
-  new QLabel(tr("Date Format:"), boxOptions);
-  cmbDateFormat = new QComboBox(false, boxOptions);
-  cmbDateFormat->insertItem("hh:mm:ss");
-  cmbDateFormat->insertItem("yyyy-MM-dd hh:mm:ss");
-  cmbDateFormat->insertItem("yyyy-MM-dd");
-  cmbDateFormat->insertItem("yyyy/MM/dd hh:mm:ss");
-  cmbDateFormat->insertItem("yyyy/MM/dd");
-  cmbDateFormat->insertItem("dd.MM.yyyy hh:mm:ss");
-  cmbDateFormat->insertItem("dd.MM.yyyy");
-  connect(cmbDateFormat, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
-
-  chkCustomDateFormat = new QCheckBox(tr("Custom Date Format:"), boxOptions);
-  connect(chkCustomDateFormat, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
-  connect(chkCustomDateFormat, SIGNAL(toggled(bool)), cmbDateFormat, SLOT(setDisabled(bool)));
-
-  customDateFormat = new QLineEdit(boxOptions);
-  connect(chkCustomDateFormat, SIGNAL(toggled(bool)), customDateFormat, SLOT(setEnabled(bool)));
-  connect(customDateFormat, SIGNAL(textChanged(const QString&)), this, SLOT(slot_refresh_msgViewer()));
-  QWhatsThis::add(customDateFormat, tr(
+  QGroupBox* boxChatOptions = new QGroupBox(1, Horizontal, tr("Chat Options"), boxRight);
+
+  static const int dateFormatsLength = 7;
+  static const char *const dateFormats[dateFormatsLength] = {
+      "hh:mm:ss",
+      "yyyy-MM-dd hh:mm:ss",
+      "yyyy-MM-dd",
+      "yyyy/MM/dd hh:mm:ss",
+      "yyyy/MM/dd",
+      "dd.MM.yyyy hh:mm:ss",
+      "dd.MM.yyyy"
+  };
+
+  new QLabel(tr("Style:"), boxChatOptions);
+  cmbChatStyle = new QComboBox(false, boxChatOptions);
+  cmbChatStyle->insertStringList(CMessageViewWidget::getStyleNames(false));
+  connect(cmbChatStyle, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
+
+  chkChatVertSpacing = new QCheckBox(tr("Insert Vertical Spacing"), boxChatOptions);
+  connect(chkChatVertSpacing, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
+  QWhatsThis::add(chkChatVertSpacing, tr("Insert extra space between messages."));
+
+  chkChatLineBreak = new QCheckBox(tr("Insert Horizontal Line"), boxChatOptions);
+  connect(chkChatLineBreak, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
+  QWhatsThis::add(chkChatLineBreak, tr("Insert a line between each message."));
+
+  QLabel* lblChatDateFormat = new QLabel(tr("Date Format:"), boxChatOptions);
+  cmbChatDateFormat = new QComboBox(true, boxChatOptions);
+  for(int i = 0; i < dateFormatsLength; ++i)
+    cmbChatDateFormat->insertItem(dateFormats[i]);
+  connect(cmbChatDateFormat, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
+  connect(cmbChatDateFormat, SIGNAL(textChanged(const QString&)), this, SLOT(slot_refresh_msgViewer()));
+
+  QString helpDateFormat = tr(
       "<p>Available custom date format variables.</p>\n"
       "<table>\n"
@@ -1624 +1616 @@
       "<tr><td>AP</td><td>use AM/PM display. AP will be replaced by either 'AM' or 'PM'</td></tr>\n"
       "<tr><td>ap</td><td>use am/pm display. ap will be replaced by either 'am' or 'pm'</td></tr>\n"
-      "</table>"));
+      "</table>");
+
+  QWhatsThis::add(lblChatDateFormat, helpDateFormat);
+  QWhatsThis::add(cmbChatDateFormat, helpDateFormat);
+
+  QGroupBox* boxHistOptions = new QGroupBox(1, Horizontal, tr("History Options"), boxRight);
+  new QLabel(tr("Style:"), boxHistOptions);
+  cmbHistStyle = new QComboBox(false, boxHistOptions);
+  cmbHistStyle->insertStringList(CMessageViewWidget::getStyleNames(true));
+  connect(cmbHistStyle, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
+
+  chkHistVertSpacing = new QCheckBox(tr("Insert Vertical Spacing"), boxHistOptions);
+  connect(chkHistVertSpacing, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
+  QWhatsThis::add(chkHistVertSpacing, tr("Insert extra space between messages."));
+
+  QLabel* lblHistDateFormat = new QLabel(tr("Date Format:"), boxHistOptions);
+  cmbHistDateFormat = new QComboBox(true, boxHistOptions);
+  for(int i = 0; i < dateFormatsLength; ++i)
+    cmbHistDateFormat->insertItem(dateFormats[i]);
+  connect(cmbHistDateFormat, SIGNAL(activated(int)), this, SLOT(slot_refresh_msgViewer()));
+  connect(cmbHistDateFormat, SIGNAL(textChanged(const QString&)), this, SLOT(slot_refresh_msgViewer()));
+  QWhatsThis::add(lblHistDateFormat, helpDateFormat);
+  QWhatsThis::add(cmbHistDateFormat, helpDateFormat);
+
 
   QGroupBox *boxColors = new QGroupBox(2, Horizontal, tr("Colors"), boxRight);
@@ -1661 +1676 @@
   connect(btnColorChatBkg, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
 
-  tabViewer = new QTabWidget(w);
+  tabViewer = new CETabWidget(w);
   lay->addWidget(tabViewer);
 
-  msgViewer = new CMessageViewWidget(0, gMainWindow, tabViewer);
-  tabViewer->insertTab(msgViewer, "Marge");
+  msgChatViewer = new CMessageViewWidget(0, gMainWindow, tabViewer);
+  tabViewer->insertTab(msgChatViewer, "Marge");
+
+  msgHistViewer = new CMessageViewWidget(0, gMainWindow, tabViewer, 0, true);
+  tabViewer->insertTab(msgHistViewer, "History");
 
   lay->activate();
 
   return w;
-}
-
-QString OptionsDlg::getCurrentDateFormat() const
-{
-  if (chkCustomDateFormat->isChecked())
-    return customDateFormat->text();
-  else
-    return cmbDateFormat->currentText();
 }
 
@@ -1697 +1707 @@
   };
 
-  msgViewer->m_nMsgStyle = cmbStyle->currentItem();
-  msgViewer->m_bAppendLineBreak = chkLineBreak->isChecked();
-  msgViewer->m_colorSnt = btnColorSnt->paletteBackgroundColor();
-  msgViewer->m_colorRcv = btnColorRcv->paletteBackgroundColor();
-  msgViewer->m_colorSntHistory = btnColorSntHistory->paletteBackgroundColor();
-  msgViewer->m_colorRcvHistory = btnColorRcvHistory->paletteBackgroundColor();
-  msgViewer->m_colorNotice = btnColorNotice->paletteBackgroundColor();
-  tabViewer->setPaletteForegroundColor(btnColorTypingLabel->paletteBackgroundColor());
-  msgViewer->setPaletteBackgroundColor(btnColorChatBkg->paletteBackgroundColor());
-
-  msgViewer->m_nDateFormat = getCurrentDateFormat();
-
-  msgViewer->clear();
+  msgChatViewer->m_nMsgStyle = cmbChatStyle->currentItem();
+  msgChatViewer->m_extraSpacing = chkChatVertSpacing->isChecked();
+  msgChatViewer->m_appendLineBreak = chkChatLineBreak->isChecked();
+  msgChatViewer->m_colorSnt = btnColorSnt->paletteBackgroundColor();