Changeset 4736

Timestamp:

11/06/06 04:45:07 (2 years ago)

Author:

erijo

Message:

Patch from Anders Olofsson to allow configuration of notice color.

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) (8 diffs)
• optionsdlg.h (modified) (1 diff)

trunk/qt-gui/src/ewidgets.cpp

@@ -675 +675 @@
   m_colorRcvHistory = m->m_colorRcvHistory;
   m_colorSntHistory = m->m_colorSntHistory;
+  m_colorNotice = m->m_colorNotice;
   setPaletteBackgroundColor(m->m_colorChatBkg);
   mainwin = m;
@@ -709 +710 @@
   m_colorRcvHistory = m->m_colorRcvHistory;
   m_colorSntHistory = m->m_colorSntHistory;
+  m_colorNotice = m->m_colorNotice;
   setPaletteBackgroundColor(m->m_colorChatBkg);
   mainwin = m;
@@ -951 +953 @@
 void CMessageViewWidget::addNotice(QDateTime dt, QString messageText)
 {
-  QString color = "green";
+  QString color = m_colorNotice.name();
   QString s = "";
   const QString dateTime = dt.toString( m_nDateFormat );

trunk/qt-gui/src/ewidgets.h

@@ -218 +218 @@
   QColor m_colorRcv;
   QColor m_colorSnt;
+  QColor m_colorNotice;
   
 public slots:

trunk/qt-gui/src/mainwin.cpp

@@ -452 +452 @@
   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());
@@ -3581 +3583 @@
   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());

trunk/qt-gui/src/mainwin.h

@@ -187 +187 @@
          m_colorRcv,
          m_colorSnt,
+         m_colorNotice,
          m_colorTab,
          m_colorTabTyping,

trunk/qt-gui/src/optionsdlg.cpp

@@ -237 +237 @@
   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);
@@ -534 +535 @@
   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();
@@ -1638 +1640 @@
   btnColorSntHistory = new CColorOption(boxColors);
 
+  new QLabel(tr("Notice:"), boxColors);
+  btnColorNotice = new CColorOption(boxColors);
+
   /*new QLabel(tr("Tab Label Color:"), boxColors);
   btnColorTabLabel = new CColorOption(boxColors);*/
@@ -1651 +1656 @@
   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()));
@@ -1680 +1686 @@
 
   const char *names[2] = {"Marge", "Homer"};
-  const char *msgs[7] = {
+  const char *msgs[8] = {
       "This is received message",
       "This is a sent message",
@@ -1687 +1693 @@
       "#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();
@@ -1695 +1702 @@
   msgViewer->m_colorSntHistory = btnColorSntHistory->paletteBackgroundColor();
   msgViewer->m_colorRcvHistory = btnColorRcvHistory->paletteBackgroundColor();
+  msgViewer->m_colorNotice = btnColorNotice->paletteBackgroundColor();
   tabViewer->setPaletteForegroundColor(btnColorTypingLabel->paletteBackgroundColor());
   msgViewer->setPaletteBackgroundColor(btnColorChatBkg->paletteBackgroundColor());
@@ -1710 +1718 @@
           MLView::toRichText(msgs[i], true, true));
   }
+  msgViewer->addNotice(date, MLView::toRichText(msgs[7], true, true));
 }
 

trunk/qt-gui/src/optionsdlg.h

@@ -171 +171 @@
    CColorOption *btnColorRcvHistory;
    CColorOption *btnColorSntHistory;
+   CColorOption *btnColorNotice;
    CColorOption *btnColorTabLabel;
    CColorOption *btnColorTypingLabel;