Use Oxygen palette as hardwired sender colors for now Disable sender coloring per...

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index d1b455d..3364ec2 100644 (file)
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -83,37 +83,20 @@ QtUiStyle::QtUiStyle() : UiStyle("QtUiStyle") {
 
   /*
    * Fillup the list of colors used for sender auto coloring In this case
 
   /*
    * Fillup the list of colors used for sender auto coloring In this case

-   * this are all tango colors without the grey tones 
-   * See "http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" for details
+   * These are Oxygen palette colors

    */
    */

-  // Butter
-  addSenderAutoColor(SenderCol01, "#fce94f");
-  addSenderAutoColor(SenderCol02, "#edd400");
-  addSenderAutoColor(SenderCol03,  "#c4a000");
-  // Orange
-  addSenderAutoColor(SenderCol04,  "#fcaf3e");
-  addSenderAutoColor(SenderCol05,  "#f57900");
-  addSenderAutoColor(SenderCol06,  "#ce5c00");
-  // Chocolate
-  addSenderAutoColor(SenderCol07, "#e9b96e");
-  addSenderAutoColor(SenderCol08, "#c17d11");
-  addSenderAutoColor(SenderCol09, "#8f5902");
-  // Chameleon
-  addSenderAutoColor(SenderCol10, "#8ae234");
-  addSenderAutoColor(SenderCol11, "#73d216");
-  addSenderAutoColor(SenderCol12, "#4e9a06");
-  // Sky Blue
-  addSenderAutoColor(SenderCol13, "#729fcf");
-  addSenderAutoColor(SenderCol14, "#3465a4");
-  addSenderAutoColor(SenderCol15, "#204a87");
-  // Plum
-  addSenderAutoColor(SenderCol16, "#ad7fa8");
-  addSenderAutoColor(SenderCol17, "#75507b");
-  addSenderAutoColor(SenderCol18, "#5c3566");
-  // Scarlet Red
-  addSenderAutoColor(SenderCol19, "#ef2929");
-  addSenderAutoColor(SenderCol20, "#cc0000");
-  addSenderAutoColor(SenderCol21, "#a40000");
+  addSenderAutoColor(SenderCol01, "#989a95");
+  addSenderAutoColor(SenderCol02, "#ef8440");
+  addSenderAutoColor(SenderCol03, "#ffe200");
+  addSenderAutoColor(SenderCol04, "#49b13b");
+  addSenderAutoColor(SenderCol05, "#00a778");
+  addSenderAutoColor(SenderCol06, "#008b90");
+  addSenderAutoColor(SenderCol07, "#0069ba");
+  addSenderAutoColor(SenderCol08, "#563696");
+  addSenderAutoColor(SenderCol09, "#ad3597");
+  addSenderAutoColor(SenderCol10, "#e70083");
+  addSenderAutoColor(SenderCol11, "#e70f00");
+  addSenderAutoColor(SenderCol12, "#866127");

 
   QTextCharFormat nick;
   nick.setAnchor(true);
 
   QTextCharFormat nick;
   nick.setAnchor(true);


@@ -151,8 +134,7 @@ void QtUiStyle::setHighlightColor(const QColor &col) {
   s.setHighlightColor(col);
 }
 
   s.setHighlightColor(col);
 }
 

-void QtUiStyle::addSenderAutoColor(FormatType type, const QString name) 
-{
+void QtUiStyle::addSenderAutoColor(FormatType type, const QString name) {

   QTextCharFormat autoColor;
   autoColor.setAnchor(true);
   autoColor.setForeground(QBrush(QColor(name)));
   QTextCharFormat autoColor;
   autoColor.setAnchor(true);
   autoColor.setForeground(QBrush(QColor(name)));

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index b226e67..557cfd3 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -153,7 +153,7 @@ void ColorSettingsPage::defaultMessage() {
   ui.senderBG->setColor(QColor("white"));
   ui.senderBG->setEnabled(false);
   ui.senderUseBG->setChecked(false);
   ui.senderBG->setColor(QColor("white"));
   ui.senderBG->setEnabled(false);
   ui.senderUseBG->setChecked(false);

-  ui.senderAutoColor->setChecked(true);  
+  ui.senderAutoColor->setChecked(false);

   ui.newMsgMarkerFG->setColor(Qt::red);
 
   /*
   ui.newMsgMarkerFG->setColor(Qt::red);
 
   /*

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 6ebc17f..dbefa52 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -49,7 +49,7 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   }
 
   // Check for the sender auto coloring option
   }
 
   // Check for the sender auto coloring option

-  _senderAutoColor = s.value("Flags/senderAutoColor", QVariant(true)).toBool();  
+  _senderAutoColor = s.value("Flags/senderAutoColor", QVariant(true)).toBool();

 
   // Now initialize the mapping between FormatCodes and FormatTypes...
   _formatCodes["%O"] = None;
 
   // Now initialize the mapping between FormatCodes and FormatTypes...
   _formatCodes["%O"] = None;


@@ -417,7 +417,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
       // In this case we just use the qt function qChecksum which produces a
       // CRC16 hash. This should be fast and 16 bits are more than enough.
       hash = qChecksum(sender().toAscii().data(), sender().toAscii().size());
       // In this case we just use the qt function qChecksum which produces a
       // CRC16 hash. This should be fast and 16 bits are more than enough.
       hash = qChecksum(sender().toAscii().data(), sender().toAscii().size());

-      return (UiStyle::FormatType)((((hash % 21) + 1) << 24) + 0x200);
+      return (UiStyle::FormatType)((((hash % 12) + 1) << 24) + 0x200); // FIXME: amount of sender colors hardwired

     case Message::Notice:
       return UiStyle::NoticeMsg; break;
     case Message::Server:
     case Message::Notice:
       return UiStyle::NoticeMsg; break;
     case Message::Server: