Theme manager

This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.

cockatrice/src/settingscache.cpp

@@ -13,11 +13,7 @@ SettingsCache::SettingsCache()
     cardDatabasePath = settings->value("paths/carddatabase").toString();
     tokenDatabasePath = settings->value("paths/tokendatabase").toString();
 
-    handBgPath = settings->value("zonebg/hand").toString();
-    stackBgPath = settings->value("zonebg/stack").toString();
-    tableBgPath = settings->value("zonebg/table").toString();
-    playerBgPath = settings->value("zonebg/playerarea").toString();
-    cardBackPicturePath = settings->value("paths/cardbackpicture").toString();
+    themeName = settings->value("theme/name").toString();
 
     // we only want to reset the cache once, then its up to the user
     bool updateCache = settings->value("revert/pixmapCacheSize", false).toBool();
@@ -148,39 +144,11 @@ void SettingsCache::setTokenDatabasePath(const QString &_tokenDatabasePath)
     emit tokenDatabasePathChanged();
 }
 
-void SettingsCache::setHandBgPath(const QString &_handBgPath)
+void SettingsCache::setThemeName(const QString &_themeName)
 {
-    handBgPath = _handBgPath;
-    settings->setValue("zonebg/hand", handBgPath);
-    emit handBgPathChanged();
-}
-
-void SettingsCache::setStackBgPath(const QString &_stackBgPath)
-{
-    stackBgPath = _stackBgPath;
-    settings->setValue("zonebg/stack", stackBgPath);
-    emit stackBgPathChanged();
-}
-
-void SettingsCache::setTableBgPath(const QString &_tableBgPath)
-{
-    tableBgPath = _tableBgPath;
-    settings->setValue("zonebg/table", tableBgPath);
-    emit tableBgPathChanged();
-}
-
-void SettingsCache::setPlayerBgPath(const QString &_playerBgPath)
-{
-    playerBgPath = _playerBgPath;
-    settings->setValue("zonebg/playerarea", playerBgPath);
-    emit playerBgPathChanged();
-}
-
-void SettingsCache::setCardBackPicturePath(const QString &_cardBackPicturePath)
-{
-    cardBackPicturePath = _cardBackPicturePath;
-    settings->setValue("paths/cardbackpicture", cardBackPicturePath);
-    emit cardBackPicturePathChanged();
+    themeName = _themeName;
+    settings->setValue("theme/name", themeName);
+    emit themeChanged();
 }
 
 void SettingsCache::setPicDownload(int _picDownload)

cockatrice/src/settingscache.h

@@ -21,11 +21,7 @@ signals:
     void picsPathChanged();
     void cardDatabasePathChanged();
     void tokenDatabasePathChanged();
-    void handBgPathChanged();
-    void stackBgPathChanged();
-    void tableBgPathChanged();
-    void playerBgPathChanged();
-    void cardBackPicturePathChanged();
+    void themeChanged();
     void picDownloadChanged();
     void picDownloadHqChanged();
     void displayCardNamesChanged();
@@ -45,8 +41,7 @@ private:
 
     QByteArray mainWindowGeometry;
     QString lang;
-    QString deckPath, replaysPath, picsPath, cardDatabasePath, tokenDatabasePath;
-    QString handBgPath, stackBgPath, tableBgPath, playerBgPath, cardBackPicturePath;
+    QString deckPath, replaysPath, picsPath, cardDatabasePath, tokenDatabasePath, themeName;
     bool picDownload;
     bool picDownloadHq;
     bool notificationsEnabled;
@@ -90,11 +85,7 @@ public:
     QString getPicsPath() const { return picsPath; }
     QString getCardDatabasePath() const { return cardDatabasePath; }
     QString getTokenDatabasePath() const { return tokenDatabasePath; }
-    QString getHandBgPath() const { return handBgPath; }
-    QString getStackBgPath() const { return stackBgPath; }
-    QString getTableBgPath() const { return tableBgPath; }
-    QString getPlayerBgPath() const { return playerBgPath; }
-    QString getCardBackPicturePath() const { return cardBackPicturePath; }
+    QString getThemeName() const { return themeName; }
     QString getChatMentionColor() const { return chatMentionColor; }
     bool getPicDownload() const { return picDownload; }
     bool getPicDownloadHq() const { return picDownloadHq; }
