X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=f6ce8a66a55d8196f95afa5e229c8a2bc4fd0f1d;hp=bd3f247bfdaa58aa50446e5500334e69f3118caf;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hpb=4e394a809cbc7def74fb1ea3d89dc372bc9ffca4

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index bd3f247b..f6ce8a66 100644
--- 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
-  _senderAutoColor = s.value("Flags/senderAutoColor", QVariant(true)).toBool();  
+  _senderAutoColor = s.value("Colors/SenderAutoColor", false).toBool();
 
   // Now initialize the mapping between FormatCodes and FormatTypes...
   _formatCodes["%O"] = None;
@@ -133,7 +133,7 @@ void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mo
 void UiStyle::setSenderAutoColor( bool state ) {
   _senderAutoColor = state;
   UiStyleSettings s(_settingsKey);
-  s.setValue("Flags/senderAutoColor", QVariant(state));
+  s.setValue("Colors/SenderAutoColor", QVariant(state));
 }
 
 QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const {
@@ -416,8 +416,8 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
       // To produce random like but stable nick colorings some sort of hashing should work best.
       // 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);
+      hash = qChecksum(sender().toAscii().data(), sender().toAscii().size());
+      return (UiStyle::FormatType)((((hash % 12) + 1) << 24) + 0x200); // FIXME: amount of sender colors hardwired
     case Message::Notice:
       return UiStyle::NoticeMsg; break;
     case Message::Server: