Ticket #1442: licq-4735-notice_color_option.patch

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

@@ -186 +186 @@
          m_colorSntHistory,
          m_colorRcv,
          m_colorSnt,
+         m_colorNotice,
          m_colorTab,
          m_colorTabTyping,
          m_colorChatBkg;

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

@@ -217 +217 @@
   QColor m_colorSntHistory;
   QColor m_colorRcv;
   QColor m_colorSnt;
+  QColor m_colorNotice;
   
 public slots:
   virtual void addMsg(CUserEvent *, const char * = 0, unsigned long = 0);

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

@@ -236 +236 @@
   btnColorSnt->setPaletteBackgroundColor(mainwin->m_colorSnt);
   btnColorRcvHistory->setPaletteBackgroundColor(mainwin->m_colorRcvHistory);
   btnColorSntHistory->setPaletteBackgroundColor(mainwin->m_colorSntHistory);
+  btnColorNotice->setPaletteBackgroundColor(mainwin->m_colorNotice);
   /*btnColorTabLabel->setPaletteBackgroundColor(mainwin->m_colorTab);*/
   btnColorTypingLabel->setPaletteBackgroundColor(mainwin->m_colorTabTyping);
   btnColorChatBkg->setPaletteBackgroundColor(mainwin->m_colorChatBkg);
@@ -533 +534 @@
   mainwin->m_colorSnt = btnColorSnt->paletteBackgroundColor();
   mainwin->m_colorRcvHistory = btnColorRcvHistory->paletteBackgroundColor();
   mainwin->m_colorSntHistory = btnColorSntHistory->paletteBackgroundColor();
+  mainwin->m_colorNotice = btnColorNotice->paletteBackgroundColor();
   /*mainwin->m_colorTab = btnColorTabLabel->paletteBackgroundColor();*/
   mainwin->m_colorTabTyping = btnColorTypingLabel->paletteBackgroundColor();
   mainwin->m_colorChatBkg = btnColorChatBkg->paletteBackgroundColor();
@@ -1637 +1639 @@
   new QLabel(tr("History Sent:"), boxColors);
   btnColorSntHistory = new CColorOption(boxColors);
 
+  new QLabel(tr("Notice:"), boxColors);
+  btnColorNotice = new CColorOption(boxColors);
+
   /*new QLabel(tr("Tab Label Color:"), boxColors);
   btnColorTabLabel = new CColorOption(boxColors);*/
 
@@ -1650 +1655 @@
   connect(btnColorRcv, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
   connect(btnColorSntHistory, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
   connect(btnColorRcvHistory, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
+  connect(btnColorNotice, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
   /*connect(btnColorTabLabel, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));*/
   connect(btnColorTypingLabel, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
   connect(btnColorChatBkg, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
@@ -1679 +1685 @@
   static QDateTime date = QDateTime::currentDateTime();
 
   const char *names[2] = {"Marge", "Homer"};
-  const char *msgs[7] = {
+  const char *msgs[8] = {
       "This is received message",
       "This is a sent message",
       "Have you gone to the Licq IRC Channel?",
       "No, where is it?",
       "#Licq on irc.freenode.net",
       "Cool, I'll see you there :)",
-      "We'll be waiting!"};
+      "We'll be waiting!",
+      "Marge has left the conversation."};
 
   msgViewer->m_nMsgStyle = cmbStyle->currentItem();
   msgViewer->m_bAppendLineBreak = chkLineBreak->isChecked();
@@ -1694 +1701 @@
   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());
 
@@ -1709 +1717 @@
           names[i % 2],
           MLView::toRichText(msgs[i], true, true));
   }
+  msgViewer->addNotice(date, MLView::toRichText(msgs[7], true, true));
 }
 
 CColorOption::CColorOption (QWidget* parent)

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

@@ -451 +451 @@
   m_colorSnt = QColor(szTemp);
   licqConf.ReadStr("SentHistoryColor", szTemp, "light blue");
   m_colorSntHistory = QColor(szTemp);
+  licqConf.ReadStr("NoticeColor", szTemp, "green");
+  m_colorNotice = QColor(szTemp);
   licqConf.ReadStr("TabFontColor", szTemp, 
       QApplication::palette(this).active().text().name());
   m_colorTab = QColor(szTemp);
@@ -3580 +3582 @@
   licqConf.WriteStr("ReceiveHistoryColor", m_colorRcvHistory.name());
   licqConf.WriteStr("SentMessageColor", m_colorSnt.name());
   licqConf.WriteStr("SentHistoryColor", m_colorSntHistory.name());
+  licqConf.WriteStr("NoticeColor", m_colorNotice.name());
   licqConf.WriteStr("TabFontColor", m_colorTab.name());
   licqConf.WriteStr("TabOnTypingColor", m_colorTabTyping.name());
   licqConf.WriteStr("ChatBackground", m_colorChatBkg.name());

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

@@ -674 +674 @@
   m_colorSnt = m->m_colorSnt;
   m_colorRcvHistory = m->m_colorRcvHistory;
   m_colorSntHistory = m->m_colorSntHistory;
+  m_colorNotice = m->m_colorNotice;
   setPaletteBackgroundColor(m->m_colorChatBkg);
   mainwin = m;
 
@@ -708 +709 @@
   m_colorSnt = m->m_colorSnt;
   m_colorRcvHistory = m->m_colorRcvHistory;
   m_colorSntHistory = m->m_colorSntHistory;
+  m_colorNotice = m->m_colorNotice;
   setPaletteBackgroundColor(m->m_colorChatBkg);
   mainwin = m;
 /*
@@ -950 +952 @@
 
 void CMessageViewWidget::addNotice(QDateTime dt, QString messageText)
 {
-  QString color = "green";
+  QString color = m_colorNotice.name();
   QString s = "";
   const QString dateTime = dt.toString( m_nDateFormat );
 

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

@@ -170 +170 @@
    CColorOption *btnColorSnt;
    CColorOption *btnColorRcvHistory;
    CColorOption *btnColorSntHistory;
+   CColorOption *btnColorNotice;
    CColorOption *btnColorTabLabel;
    CColorOption *btnColorTypingLabel;
    CColorOption *btnColorChatBkg;