X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=5ad89f08a8c26506fdf238e198c67090da65f676;hb=c639f2b13b485c0d158ee3857742eaf4d1fa4760;hp=b5e8911b15ff8d6cfafe63ffb772ae2bbf72df4a;hpb=2b5d210cb6e61a25a6a9d0c119aec025322b3b84;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index b5e8911b..5ad89f08 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -27,7 +27,7 @@
 
 QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
 
-UiStyle::UiStyle() {
+UiStyle::UiStyle(QObject *parent) : QObject(parent) {
   // register FormatList if that hasn't happened yet
   // FIXME I don't think this actually avoids double registration... then again... does it hurt?
   if(QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) {
@@ -56,6 +56,52 @@ UiStyle::~ UiStyle() {
   qDeleteAll(_metricsCache);
 }
 
+void UiStyle::loadStyleSheet() {
+  qDeleteAll(_metricsCache);
+  _metricsCache.clear();
+  _formatCache.clear();
+
+  QString styleSheet;
+
+  styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss"));
+  styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "custom.qss");
+  // styleSheet += loadStyleSheet("file:///" + some custom file name);  FIXME
+  styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true);
+
+  if(styleSheet.isEmpty())
+    return;
+
+  QssParser parser;
+  parser.processStyleSheet(styleSheet);
+  QApplication::setPalette(parser.palette());
+  _formatCache = parser.formats();
+
+  qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+
+  emit changed();
+}
+
+QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) {
+  QString ss = styleSheet;
+  if(ss.startsWith("file:///")) {
+    ss.remove(0, 8);
+    if(ss.isEmpty())
+      return QString();
+
+    QFile file(ss);
+    if(file.open(QFile::ReadOnly)) {
+      QTextStream stream(&file);
+      ss = stream.readAll();
+      file.close();
+    } else {
+      if(shouldExist)
+        qWarning() << "Could not open stylesheet file:" << file.fileName();
+      return QString();
+    }
+  }
+  return ss;
+}
+
 QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
   return _formatCache.value(key, QTextCharFormat());
 }
@@ -73,14 +119,14 @@ void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint32
   quint64 key = ftype | ((quint64)label << 32);
 
   // start with the most general format and then specialize
-  fmt.merge(cachedFormat(key & 0x00000000fffffff0));  // basic subelement format
-  fmt.merge(cachedFormat(key & 0x00000000ffffffff));  // subelement + msgtype
-  fmt.merge(cachedFormat(key & 0xffff0000fffffff0));  // subelement + nickhash
-  fmt.merge(cachedFormat(key & 0xffff0000ffffffff));  // subelement + nickhash + msgtype
-  fmt.merge(cachedFormat(key & 0x0000fffffffffff0));  // label + subelement
-  fmt.merge(cachedFormat(key & 0x0000ffffffffffff));  // label + subelement + msgtype
-  fmt.merge(cachedFormat(key & 0xfffffffffffffff0));  // label + subelement + nickhash
-  fmt.merge(cachedFormat(key & 0xffffffffffffffff));  // label + subelement + nickhash + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000fffffff0)));  // basic subelement format
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000ffffffff)));  // subelement + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000fffffff0)));  // subelement + nickhash
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000ffffffff)));  // subelement + nickhash + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000fffffffffff0)));  // label + subelement
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff)));  // label + subelement + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xfffffffffffffff0)));  // label + subelement + nickhash
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff)));  // label + subelement + nickhash + msgtype
 }
 
 // NOTE: This function is intimately tied to the values in FormatType. Don't change this
@@ -96,14 +142,14 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label) {
   if(fmt.properties().count())
     return fmt;
 
-  fmt.merge(cachedFormat(key & 0x0000000000000000));  // basic
-  fmt.merge(cachedFormat(key & 0x000000000000000f));  // msgtype
-  fmt.merge(cachedFormat(key & 0xffff000000000000));  // nickhash
-  fmt.merge(cachedFormat(key & 0xffff00000000000f));  // nickhash + msgtype
-  fmt.merge(cachedFormat(key & 0x0000ffff00000000));  // label
-  fmt.merge(cachedFormat(key & 0x0000ffff0000000f));  // label + msgtype
-  fmt.merge(cachedFormat(key & 0xffffffff00000000));  // label + nickhash
-  fmt.merge(cachedFormat(key & 0xffffffff0000000f));  // label + nickhash + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000000000000000)));  // basic
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x000000000000000f)));  // msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff000000000000)));  // nickhash
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff00000000000f)));  // nickhash + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff00000000)));  // label
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff0000000f)));  // label + msgtype
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff00000000)));  // label + nickhash
+  fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff0000000f)));  // label + nickhash + msgtype
 
   // TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic"
   //       or "foreground 01 and background 03"
@@ -543,19 +589,3 @@ QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList) {
   }
   return in;
 }
-
-/***********************************************************************************/
-// Stylesheet handling
-/***********************************************************************************/
-
-void UiStyle::loadStyleSheet() {
-  QssParser parser;
-  parser.loadStyleSheet(qApp->styleSheet());
-
-  // TODO handle results
-  QApplication::setPalette(parser.palette());
-
-  qDeleteAll(_metricsCache);
-  _metricsCache.clear();
-  _formatCache = parser.formats();
-}