Move stylesheets into $datadir/stylesheets; add m4yer's "classic" style

[quassel.git] / src / uisupport / uistyle.cpp

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 12c3889..41c50a6 100644 (file)
--- 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,14 +102,9 @@ 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();
 
     styleSheet = styleSheet.trimmed();
@@ -354,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
@@ -398,6 +393,10 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
       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;
@@ -457,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;
       }
@@ -553,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()) {
@@ -615,6 +615,35 @@ void UiStyle::StyledMessage::style() const {
     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);
   }
@@ -681,6 +710,10 @@ QString UiStyle::StyledMessage::decoratedSender() const {
       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());
   }