@@ -144,11 +135,7 @@ public slots:
     void setPicsPath(const QString &_picsPath);
     void setCardDatabasePath(const QString &_cardDatabasePath);
     void setTokenDatabasePath(const QString &_tokenDatabasePath);
-    void setHandBgPath(const QString &_handBgPath);
-    void setStackBgPath(const QString &_stackBgPath);
-    void setTableBgPath(const QString &_tableBgPath);
-    void setPlayerBgPath(const QString &_playerBgPath);
-    void setCardBackPicturePath(const QString &_cardBackPicturePath);
+    void setThemeName(const QString &_themeName);
     void setChatMentionColor(const QString &_chatMentionColor);
     void setPicDownload(int _picDownload);
     void setPicDownloadHq(int _picDownloadHq);

cockatrice/src/stackzone.cpp

@@ -3,6 +3,7 @@
 #include "arrowitem.h"
 #include "stackzone.h"
 #include "settingscache.h"
+#include "thememanager.h"
 #include "player.h"
 #include "carddragitem.h"
 #include "carditem.h"
@@ -12,16 +13,13 @@
 StackZone::StackZone(Player *_p, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_p, "stack", false, false, true, parent), zoneHeight(_zoneHeight)
 {
-    connect(settingsCache, SIGNAL(stackBgPathChanged()), this, SLOT(updateBgPixmap()));
-    updateBgPixmap();
+    connect(themeManager, SIGNAL(themeChanged()), this, SLOT(updateBg()));
+    updateBg();
     setCacheMode(DeviceCoordinateCache);
 }
 
-void StackZone::updateBgPixmap()
+void StackZone::updateBg()
 {
-    QString bgPath = settingsCache->getStackBgPath();
-    if (!bgPath.isEmpty())
-        bgPixmap.load(bgPath);
     update();
 }
 
@@ -48,10 +46,7 @@ QRectF StackZone::boundingRect() const
 
 void StackZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    if (bgPixmap.isNull())
-        painter->fillRect(boundingRect(), QColor(113, 43, 43));
-    else
-        painter->fillRect(boundingRect(), QBrush(bgPixmap));
+    painter->fillRect(boundingRect(), themeManager->getStackBgBrush());
 }
 
 void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &/*dropPoint*/)

cockatrice/src/stackzone.h

@@ -7,9 +7,8 @@ class StackZone : public SelectZone {
     Q_OBJECT
 private:
     qreal zoneHeight;
-    QPixmap bgPixmap;
 private slots:
-    void updateBgPixmap();
+    void updateBg();
 public:
     StackZone(Player *_p, int _zoneHeight, QGraphicsItem *parent = 0);
     void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);

cockatrice/src/tab_deck_editor.cpp

@@ -50,11 +50,11 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     : Tab(_tabSupervisor, parent), modified(false)
 {
     aClearSearch = new QAction(QString(), this);
-    aClearSearch->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
+    aClearSearch->setIcon(QIcon("theme:icon_clearsearch.svg"));
     connect(aClearSearch, SIGNAL(triggered()), this, SLOT(actClearSearch()));
     searchEdit = new SearchLineEdit;
 #if QT_VERSION >= 0x050300
-    searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition);
+    searchEdit->addAction(QIcon("theme:icon_search_black.svg"), QLineEdit::LeadingPosition);
 #endif
     searchEdit->setObjectName("searchEdit");
     
