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

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 141ff335..f6ce8a66 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -24,9 +24,6 @@
 #include "uisettings.h"
 #include "util.h"
 
-// FIXME remove with migration code
-#include <QSettings>
-
 UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // register FormatList if that hasn't happened yet
   // FIXME I don't think this actually avoids double registration... then again... does it hurt?
@@ -36,24 +33,6 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
     Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
   }
 
-  // FIXME remove migration at some point
-  // We remove old settings if we find them, since they conflict
-#ifdef Q_WS_MAC
-  QSettings mys(QCoreApplication::organizationDomain(), Quassel::buildInfo().clientApplicationName);
-#else
-  QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName);
-#endif
-  mys.beginGroup("QtUi");
-  if(mys.childGroups().contains("Colors")) {
-    qDebug() << "Removing obsolete UiStyle settings!";
-    mys.endGroup();
-    mys.remove("Ui");
-    mys.remove("QtUiStyle");
-    mys.remove("QtUiStyleNew");
-    mys.remove("QtUi/Colors");
-    mys.sync();
-  }
-
   _defaultFont = QFont("Monospace", QApplication::font().pointSize());
 
   // Default format
@@ -69,6 +48,9 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
     _customFormats[type] = s.customFormat(type);
   }
 
+  // Check for the sender auto coloring option
+  _senderAutoColor = s.value("Colors/SenderAutoColor", false).toBool();
+
   // Now initialize the mapping between FormatCodes and FormatTypes...
   _formatCodes["%O"] = None;
   _formatCodes["%B"] = Bold;
@@ -148,7 +130,19 @@ void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mo
   _cachedFontMetrics.clear();
 }
 
+void UiStyle::setSenderAutoColor( bool state ) {
+  _senderAutoColor = state;
+  UiStyleSettings s(_settingsKey);
+  s.setValue("Colors/SenderAutoColor", QVariant(state));
+}
+
 QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const {
+  // Check for enabled sender auto coloring
+  if ( (ftype & 0x00000fff) == Sender && !_senderAutoColor ) {
+    // Just use the default sender style if auto coloring is disabled
+    ftype = Sender;
+  }
+
   if(mode == Settings::Custom && _customFormats.contains(ftype)) return _customFormats.value(ftype);
   else return _defaultFormats.value(ftype, QTextCharFormat());
 }
@@ -169,6 +163,8 @@ QTextCharFormat UiStyle::mergedFormat(quint32 ftype) {
   // color codes!
   if(ftype & 0x00400000) fmt.merge(format((FormatType)(ftype & 0x0f400000))); // foreground
   if(ftype & 0x00800000) fmt.merge(format((FormatType)(ftype & 0xf0800000))); // background
+  // Sender auto colors
+  if((ftype & 0xfff) == 0x200 && (ftype & 0xff000200) != 0x200) fmt.merge(format((FormatType)(ftype & 0xff000200)));
   // URL
   if(ftype & Url) fmt.merge(format(Url));
   return _cachedFormats[ftype] = fmt;
@@ -318,7 +314,7 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg)
 {
 }
 
-void UiStyle::StyledMessage::style(UiStyle *style) {
+void UiStyle::StyledMessage::style(UiStyle *style) const {
   QString user = userFromMask(sender());
   QString host = hostFromMask(sender());
   QString nick = nickFromMask(sender());
@@ -414,9 +410,14 @@ QString UiStyle::StyledMessage::decoratedSender() const {
 }
 
 UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
+  quint16 hash;
   switch(type()) {
     case Message::Plain:
-      return UiStyle::Sender; break;
+      // 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 % 12) + 1) << 24) + 0x200); // FIXME: amount of sender colors hardwired
     case Message::Notice:
       return UiStyle::NoticeMsg; break;
     case Message::Server:
@@ -442,6 +443,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   }
 }
 
+
 /***********************************************************************************/
 
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) {