Ticket #1442: licq-4791-optional_notices.patch

licq/plugins/qt-gui/src/mainwin.h

@@ -159 +159 @@
        m_bShowAllEncodings,
        m_bTabbedChatting,
        m_bShowHistory,
+       m_showNotices,
        m_bDisableDockIcon,
        m_bSortColumnAscending,
        m_chatVertSpacing,

licq/plugins/qt-gui/src/usereventdlg.cpp

@@ -1793 +1793 @@
 {
   if (szId == 0) return;
   
-  if (mainwin->m_bMsgChatView)
+  if (mainwin->m_bMsgChatView && mainwin->m_showNotices)
   {
     ICQUser *u = gUserManager.FetchUser(szId, m_nPPID, LOCK_R);
     QString userName;
@@ -1828 +1828 @@
 {
   if (szId == 0) return;
   
-  if (mainwin->m_bMsgChatView)
+  if (mainwin->m_bMsgChatView && mainwin->m_showNotices)
   {
     ICQUser *u = gUserManager.FetchUser(szId, m_nPPID, LOCK_R);
     QString userName;

licq/plugins/qt-gui/src/optionsdlg.cpp

@@ -227 +227 @@
   /*btnColorTabLabel->setPaletteBackgroundColor(mainwin->m_colorTab);*/
   btnColorTypingLabel->setPaletteBackgroundColor(mainwin->m_colorTabTyping);
   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
   {
     chkTabbedChatting->setEnabled(false);
     chkShowHistory->setEnabled(false);
+    chkShowNotices->setEnabled(false);
   }
+  slot_refresh_msgViewer();
+
   chkSendTN->setChecked(mainwin->licqDaemon->SendTypingNotification());
   chkAutoPosReplyWin->setChecked(mainwin->m_bAutoPosReplyWin);
   chkFlashTaskbar->setChecked(mainwin->m_bFlashTaskbar);
@@ -532 +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();
   mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked();
@@ -837 +841 @@
   QWhatsThis::add(chkShowHistory, tr("Show the last 5 messages when a Send Window is opened"));
   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 leavs 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"));
 
@@ -1151 +1159 @@
 
 void OptionsDlg::slot_useMsgChatView(bool b)
 {
-  if (!b)
-  {
-    chkTabbedChatting->setChecked(false);
-    chkShowHistory->setChecked(false);
-  }
-
   chkTabbedChatting->setEnabled(b);
   chkShowHistory->setEnabled(b);
+  chkShowNotices->setEnabled(b);
 }
 
 void OptionsDlg::slot_useProxy(bool b)
@@ -1744 +1747 @@
           names[i % 2],
           MLView::toRichText(tr(msgs[i]), true, true));
   }
-  msgChatViewer->addNotice(date, MLView::toRichText(tr(msgs[7]), true, true));
 
+  if (chkShowNotices->isChecked())
+    msgChatViewer->addNotice(date, MLView::toRichText(tr(msgs[7]), true, true));
+
   msgHistViewer->updateContent();
 }
 

licq/plugins/qt-gui/src/mainwin.cpp

@@ -429 +429 @@
   licqConf.ReadBool("MsgChatView", m_bMsgChatView, true );
   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);
   licqConf.ReadBool("EnableMainwinMouseMovement", m_bEnableMainwinMouseMovement, true);
@@ -3571 +3572 @@
   licqConf.WriteBool("MsgChatView", m_bMsgChatView);
   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);
   licqConf.WriteBool("EnableMainwinMouseMovement", m_bEnableMainwinMouseMovement);

licq/plugins/qt-gui/src/optionsdlg.h

@@ -114 +114 @@
              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
              *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
              *chkMainWinSticky, *chkMsgWinSticky, *chkSingleLineChatMode,
-             *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN;
+             *chkEnableMainwinMouseMovement, *chkShowHistory, *chkSendTN, *chkShowNotices;
    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
    QComboBox *cmbDockTheme, *cmbSortBy;