Changeset 4792 for trunk/qt-gui/src/ewidgets.cpp

Timestamp:

11/30/06 05:39:56 (2 years ago)

Author:

erijo

Message:

Patch from Anders Olofsson to add option to hide "user has joined/left conversation" messages. Closes #1442.

Files:

• trunk/qt-gui/src/ewidgets.cpp (modified) (3 diffs)

trunk/qt-gui/src/ewidgets.cpp

@@ -712 +712 @@
     m_appendLineBreak = m->m_chatAppendLineBreak;
   }
+  m_showNotices = m->m_showNotices;
   m_colorRcv = m->m_colorRcv;
   m_colorSnt = m->m_colorSnt;
@@ -762 +763 @@
     m_appendLineBreak = m->m_chatAppendLineBreak;
   }
+  m_showNotices = m->m_showNotices;
   m_colorRcv = m->m_colorRcv;
   m_colorSnt = m->m_colorSnt;
@@ -1084 +1086 @@
 void CMessageViewWidget::addNotice(QDateTime dt, QString messageText)
 {
+  if (!m_showNotices)
+    return;
+
   QString color = m_colorNotice.name();
   QString s = "";
   const QString dateTime = dt.toString( m_nDateFormat );
 
-  /* Remove trailing line breaks. */
-  for (unsigned int i = messageText.length() - 1; i >= 0; i--)
-  {
-    if (messageText.at(i) == '\n' || messageText.at(i) == '\r')
+  // 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;
-  }
-
+      break;
+    }
+  }
 
   switch (m_nMsgStyle)