X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=41c50a6d43861e50c52c20f3de3d3266e1ad811a;hp=555f87707f577c8b5ad41254a8c53f1cb9af518b;hb=a8b1a382d95b0fd6c2438eb05daeea587e20b661;hpb=64bc0567e3fe373ab996a23ed690ec5631bb417f

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 555f8770..41c50a6d 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -92,7 +92,7 @@ void UiStyle::loadStyleSheet() {
   UiStyleSettings s;
 
   QString styleSheet;
-  styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss"));
+  styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("stylesheets/default.qss"));
   styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss");
   if(s.value("UseCustomStyleSheet", false).toBool())
     styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
@@ -102,17 +102,14 @@ void UiStyle::loadStyleSheet() {
     QssParser parser;
     parser.processStyleSheet(styleSheet);
     QApplication::setPalette(parser.palette());
-    _uiStylePalette = parser.uiStylePalette();
 
-    QTextCharFormat baseFmt = parser.formats().value(Base);
-    foreach(quint64 fmtType, parser.formats().keys()) {
-      QTextCharFormat fmt = baseFmt;
-      fmt.merge(parser.formats().value(fmtType));
-      _formats[fmtType] = fmt;
-    }
+    _uiStylePalette = parser.uiStylePalette();
+    _formats = parser.formats();
     _listItemFormats = parser.listItemFormats();
 
-    qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+    styleSheet = styleSheet.trimmed();
+    if(!styleSheet.isEmpty())
+      qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
   }
 
   emit changed();
@@ -352,7 +349,7 @@ void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
 
   // URL
   if(ftype & Url)
-    mergeSubElementFormat(fmt, ftype & Url, label);
+    mergeSubElementFormat(fmt, ftype & (Url | 0x000000ff), label);
 }
 
 // Merge a subelement format into an existing message format
@@ -394,6 +391,12 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
       return ErrorMsg;
     case Message::DayChange:
       return DayChangeMsg;
+    case Message::Topic:
+      return TopicMsg;
+    case Message::NetsplitJoin:
+      return NetsplitJoinMsg;
+    case Message::NetsplitQuit:
+      return NetsplitQuitMsg;
   }
   //Q_ASSERT(false); // we need to handle all message types
   qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
@@ -453,10 +456,10 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat
         color &= 0x0f;
         if(s[pos+3] == 'f') {
           curfmt &= 0xf0ffffff;
-          curfmt |= (color << 24) | 0x00400000;
+          curfmt |= (quint32)(color << 24) | 0x00400000;
         } else {
           curfmt &= 0x0fffffff;
-          curfmt |= (color << 28) | 0x00800000;
+          curfmt |= (quint32)(color << 28) | 0x00800000;
         }
         length = 6;
       }
@@ -549,6 +552,7 @@ void UiStyle::StyledMessage::style() const {
   QString txt = UiStyle::mircToInternal(contents());
   QString bufferName = bufferInfo().bufferName();
   bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
+  const int maxNetsplitNicks = 15;
 
   QString t;
   switch(type()) {
@@ -608,6 +612,38 @@ void UiStyle::StyledMessage::style() const {
       //: Day Change Message
       t = tr("{Day changed to %1}").arg(timestamp().toString());
       break;
+    case Message::Topic:
+      //: Topic Message
+      t = tr("%1").arg(txt); break;
+    case Message::NetsplitJoin: {
+      QStringList users = txt.split(":");
+      QStringList servers = users.takeLast().split(" ");
+
+      for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+        users[i] = nickFromMask(users.at(i));
+
+      t = tr("Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: ").arg(servers.at(0),servers.at(1));
+      if(users.count() <= maxNetsplitNicks)
+        t.append(QString("%DN%1%DN").arg(users.join(", ")));
+      else
+        t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+      }
+      break;
+    case Message::NetsplitQuit: {
+      QStringList users = txt.split(":");
+      QStringList servers = users.takeLast().split(" ");
+
+      for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++)
+        users[i] = nickFromMask(users.at(i));
+
+      t = tr("Netsplit between %DH%1%DH and %DH%2%DH. Users quit: ").arg(servers.at(0),servers.at(1));
+
+      if(users.count() <= maxNetsplitNicks)
+        t.append(QString("%DN%1%DN").arg(users.join(", ")));
+      else
+        t.append(tr("%DN%1%DN (%2 more)").arg(static_cast<QStringList>(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks));
+      }
+      break;
     default:
       t = tr("[%1]").arg(txt);
   }
@@ -672,6 +708,12 @@ QString UiStyle::StyledMessage::decoratedSender() const {
       return tr("*"); break;
     case Message::DayChange:
       return tr("-"); break;
+    case Message::Topic:
+      return tr("*"); break;
+    case Message::NetsplitJoin:
+      return tr("=>"); break;
+    case Message::NetsplitQuit:
+      return tr("<="); break;
     default:
       return tr("%1").arg(plainSender());
   }
@@ -685,9 +727,10 @@ quint8 UiStyle::StyledMessage::senderHash() const {
   QString nick = nickFromMask(sender()).toLower();
   if(!nick.isEmpty()) {
     int chopCount = 0;
-    while(nick.at(nick.count() - 1 - chopCount) == '_')
+    while(chopCount < nick.size() && nick.at(nick.count() - 1 - chopCount) == '_')
       chopCount++;
-    nick.chop(chopCount);
+    if(chopCount < nick.size())
+      nick.chop(chopCount);
   }
   quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
   return (_senderHash = (hash & 0xf) + 1);