Add configuration option for a custom stylesheet

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

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 4e496f2..332344c 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -26,6 +26,7 @@
 #include "util.h"
 
 QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
+QString UiStyle::_timestampFormatString;
 
 UiStyle::UiStyle(QObject *parent) : QObject(parent) {
   // register FormatList if that hasn't happened yet
@@ -49,10 +50,11 @@ UiStyle::UiStyle(QObject *parent) : QObject(parent) {
   _formatCodes["%DM"] = ModeFlags;
   _formatCodes["%DU"] = Url;
 
+  setTimestampFormatString("[hh:mm:ss]");
   loadStyleSheet();
 }
 
-UiStyle::~ UiStyle() {
+UiStyle::~UiStyle() {
   qDeleteAll(_metricsCache);
 }
 
@@ -61,11 +63,13 @@ void UiStyle::loadStyleSheet() {
   _metricsCache.clear();
   _formatCache.clear();
 
-  QString styleSheet;
+  UiStyleSettings s;
 
+  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::configDirPath() + "settings.qss");
+  if(s.value("UseCustomStyleSheet", false).toBool())
+    styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
   styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true);
 
   if(styleSheet.isEmpty())
@@ -102,6 +106,13 @@ QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) {
   return ss;
 }
 
+void UiStyle::setTimestampFormatString(const QString &format) {
+  if(_timestampFormatString != format) {
+    _timestampFormatString = format;
+    // FIXME reload
+  }
+}
+
 /******** Caching *******/
 
 QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
@@ -452,7 +463,7 @@ const UiStyle::FormatList &UiStyle::StyledMessage::contentsFormatList() const {
 }
 
 QString UiStyle::StyledMessage::decoratedTimestamp() const {
-  return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
+  return timestamp().toLocalTime().toString(UiStyle::timestampFormatString());
 }
 
 QString UiStyle::StyledMessage::plainSender() const {