@@ -177,7 +177,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
 
     /* Update price
     aUpdatePrices = new QAction(QString(), this);
-    aUpdatePrices->setIcon(QIcon(":/resources/icon_update.png"));
+    aUpdatePrices->setIcon(QIcon("theme:icon_update.png"));
     connect(aUpdatePrices, SIGNAL(triggered()), this, SLOT(actUpdatePrices()));
     if (!settingsCache->getPriceTagFeature())
         aUpdatePrices->setVisible(false);
@@ -267,19 +267,19 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     addTabMenu(dbMenu);
 
     aAddCard = new QAction(QString(), this);
-    aAddCard->setIcon(QIcon(":/resources/arrow_right_green.svg"));
+    aAddCard->setIcon(QIcon("theme:arrow_right_green.svg"));
     connect(aAddCard, SIGNAL(triggered()), this, SLOT(actAddCard()));
     aAddCardToSideboard = new QAction(QString(), this);
-    aAddCardToSideboard->setIcon(QIcon(":/resources/add_to_sideboard.svg"));
+    aAddCardToSideboard->setIcon(QIcon("theme:add_to_sideboard.svg"));
     connect(aAddCardToSideboard, SIGNAL(triggered()), this, SLOT(actAddCardToSideboard()));
     aRemoveCard = new QAction(QString(), this);
-    aRemoveCard->setIcon(QIcon(":/resources/remove_row.svg"));
+    aRemoveCard->setIcon(QIcon("theme:remove_row.svg"));
     connect(aRemoveCard, SIGNAL(triggered()), this, SLOT(actRemoveCard()));
     aIncrement = new QAction(QString(), this);
-    aIncrement->setIcon(QIcon(":/resources/increment.svg"));
+    aIncrement->setIcon(QIcon("theme:increment.svg"));
     connect(aIncrement, SIGNAL(triggered()), this, SLOT(actIncrement()));
     aDecrement = new QAction(QString(), this);
-    aDecrement->setIcon(QIcon(":/resources/decrement.svg"));
+    aDecrement->setIcon(QIcon("theme:decrement.svg"));
     connect(aDecrement, SIGNAL(triggered()), this, SLOT(actDecrement()));
 
     deckEditToolBar->addAction(aAddCard);

cockatrice/src/tab_deck_storage.cpp

@@ -80,25 +80,25 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_c
     hbox->addWidget(rightGroupBox);
     
     aOpenLocalDeck = new QAction(this);
-    aOpenLocalDeck->setIcon(QIcon(":/resources/pencil.svg"));
+    aOpenLocalDeck->setIcon(QIcon("theme:pencil.svg"));
     connect(aOpenLocalDeck, SIGNAL(triggered()), this, SLOT(actOpenLocalDeck()));
     aUpload = new QAction(this);
-    aUpload->setIcon(QIcon(":/resources/arrow_right_green.svg"));
+    aUpload->setIcon(QIcon("theme:arrow_right_green.svg"));
     connect(aUpload, SIGNAL(triggered()), this, SLOT(actUpload()));
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(QIcon(":/resources/remove_row.svg"));
+    aDeleteLocalDeck->setIcon(QIcon("theme:remove_row.svg"));
     connect(aDeleteLocalDeck, SIGNAL(triggered()), this, SLOT(actDeleteLocalDeck()));
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(QIcon(":/resources/pencil.svg"));
+    aOpenRemoteDeck->setIcon(QIcon("theme:pencil.svg"));
     connect(aOpenRemoteDeck, SIGNAL(triggered()), this, SLOT(actOpenRemoteDeck()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon(":/resources/arrow_left_green.svg"));
+    aDownload->setIcon(QIcon("theme:arrow_left_green.svg"));
     connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload()));
     aNewFolder = new QAction(this);
     aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewFolder, SIGNAL(triggered()), this, SLOT(actNewFolder()));
     aDeleteRemoteDeck = new QAction(this);
-    aDeleteRemoteDeck->setIcon(QIcon(":/resources/remove_row.svg"));
+    aDeleteRemoteDeck->setIcon(QIcon("theme:remove_row.svg"));
     connect(aDeleteRemoteDeck, SIGNAL(triggered()), this, SLOT(actDeleteRemoteDeck()));
     
     leftToolBar->addAction(aOpenLocalDeck);

cockatrice/src/tab_game.cpp

@@ -304,17 +304,17 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     
     replayStartButton = new QToolButton;
     replayStartButton->setIconSize(QSize(32, 32));
-    replayStartButton->setIcon(QIcon(":/resources/replay_start.svg"));
+    replayStartButton->setIcon(QIcon("theme:replay_start.svg"));
     connect(replayStartButton, SIGNAL(clicked()), this, SLOT(replayStartButtonClicked()));
     replayPauseButton = new QToolButton;
     replayPauseButton->setIconSize(QSize(32, 32));
     replayPauseButton->setEnabled(false);
-    replayPauseButton->setIcon(QIcon(":/resources/replay_pause.svg"));
+    replayPauseButton->setIcon(QIcon("theme:replay_pause.svg"));
     connect(replayPauseButton, SIGNAL(clicked()), this, SLOT(replayPauseButtonClicked()));
     replayFastForwardButton = new QToolButton;
     replayFastForwardButton->setIconSize(QSize(32, 32));
     replayFastForwardButton->setEnabled(false);
-    replayFastForwardButton->setIcon(QIcon(":/resources/replay_fastforward.svg"));
+    replayFastForwardButton->setIcon(QIcon("theme:replay_fastforward.svg"));
     replayFastForwardButton->setCheckable(true);
     connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool)));
     

cockatrice/src/tab_replays.cpp

@@ -78,22 +78,22 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     hbox->addWidget(rightGroupBox);
     
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(QIcon(":/resources/icon_view.svg"));
+    aOpenLocalReplay->setIcon(QIcon("theme:icon_view.svg"));
     connect(aOpenLocalReplay, SIGNAL(triggered()), this, SLOT(actOpenLocalReplay()));
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(QIcon(":/resources/remove_row.svg"));
+    aDeleteLocalReplay->setIcon(QIcon("theme:remove_row.svg"));
     connect(aDeleteLocalReplay, SIGNAL(triggered()), this, SLOT(actDeleteLocalReplay()));
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(QIcon(":/resources/icon_view.svg"));
+    aOpenRemoteReplay->setIcon(QIcon("theme:icon_view.svg"));
     connect(aOpenRemoteReplay, SIGNAL(triggered()), this, SLOT(actOpenRemoteReplay()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon(":/resources/arrow_left_green.svg"));
+    aDownload->setIcon(QIcon("theme:arrow_left_green.svg"));
     connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload()));
     aKeep = new QAction(this);
-    aKeep->setIcon(QIcon(":/resources/lock.svg"));
+    aKeep->setIcon(QIcon("theme:lock.svg"));
     connect(aKeep, SIGNAL(triggered()), this, SLOT(actKeepRemoteReplay()));
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(QIcon(":/resources/remove_row.svg"));
+    aDeleteRemoteReplay->setIcon(QIcon("theme:remove_row.svg"));
     connect(aDeleteRemoteReplay, SIGNAL(triggered()), this, SLOT(actDeleteRemoteReplay()));
     
     leftToolBar->addAction(aOpenLocalReplay);

cockatrice/src/tab_room.cpp

@@ -68,7 +68,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     connect(aOpenChatSettings, SIGNAL(triggered()), this, SLOT(actOpenChatSettings()));
 
     QToolButton *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(QIcon(":/resources/icon_settings.svg"));
+    chatSettingsButton->setIcon(QIcon("theme:icon_settings.svg"));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 

cockatrice/src/tab_supervisor.cpp

@@ -79,7 +79,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
 TabSupervisor::TabSupervisor(AbstractClient *_client, QWidget *parent)
     : QTabWidget(parent), userInfo(0), client(_client), tabServer(0), tabUserLists(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0)
 {
-    tabChangedIcon = new QIcon(":/resources/icon_tab_changed.svg");
+    tabChangedIcon = new QIcon("theme:icon_tab_changed.svg");
     setElideMode(Qt::ElideRight);
     setMovable(true);
     setIconSize(QSize(15, 15));

cockatrice/src/tablezone.cpp

@@ -8,6 +8,7 @@
 #include "tablezone.h"
 #include "player.h"
 #include "settingscache.h"
+#include "thememanager.h"
 #include "arrowitem.h"
 #include "carddragitem.h"
 #include "carddatabase.h"
@@ -16,20 +17,18 @@
 #include "pb/command_move_card.pb.h"
 #include "pb/command_set_card_attr.pb.h"
 
-
 const QColor TableZone::BACKGROUND_COLOR    = QColor(100, 100, 100);
 const QColor TableZone::FADE_MASK           = QColor(0, 0, 0, 80);
 const QColor TableZone::GRADIENT_COLOR      = QColor(255, 255, 255, 150);
 const QColor TableZone::GRADIENT_COLORLESS  = QColor(255, 255, 255, 0);
 
-
 TableZone::TableZone(Player *_p, QGraphicsItem *parent)
     : SelectZone(_p, "table", true, false, true, parent), active(false)
 {
-    connect(settingsCache, SIGNAL(tableBgPathChanged()), this, SLOT(updateBgPixmap()));
+    connect(themeManager, SIGNAL(themeChanged()), this, SLOT(updateBg()));
     connect(settingsCache, SIGNAL(invertVerticalCoordinateChanged()), this, SLOT(reorganizeCards()));
 
-    updateBgPixmap();
+    updateBg();
 
     height = 2 * BOX_LINE_WIDTH + 3 * (CARD_HEIGHT + 20) + 2 * PADDING_Y;
     width = MIN_WIDTH + 2 * MARGIN_X + 2 * BOX_LINE_WIDTH;
@@ -44,11 +43,8 @@ TableZone::TableZone(Player *_p, QGraphicsItem *parent)
 }
 
 
-void TableZone::updateBgPixmap()
+void TableZone::updateBg()
 {
-    QString bgPath = settingsCache->getTableBgPath();
-    if (!bgPath.isEmpty())
-        backgroundPixelMap.load(bgPath);
     update();
 }
 
@@ -67,11 +63,7 @@ bool TableZone::isInverted() const
 
 void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    // if no custom background is provided then use the default color
-    if (backgroundPixelMap.isNull())
-        painter->fillRect(boundingRect(), BACKGROUND_COLOR);
-    else
-        painter->fillRect(boundingRect(), QBrush(backgroundPixelMap));
+    painter->fillRect(boundingRect(), themeManager->getTableBgBrush());
 
     if (active) {
         paintZoneOutline(painter);

cockatrice/src/tablezone.h

@@ -27,7 +27,7 @@ private:
     static const int MIN_WIDTH = 15 * CARD_WIDTH / 2;
     
     /*
-    Default background color, inactive mask and boarder gradient 
+    Default inactive mask and border gradient
     */
     static const QColor BACKGROUND_COLOR;
     static const QColor FADE_MASK;
