Changeset 4792

Timestamp:

11/30/06 05:39:56 (21 months ago)

Author:

erijo

Message:

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

Location:

trunk/qt-gui/src

Files:

• ewidgets.cpp (modified) (3 diffs)
• ewidgets.h (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (1 diff)
• optionsdlg.cpp (modified) (9 diffs)
• optionsdlg.h (modified) (1 diff)

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)

trunk/qt-gui/src/ewidgets.h

@@ -221 +221 @@
   bool m_appendLineBreak;
   bool m_useBuffer;
+  bool m_showNotices;
   QColor m_colorRcvHistory;
   QColor m_colorSntHistory;

trunk/qt-gui/src/mainwin.cpp

@@ -430 +430 @@
   licqConf.ReadBool("TabbedChatting", m_bTabbedChatting, true);
   licqConf.ReadBool("ShowHistory", m_bShowHistory, true);
+  licqConf.ReadBool("ShowNotices", m_showNotices, true);
   licqConf.ReadBool("AutoPosReplyWin", m_bAutoPosReplyWin, true);
   licqConf.ReadBool("AutoSendThroughServer", m_bAutoSendThroughServer, false);
@@ -3572 +3573 @@
   licqConf.WriteBool("TabbedChatting", m_bTabbedChatting);
   licqConf.WriteBool("ShowHistory", m_bShowHistory);
+  licqConf.WriteBool("ShowNotices", m_showNotices);
   licqConf.WriteBool("AutoPosReplyWin", m_bAutoPosReplyWin);
   licqConf.WriteBool("AutoSendThroughServer", m_bAutoSendThroughServer);

trunk/qt-gui/src/mainwin.h

@@ -160 +160 @@
        m_bTabbedChatting,
        m_bShowHistory,
+       m_showNotices,
        m_bDisableDockIcon,
        m_bSortColumnAscending,

trunk/qt-gui/src/optionsdlg.cpp

@@ -229 +229 @@
   btnColorChatBkg->setPaletteBackgroundColor(mainwin->m_colorChatBkg);
   slot_refresh_msgViewer();
-  
+
   if (mainwin->m_bMsgChatView)
   {
     chkTabbedChatting->setChecked(mainwin->m_bTabbedChatting);
     chkShowHistory->setChecked(mainwin->m_bShowHistory);
+    chkShowNotices->setChecked(mainwin->m_showNotices);
   }
   else
@@ -239 +240 @@
     chkTabbedChatting->setEnabled(false);
     chkShowHistory->setEnabled(false);
+    chkShowNotices->setChecked(false);
   }
   chkSendTN->setChecked(mainwin->licqDaemon->SendTypingNotification());
@@ -533 +535 @@
   mainwin->m_bTabbedChatting = chkTabbedChatting->isChecked();
   mainwin->m_bShowHistory = chkShowHistory->isChecked();
+  mainwin->m_showNotices = chkShowNotices->isChecked();
   mainwin->m_bAutoPosReplyWin = chkAutoPosReplyWin->isChecked();
   mainwin->m_bFlashTaskbar = chkFlashTaskbar->isChecked();
@@ -838 +841 @@
   connect(chkMsgChatView, SIGNAL(toggled(bool)), this, SLOT(slot_useMsgChatView(bool)));
 
+  chkShowNotices = new QCheckBox(tr("Show Join/Left Notices"), boxMainWin);
+  QWhatsThis::add(chkShowNotices, tr("Show a notice in the chat window when a user joins or leaves the conversation."));
+  connect(chkShowNotices, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
+
   chkSendTN = new QCheckBox(tr("Send typing notifications"), boxMainWin);
   QWhatsThis::add(chkSendTN, tr("Send a notification to the user so they can see when you are typing a message to them"));
@@ -1156 +1163 @@
     chkTabbedChatting->setChecked(false);
     chkShowHistory->setChecked(false);
+    chkShowNotices->setEnabled(false);
   }
 
   chkTabbedChatting->setEnabled(b);
   chkShowHistory->setEnabled(b);
+  chkShowNotices->setEnabled(b);
 }
 
@@ -1695 +1704 @@
   static QDateTime date = QDateTime::currentDateTime();
 
-  const char *names[2] = {"Marge", "Homer"};
-  const char *msgs[8] = {
+  const char* const names[2] = {"Marge", "Homer"};
+  const char* const msgs[8] = {
       QT_TR_NOOP("This is a received message"),
       QT_TR_NOOP("This is a sent message"),
@@ -1710 +1719 @@
   msgChatViewer->m_extraSpacing = chkChatVertSpacing->isChecked();
   msgChatViewer->m_appendLineBreak = chkChatLineBreak->isChecked();
+  msgChatViewer->m_showNotices = chkShowNotices->isChecked();
   msgChatViewer->m_colorSnt = btnColorSnt->paletteBackgroundColor();
   msgChatViewer->m_colorRcv = btnColorRcv->paletteBackgroundColor();
@@ -1729 +1739 @@
   msgChatViewer->clear();
   msgHistViewer->clear();
+
+  QDateTime msgDate = date;
   for (unsigned int i = 0; i<7; i++)
   {
     msgChatViewer->addMsg(i%2 == 0 ? D_RECEIVER : D_SENDER, (i<2),
           QString(""),
-          date,
+          msgDate,
           true, false, false, false, 
           names[i % 2],
@@ -1740 +1752 @@
     msgHistViewer->addMsg(i%2 == 0 ? D_RECEIVER : D_SENDER, false,
           QString(""),
-          date,
+          msgDate,
           true, false, false, false,
           names[i % 2],
           MLView::toRichText(tr(msgs[i]), true, true));
-  }
-  msgChatViewer->addNotice(date, MLView::toRichText(tr(msgs[7]), true, true));
+
+    msgDate = msgDate.addSecs(i + 12);
+  }
+  msgDate = msgDate.addSecs(12);
+  msgChatViewer->addNotice(msgDate, MLView::toRichText(tr(msgs[7]), true, true));
 
   msgHistViewer->updateContent();

trunk/qt-gui/src/optionsdlg.h

@@ -115 +115 @@
              *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
              *chkMainWinSticky, *chkMsgWinSticky, *chkSingleLineChatMode,
-             *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN;
+             *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN, *chkShowNotices;
    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
    QComboBox *cmbDockTheme, *cmbSortBy;