Add theme-manager and qt-material themes

client/main.cpp

@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 #include "params.h"
 #include "preferences.h"
 #include "settings.h"
+#include "thememanager.h"
 
 #include <QApplication>
 #include <QDateTime>
@@ -84,6 +85,8 @@ int main(int argc, char* argv[])
         appSettings->value(kDiffPathKey, kDiffPathDefaultValue).toString(),
         appSettings->value(kAwkPathKey, kAwkPathDefaultValue).toString());
 
+    ThemeManager::instance()->setTheme(appSettings->value(kThemeKey).toString());
+
     qsrand(QDateTime::currentDateTime().toTime_t());
 
     mainWindow = new MainWindow;

client/ostinato.pro

@@ -128,6 +128,7 @@ SOURCES += \
     streamstatsmodel.cpp \
     streamstatswindow.cpp \
     streamswidget.cpp \
+    thememanager.cpp \
     variablefieldswidget.cpp
 
 

client/preferences.cpp

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 #include "../common/ostprotolib.h"
 #include "settings.h"
+#include "thememanager.h"
 
 #include <QFileDialog>
 #include <QtGlobal>
@@ -40,6 +41,7 @@ Preferences::Preferences()
 
     setupUi(this);
 
+    // Program paths
     wiresharkPathEdit->setText(appSettings->value(kWiresharkPathKey, 
             kWiresharkPathDefaultValue).toString());
     tsharkPathEdit->setText(appSettings->value(kTsharkPathKey, 
@@ -51,6 +53,10 @@ Preferences::Preferences()
     awkPathEdit->setText(appSettings->value(kAwkPathKey, 
             kAwkPathDefaultValue).toString());
 
+    // Theme
+    theme->addItems(ThemeManager::instance()->themeList());
+    theme->setCurrentText(appSettings->value(kThemeKey).toString());
+
     // TODO(only if required): kUserKey
 }
 
@@ -78,6 +84,7 @@ void Preferences::initDefaults()
 
 void Preferences::accept()
 {
+    // Program paths
     appSettings->setValue(kWiresharkPathKey, wiresharkPathEdit->text());
     appSettings->setValue(kTsharkPathKey, tsharkPathEdit->text());
     appSettings->setValue(kGzipPathKey, gzipPathEdit->text());
@@ -90,6 +97,9 @@ void Preferences::accept()
         appSettings->value(kDiffPathKey, kDiffPathDefaultValue).toString(),
         appSettings->value(kAwkPathKey, kAwkPathDefaultValue).toString());
 
+    // Theme
+    ThemeManager::instance()->setTheme(theme->currentText());
+
     QDialog::accept();
 }
 

client/preferences.ui

@@ -163,6 +163,20 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Theme (Experimental)</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="theme"/>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">

client/settings.h

@@ -74,6 +74,8 @@ const QString kAwkPathDefaultValue("/usr/bin/awk");
 const QString kAwkPathDefaultValue("/usr/bin/awk");
 #endif
 
+const QString kThemeKey("Theme");
+
 const QString kUserKey("User");
 extern QString kUserDefaultValue;
 

client/thememanager.cpp

@@ -0,0 +1,108 @@
+/*
+Copyright (C) 2021 Srivats P.
+
+This file is part of "Ostinato"
+
+This is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include "thememanager.h"
+
+#include "settings.h"
+
+#include <QApplication>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QResource>
+
+ThemeManager *ThemeManager::instance_{nullptr};
+
+ThemeManager::ThemeManager()
+{
+#ifdef Q_OS_WIN32
+    themeDir_ = QCoreApplication::applicationDirPath() + "/themes/";
+#elif Q_OS_MAC
+    // TODO
+#else
+    // TODO
+#endif
+}
+
+QStringList ThemeManager::themeList()
+{
+    QDir themeDir(themeDir_);
+
+    themeDir.setFilter(QDir::Files);
+    themeDir.setNameFilters(QStringList() << "*.qss");
+    themeDir.setSorting(QDir::Name);
+
+    QStringList themes = themeDir.entryList();
+    for (QString& theme : themes)
+        theme.remove(".qss");
+    themes.prepend("default");
+
+    return themes;
+}
+
+void ThemeManager::setTheme(QString theme)
+{
+    // Remove current theme, if we have one
+    QString oldTheme = appSettings->value(kThemeKey).toString();
+    if (!oldTheme.isEmpty()) {
+        // Remove stylesheet first so that there are
+        // no references to resources when unregistering 'em
+        qApp->setStyleSheet("");
+        QString rccFile = themeDir_ + oldTheme + ".rcc";
+        if (QResource::unregisterResource(rccFile)) {
+            qDebug("Unable to unregister theme rccFile %s",
+                   qPrintable(rccFile));
+        }
+        appSettings->setValue(kThemeKey, QVariant());
+    }
+
+    if (theme.isEmpty() || (theme == "default"))
+        return;
+
+    // Apply new theme
+    QFile qssFile(themeDir_ + theme + ".qss");
+    if (!qssFile.open(QFile::ReadOnly)) {
+        qDebug("Unable to open theme qssFile %s",
+               qPrintable(qssFile.fileName()));
+        return;
+    }
+
+    // Register theme resource before applying theme style sheet
+    QString rccFile = themeDir_ + theme + ".rcc";
+    if (!QResource::registerResource(rccFile))
+        qDebug("Unable to register theme rccFile %s", qPrintable(rccFile));
+
+#if 0 // FIXME: debug only
+    QDirIterator it(":", QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        qDebug() << it.next();
+    }
+#endif
+
+    QString styleSheet { qssFile.readAll() };
+    qApp->setStyleSheet(styleSheet);
+    appSettings->setValue(kThemeKey, theme);
+}
+
+ThemeManager* ThemeManager::instance()
+{
+    if (!instance_)
+        instance_ = new ThemeManager();
+    return instance_;
+}

client/thememanager.h

@@ -0,0 +1,42 @@
+/*
+Copyright (C) 2021 Srivats P.
+
+This file is part of "Ostinato"
+
+This is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#ifndef _THEME_MANAGER_H
+#define _THEME_MANAGER_H
+
+#include <QStringList>
+
+class ThemeManager
+{
+public:
+    ThemeManager();
+
+    QStringList themeList();
+    void setTheme(QString theme);
+
+    static ThemeManager* instance();
+
+private:
+    QString themeDir_;
+
+    static ThemeManager *instance_;
+};
+
+#endif
+