CSS-loader refactored for ease of maintenance

src/qt/bitcoingui.cpp

@@ -33,7 +33,6 @@
 #include <QDateTime>
 #include <QDesktopWidget>
 #include <QDragEnterEvent>
-#include <QFile>
 #include <QIcon>
 #include <QLabel>
 #include <QListWidget>
@@ -73,17 +72,8 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
     spinnerFrame(0)
 {
     /* Open CSS when configured */
-    QSettings settings;
-    QString theme = settings.value("theme", "").toString();
-    if(!theme.isEmpty()){
-    // QFile qFile(":/css/drkblue");
-        QFile qFile(theme); // for development only
-        if (qFile.open(QFile::ReadOnly)) {
-            QString styleSheet = QLatin1String(qFile.readAll());
-            this->setStyleSheet(styleSheet);
-        }
-    }
-    
+    this->setStyleSheet(GUIUtil::loadStyleSheet());
+
     GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
 
     QString windowTitle = tr("Darkcoin Core") + " - ";

src/qt/coincontroldialog.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QCursor>
 #include <QDialogButtonBox>
-#include <QFile>
 #include <QFlags>
 #include <QIcon>
 #include <QSettings>
@@ -42,16 +41,7 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) :
     ui->setupUi(this);
     
     /* Open CSS when configured */
-    QSettings settings;
-    QString theme = settings.value("theme", "").toString();
-    if(!theme.isEmpty()){
-    // QFile qFile(":/css/drkblue");
-        QFile qFile(theme); // for development only
-        if (qFile.open(QFile::ReadOnly)) {
-            QString styleSheet = QLatin1String(qFile.readAll());
-            this->setStyleSheet(styleSheet);
-        }
-    }
+    this->setStyleSheet(GUIUtil::loadStyleSheet());
 
     // context menu actions
     QAction *copyAddressAction = new QAction(tr("Copy address"), this);

src/qt/guiutil.cpp

@@ -763,6 +763,23 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
     parent->move(pos);
 }
 
+// Open CSS when configured
+QString loadStyleSheet()
+{
+    QString styleSheet;
+    QSettings settings;
+    QString theme = settings.value("theme", "").toString();
+
+    if(!theme.isEmpty()){
+    // QFile qFile(":/css/drkblue");
+        QFile qFile(theme); // for development only
+        if (qFile.open(QFile::ReadOnly)) {
+            styleSheet = QLatin1String(qFile.readAll());
+        }
+    }
+    return styleSheet;
+}
+
 void setClipboard(const QString& str)
 {
     QApplication::clipboard()->setText(str, QClipboard::Clipboard);

src/qt/guiutil.h

@@ -176,6 +176,9 @@ namespace GUIUtil
     /** Restore window size and position */
     void restoreWindowGeometry(const QString& strSetting, const QSize &defaultSizeIn, QWidget *parent);
 
+    /** Load global CSS theme */
+    QString loadStyleSheet();
+    
     /* Convert QString to OS specific boost path through UTF-8 */
     boost::filesystem::path qstringToBoostPath(const QString &path);
 

src/qt/transactiondescdialog.cpp

@@ -2,13 +2,13 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "guiutil.h"
 #include "transactiondescdialog.h"
 #include "ui_transactiondescdialog.h"
 
 #include "transactiontablemodel.h"
 
 #include <QModelIndex>
-#include <QFile>
 #include <QSettings>
 #include <QString>
 
@@ -19,16 +19,7 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
     ui->setupUi(this);
 
     /* Open CSS when configured */
-    QSettings settings;
-    QString theme = settings.value("theme", "").toString();
-    if(!theme.isEmpty()){
-    // QFile qFile(":/css/drkblue");
-        QFile qFile(theme); // for development only
-        if (qFile.open(QFile::ReadOnly)) {
-            QString styleSheet = QLatin1String(qFile.readAll());
-            this->setStyleSheet(styleSheet);
-        }
-    }
+    this->setStyleSheet(GUIUtil::loadStyleSheet());
 
     QString desc = idx.data(TransactionTableModel::LongDescriptionRole).toString();
     ui->detailText->setHtml(desc);