@@ -42,11 +42,6 @@ private:
     int height;
     int currentMinimumWidth;
 
-    /*
-       Holds any custom background image for the TableZone
-     */
-    QPixmap backgroundPixelMap;
-
     /*
        If this TableZone is currently active
      */
@@ -58,7 +53,7 @@ private slots:
     /**
        Loads in any found custom background and updates
      */
-    void updateBgPixmap();
+    void updateBg();
 
 public slots:
     /**

cockatrice/src/thememanager.cpp

+#include "thememanager.h"
+#include "settingscache.h"
+#include <QApplication>
+#include <QDebug>
+#include <QColor>
+#include <QLibraryInfo>
+#if QT_VERSION < 0x050000
+    #include <QDesktopServices>
+#else
+    #include <QStandardPaths>
+#endif
+
+#define DEFAULT_THEME_NAME "Default"
+#define STYLE_CSS_NAME "style.css"
+#define HANDZONE_BG_NAME "handzone"
+#define PLAYERZONE_BG_NAME "playerzone"
+#define STACKZONE_BG_NAME "stackzone"
+#define TABLEZONE_BG_NAME "tablezone"
+#define CARD_BACK_NAME "cardback"
+
+ThemeManager::ThemeManager(QObject *parent)
+    :QObject(parent)
+{
+    ensureThemeDirectoryExists();
+    connect(settingsCache, SIGNAL(themeChanged()), this, SLOT(themeChangedSlot()));
+    themeChangedSlot();
+}
+
+void ThemeManager::ensureThemeDirectoryExists()
+{
+    if(settingsCache->getThemeName().isEmpty() ||
+        !getAvailableThemes().contains(settingsCache->getThemeName()))
+    {
+        qDebug() << "Theme name not set, setting default value";
+        settingsCache->setThemeName(DEFAULT_THEME_NAME);
+    }
+}
+
+QStringMap & ThemeManager::getAvailableThemes()
+{
+    QDir dir;
+    availableThemes.clear();
+
+    // load themes from user profile dir
+    dir =
+#if QT_VERSION < 0x050000
+        QDesktopServices::storageLocation(QDesktopServices::DataLocation) +
+#else
+        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first() +
+#endif
+        "/themes";
+
+    foreach(QString themeName, dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name))
+    {
+        if(!availableThemes.contains(themeName))
+            availableThemes.insert(themeName, dir.absoluteFilePath(themeName));
+    }
+
+    // load themes from cockatrice system dir
+#ifdef Q_OS_MAC
+    dir = qApp->applicationDirPath() + "/../Resources/themes";
+#elif defined(Q_OS_WIN)
+    dir = qApp->applicationDirPath() + "/themes";
+#else // linux
+    dir = qApp->applicationDirPath() + "/../share/cockatrice/themes";
+#endif
+    foreach(QString themeName, dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name))
+    {
+        if(!availableThemes.contains(themeName))
+            availableThemes.insert(themeName, dir.absoluteFilePath(themeName));
+    }
+
+    return availableThemes;
+}
+
+QBrush ThemeManager::loadBrush(QDir dir, QString fileName, QColor fallbackColor)
+{
+    QBrush brush;
+    QPixmap tmp;
+    QStringList exts;
+    exts << ".png" << ".jpg" << ".jpeg" << ".gif" << ".bmp";
+
+    brush.setColor(fallbackColor);
+    brush.setStyle(Qt::SolidPattern);
+
+    foreach (const QString &ext, exts) {
+        if (dir.exists(fileName + ext)) {
+            tmp.load(dir.absoluteFilePath(fileName + ext));
+            if(!tmp.isNull())
+                brush.setTexture(tmp);
+            break;
+        }
+    }
+
+    return brush;
+}
+
+QPixmap ThemeManager::loadPixmap(QDir dir, QString fileName)
+{
+    QPixmap pix;
+    QStringList exts;
+    exts << ".png" << ".jpg" << ".jpeg" << ".gif" << ".bmp";
+
+    foreach (const QString &ext, exts) {
+        if (dir.exists(fileName + ext)) {
+            pix.load(dir.absoluteFilePath(fileName + ext));
+            break;
+        }
+    }
+
+    return pix;
+}
+
+void ThemeManager::themeChangedSlot()
+{
+    QString themeName = settingsCache->getThemeName();
+    qDebug() << "Theme changed:" << themeName;
+
+    QDir dir = getAvailableThemes().value(themeName);
+
+    // css
+    if(dir.exists(STYLE_CSS_NAME))
+
+        qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME));
+    else
+        qApp->setStyleSheet("");
+
+    // card background
+    cardBackPixmap = loadPixmap(dir, CARD_BACK_NAME);
+
+    // zones bg
+    dir.cd("zones");
+    handBgBrush = loadBrush(dir, HANDZONE_BG_NAME, QColor(80, 100, 50));
+    tableBgBrush = loadBrush(dir, TABLEZONE_BG_NAME, QColor(70, 50, 100));
+    playerBgBrush = loadBrush(dir, PLAYERZONE_BG_NAME, QColor(200, 200, 200));
+    stackBgBrush = loadBrush(dir, STACKZONE_BG_NAME, QColor(113, 43, 43));
+
+    // resources
+    QStringList resources;
+    resources << dir.absolutePath() << ":/resources";
+    QDir::setSearchPaths("theme", resources);
+
+    emit themeChanged();
+}
\ No newline at end of file

cockatrice/src/thememanager.h

+#ifndef THEMEMANAGER_H
+#define THEMEMANAGER_H
+
+#include <QObject>
+#include <QBrush>
+#include <QPixmap>
+#include <QMap>
+#include <QDir>
+#include <QString>
+
+typedef QMap<QString, QString> QStringMap;
+
+class QApplication;
+
+class ThemeManager : public QObject {
+    Q_OBJECT
+public:
+    ThemeManager(QObject *parent = 0);
+private:
+    QBrush handBgBrush, stackBgBrush, tableBgBrush, playerBgBrush;
+    QPixmap cardBackPixmap;
+    QStringMap availableThemes;
+protected:
+    void ensureThemeDirectoryExists();
+    QBrush loadBrush(QDir dir, QString fileName, QColor fallbackColor);
+    QPixmap loadPixmap(QDir dir, QString fileName);
+public:
+    QBrush &getHandBgBrush() { return handBgBrush; }
+    QBrush &getStackBgBrush() { return stackBgBrush; }
+    QBrush &getTableBgBrush() { return tableBgBrush; }
+    QBrush &getPlayerBgBrush() { return playerBgBrush; }
+    QPixmap &getCardBackPixmap() { return cardBackPixmap; }
+    QStringMap &getAvailableThemes();
+protected slots:
+    void themeChangedSlot();
+signals:
+    void themeChanged();
+};
+
+extern ThemeManager * themeManager;
+
+#endif

cockatrice/src/window_main.cpp

@@ -454,7 +454,7 @@ void MainWindow::createTrayIcon() {
     
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
-    trayIcon->setIcon(QIcon(":/resources/appicon.svg"));
+    trayIcon->setIcon(QIcon("theme:appicon.svg"));
     trayIcon->show();
 
     connect(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this,

cockatrice/src/window_sets.cpp

@@ -24,28 +24,28 @@ WndSets::WndSets(QWidget *parent)
     setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     aTop = new QAction(QString(), this);
-    aTop->setIcon(QIcon(":/resources/arrow_top_green.svg"));
+    aTop->setIcon(QIcon("theme:arrow_top_green.svg"));
     aTop->setToolTip(tr("Move selected set to top"));
     aTop->setEnabled(false);
     connect(aTop, SIGNAL(triggered()), this, SLOT(actTop()));
     setsEditToolBar->addAction(aTop);
 
     aUp = new QAction(QString(), this);
-    aUp->setIcon(QIcon(":/resources/arrow_up_green.svg"));
+    aUp->setIcon(QIcon("theme:arrow_up_green.svg"));
     aUp->setToolTip(tr("Move selected set up"));
     aUp->setEnabled(false);
     connect(aUp, SIGNAL(triggered()), this, SLOT(actUp()));
     setsEditToolBar->addAction(aUp);
 
     aDown = new QAction(QString(), this);
-    aDown->setIcon(QIcon(":/resources/arrow_down_green.svg"));
+    aDown->setIcon(QIcon("theme:arrow_down_green.svg"));
     aDown->setToolTip(tr("Move selected set down"));
     aDown->setEnabled(false);
     connect(aDown, SIGNAL(triggered()), this, SLOT(actDown()));
     setsEditToolBar->addAction(aDown);
 
     aBottom = new QAction(QString(), this);
-    aBottom->setIcon(QIcon(":/resources/arrow_bottom_green.svg"));
+    aBottom->setIcon(QIcon("theme:arrow_bottom_green.svg"));
     aBottom->setToolTip(tr("Move selected set to bottom"));
     aBottom->setEnabled(false);
     connect(aBottom, SIGNAL(triggered()), this, SLOT(actBottom()));

cockatrice/src/zoneviewwidget.cpp

@@ -250,5 +250,5 @@ void ZoneViewWidget::zoneDeleted()
 void ZoneViewWidget::initStyleOption(QStyleOption *option) const {
     QStyleOptionTitleBar *titleBar = qstyleoption_cast<QStyleOptionTitleBar *>(option);
     if (titleBar)
-        titleBar->icon = QIcon(":/resources/appicon.svg");
+        titleBar->icon = QIcon("theme:appicon.svg");
 }

oracle/CMakeLists.txt

@@ -13,6 +13,7 @@ SET(oracle_SOURCES
     src/oracleimporter.cpp
     ../cockatrice/src/carddatabase.cpp
     ../cockatrice/src/settingscache.cpp
+    ../cockatrice/src/thememanager.cpp 
     ../cockatrice/src/qt-json/json.cpp
  )
 

oracle/src/main.cpp

@@ -7,9 +7,11 @@
 #include "main.h"
 #include "oraclewizard.h"
 #include "settingscache.h"
+#include "thememanager.h"
 
 QTranslator *translator, *qtTranslator;
 SettingsCache *settingsCache;
+ThemeManager *themeManager;
 
 const QString translationPrefix = "oracle";
 #ifdef TRANSLATION_PATH
@@ -51,6 +53,7 @@ int main(int argc, char *argv[])
     }
 
 	settingsCache = new SettingsCache;
+    themeManager = new ThemeManager;
 
     qtTranslator = new QTranslator;
     translator = new QTranslator;

themes/CMakeLists.txt

+# CMakeLists for themes directory
+#
+# add themes subfolders
+
+SET(defthemes
+    Default
+    Fabric
+    Leather
+    Plasma
+    VelvetMarble
+)
+
+if(UNIX)
+    if(APPLE)
+        INSTALL(DIRECTORY ${defthemes} DESTINATION cockatrice.app/Contents/Resources/themes/)
+    else()
+        # Assume linux
+        INSTALL(DIRECTORY ${defthemes} DESTINATION share/cockatrice/themes/)
+    endif()
+elseif(WIN32)
+    INSTALL(DIRECTORY ${defthemes} DESTINATION themes/)
+endif()