Changeset 4791 for trunk/qt-gui/src/mainwin.cpp

Timestamp:

11/30/06 03:02:49 (2 years 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.

Files:

• trunk/qt-gui/src/mainwin.cpp (modified) (4 diffs)

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);