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

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 141ff335..84da3062 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 FIXME
+    ftype = Sender;
+  }
+
   if(mode == Settings::Custom && _customFormats.contains(ftype)) return _customFormats.value(ftype);
   else return _defaultFormats.value(ftype, QTextCharFormat());
 }
@@ -156,21 +150,76 @@ QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const {
 // NOTE: This function is intimately tied to the values in FormatType. Don't change this
 //       until you _really_ know what you do!
 QTextCharFormat UiStyle::mergedFormat(quint32 ftype) {
-  if(_cachedFormats.contains(ftype)) return _cachedFormats.value(ftype);
-  if(ftype == Invalid) return QTextCharFormat();
-  // Now we construct the merged format, starting with the default
-  QTextCharFormat fmt = format(None);
-  // First: general message format
-  fmt.merge(format((FormatType)(ftype & 0x0f)));
-  // now more specific ones
-  for(quint32 mask = 0x0010; mask <= 0x2000; mask <<= 1) {
-    if(ftype & mask) fmt.merge(format((FormatType)mask));
+  if(ftype == Invalid)
+    return QTextCharFormat();
+  if(_cachedFormats.contains(ftype))
+    return _cachedFormats.value(ftype);
+
+  QTextCharFormat fmt;
+
+  // Check if we have a special message format stored already sans color codes
+  if(_cachedFormats.contains(ftype & 0x1fffff))
+    fmt = _cachedFormats.value(ftype &0x1fffff);
+  else {
+    // Nope, so we have to construct it...
+    // We assume that we don't mix mirc format codes and component codes, so at this point we know that it's either
+    // a stock (not stylesheeted) component, or mirc formats
+    // In both cases, we start off with the basic format for this message type and then merge the extra stuff
+
+    // Check if we at least already have something stored for the message type first
+    if(_cachedFormats.contains(ftype & 0xf))
+      fmt = _cachedFormats.value(ftype & 0xf);
+    else {
+      // Not being in the cache means it hasn't been preset via stylesheet (or used before)
+      // We might still have set something in code as a fallback, so merge
+      fmt = format(None);
+      fmt.merge(format((FormatType)(ftype & 0x0f)));
+      // This can be cached
+      _cachedFormats[ftype & 0x0f] = fmt;
+    }
+    // OK, at this point we have the message type format - now merge the rest
+    if((ftype & 0xf0)) { // mirc format
+      for(quint32 mask = 0x10; mask <= 0x80; mask <<= 1) {
+        if(!(ftype & mask))
+          continue;
+        // We need to check for overrides in the cache
+        if(_cachedFormats.contains(mask | (ftype & 0x0f)))
+          fmt.merge(_cachedFormats.value(mask | (ftype & 0x0f)));
+        else if(_cachedFormats.contains(mask))
+          fmt.merge(_cachedFormats.value(mask));
+        else // nothing in cache, use stock format
+          fmt.merge(format((FormatType)mask));
+      }
+    } else { // component
+      // We've already checked the cache for the combo of msgtype and component and failed,
+      // so we check if we defined a general format and merge this, or the stock format else
+      if(_cachedFormats.contains(ftype & 0xff00))
+        fmt.merge(_cachedFormats.value(ftype & 0xff00));
+      else
+        fmt.merge(format((FormatType)(ftype & 0xff00)));
+    }
+  }
+
+  // Now we handle color codes. We assume that those can't be combined with components
+  if(ftype & 0x00400000)
+    fmt.merge(format((FormatType)(ftype & 0x0f400000))); // foreground
+  if(ftype & 0x00800000)
+    fmt.merge(format((FormatType)(ftype & 0xf0800000))); // background
+
+  // Sender auto colors
+  if(_senderAutoColor && (ftype & 0x200) && (ftype & 0xff000200) != 0x200) {
+    if(_cachedFormats.contains(ftype & 0xff00020f))
+      fmt.merge(_cachedFormats.value(ftype & 0xff00020f));
+    else if(_cachedFormats.contains(ftype & 0xff000200))
+      fmt.merge(_cachedFormats.value(ftype & 0xff000200));
+    else
+      fmt.merge(format((FormatType)(ftype & 0xff000200)));
   }
-  // color codes!
-  if(ftype & 0x00400000) fmt.merge(format((FormatType)(ftype & 0x0f400000))); // foreground
-  if(ftype & 0x00800000) fmt.merge(format((FormatType)(ftype & 0xf0800000))); // background
+
   // URL
-  if(ftype & Url) fmt.merge(format(Url));
+  if(ftype & Url)
+    fmt.merge(format(Url)); // TODO handle this properly
+
   return _cachedFormats[ftype] = fmt;
 }
 
@@ -318,7 +367,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());
@@ -332,6 +381,7 @@ void UiStyle::StyledMessage::style(UiStyle *style) {
       t = tr("%D0%1").arg(txt); break;
     case Message::Notice:
       t = tr("%Dn%1").arg(txt); break;
+    case Message::Topic:
     case Message::Server:
       t = tr("%Ds%1").arg(txt); break;
     case Message::Error:
@@ -390,6 +440,7 @@ QString UiStyle::StyledMessage::decoratedSender() const {
       return tr("<%1>").arg(plainSender()); break;
     case Message::Notice:
       return tr("[%1]").arg(plainSender()); break;
+    case Message::Topic:
     case Message::Server:
       return tr("*"); break;
     case Message::Error:
@@ -416,9 +467,24 @@ QString UiStyle::StyledMessage::decoratedSender() const {
 UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   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.
+      {
+        QString nick = nickFromMask(sender()).toLower();
+        if(!nick.isEmpty()) {
+          int chopCount = 0;
+          while(nick[nick.count() - 1 - chopCount] == '_') {
+            chopCount++;
+          }
+          nick.chop(chopCount);
+        }
+        quint16 hash = qChecksum(nick.toAscii().data(), nick.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::Topic:
     case Message::Server:
       return UiStyle::ServerMsg; break;
     case Message::Error:
@@ -442,6 +508,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   }
 }
 
+
 /***********************************************************************************/
 
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) {