X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=332344c03b206a009a76efac5da40a8ca2f60a6b;hp=62c7a0e276dbc0f37fc880ebe7d4ea4ca62d5401;hb=9fb25d34cfc4dee02159b112c72e018c6e26e63f;hpb=8bd4f0d095891cc992ec7dd006a7bf2c6601787d

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 62c7a0e2..332344c0 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -54,7 +54,7 @@ UiStyle::UiStyle(QObject *parent) : QObject(parent) {
   loadStyleSheet();
 }
 
-UiStyle::~ UiStyle() {
+UiStyle::~UiStyle() {
   qDeleteAll(_metricsCache);
 }
 
@@ -63,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())