Feature/set theme

HDPS/cmake/CMakeHdpsSourcesPublic.cmake

@@ -455,6 +455,13 @@ set(PUBLIC_UTIL_HEADERS
     src/util/NumericalRange.h
 )
 
+if(APPLE)
+set(PUBLIC_UTIL_HEADERS
+	${PUBLIC_UTIL_HEADERS}
+    src/util/MacThemeHelper.h
+)
+endif()
+
 set(PUBLIC_UTIL_SOURCES
     src/util/Miscellaneous.cpp
     src/util/FileUtil.cpp
@@ -489,6 +496,13 @@ set(PUBLIC_UTIL_SOURCES
     src/util/NumericalRange.cpp
 )
 
+if(APPLE)
+set(PUBLIC_UTIL_SOURCES
+	${PUBLIC_UTIL_SOURCES}
+    src/util/MacThemeHelper.mm
+)
+endif()
+
 set(PUBLIC_UTIL_FILES
     ${PUBLIC_UTIL_HEADERS}    
     ${PUBLIC_UTIL_SOURCES}
@@ -641,13 +655,15 @@ set(PUBLIC_GLOBAL_SETTINGS_HEADERS
     src/ParametersSettingsAction.h
     src/MiscellaneousSettingsAction.h
     src/TasksSettingsAction.h
+    src/ApplicationSettingsAction.h
 )
 
 set(PUBLIC_GLOBAL_SETTINGS_SOURCES
     src/GlobalSettingsGroupAction.cpp
 	src/ParametersSettingsAction.cpp
     src/MiscellaneousSettingsAction.cpp
     src/TasksSettingsAction.cpp
+    src/ApplicationSettingsAction.cpp
 )
 
 set(PUBLIC_GLOBAL_SETTINGS_FILES
@@ -804,4 +820,4 @@ source_group(Project FILES ${PUBLIC_PROJECT_FILES})
 source_group(Model\\Actions FILES ${PUBLIC_ACTIONS_MODEL_FILES})
 source_group(Model\\DataHierarchy FILES ${PUBLIC_DATA_HIERARCHY_MODEL_FILES})
 source_group(GlobalSettings FILES ${PUBLIC_GLOBAL_SETTINGS_FILES})
-source_group(Task FILES ${PUBLIC_TASK_FILES})
+source_group(Task FILES ${PUBLIC_TASK_FILES})

HDPS/res/ResourcesCore.qrc

@@ -28,6 +28,11 @@
         <file alias="StartPageBackground">images/StartPageBackground.png</file>
         <file alias="SplashScreenBackground">images/SplashScreenBackground.png</file>
     </qresource>
+    <qresource prefix="/Buttons">
+        <file alias="ModeDark">images/buttons/ModeDark.png</file>
+        <file alias="ModeLight">images/buttons/ModeLight.png</file>
+        <file alias="ModeSystem">images/buttons/ModeSystem.png</file>
+    </qresource>
     <qresource prefix="/">
         <file>shaders/Quad.vert</file>
         <file>shaders/DensityCompute.vert</file>

HDPS/src/AbstractSettingsManager.h

@@ -11,6 +11,7 @@
 #include "ParametersSettingsAction.h"
 #include "MiscellaneousSettingsAction.h"
 #include "TasksSettingsAction.h"
+#include "ApplicationSettingsAction.h"
 
 namespace hdps
 {
@@ -49,6 +50,7 @@ class AbstractSettingsManager : public AbstractManager
     virtual ParametersSettingsAction& getParametersSettings() = 0;
     virtual MiscellaneousSettingsAction& getMiscellaneousSettings() = 0;
     virtual TasksSettingsAction& getTasksSettingsAction() = 0;
+    virtual ApplicationSettingsAction& getApplicationSettings() = 0;
 };
 
 }

HDPS/src/Application.cpp

@@ -38,14 +38,14 @@ Application::Application(int& argc, char** argv) :
     _startupProjectMetaAction(nullptr)
 {
     _iconFonts.add(QSharedPointer<IconFont>(new FontAwesome(5, 14, {
-            ":/IconFonts/FontAwesomeBrandsRegular-5.14.otf",
-            ":/IconFonts/FontAwesomeRegular-5.14.otf",
+            //":/IconFonts/FontAwesomeBrandsRegular-5.14.otf",
+            //":/IconFonts/FontAwesomeRegular-5.14.otf",
             ":/IconFonts/FontAwesomeSolid-5.14.otf"
     }, true)));
 
     _iconFonts.add(QSharedPointer<IconFont>(new FontAwesome(6, 4, {
-        ":/IconFonts/FontAwesomeBrandsRegular-6.4.otf",
-        ":/IconFonts/FontAwesomeRegular-6.4.otf",
+        //":/IconFonts/FontAwesomeBrandsRegular-6.4.otf",
+        //":/IconFonts/FontAwesomeRegular-6.4.otf",
         ":/IconFonts/FontAwesomeSolid-6.4.otf"
     })));
 

HDPS/src/ApplicationSettingsAction.cpp

@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later 
+// A corresponding LICENSE file is located in the root directory of this source tree 
+// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) 
+
+#include "ApplicationSettingsAction.h"
+#include "Application.h"
+
+#ifdef Q_OS_MACX
+#include "util/MacThemeHelper.h"
+#endif // Q_OS_MACX
+
+namespace hdps
+{
+
+ApplicationSettingsAction::ApplicationSettingsAction(QObject* parent) :
+    GlobalSettingsGroupAction(parent, "Application"),
+    _appearanceOptionAction(nullptr)
+{
+    setShowLabels(true);
+
+    bool themesAvailable = false;
+
+#ifdef Q_OS_MACX
+    themesAvailable = macDarkThemeAvailable();
+    // Temporary no option is provided, instead we fix for the light theme.
+    // While changing the theme works, there is still a number of icons that do not work on dark theme.
+    //macSetToLightTheme();
+#endif // Q_OS_MACX
+
+    if( themesAvailable )
+    {
+        _appearanceOptionAction = new gui::OptionAction(this, "Appearance", QStringList({"System", "Dark", "Light"}), "System");
+        _appearanceOptionAction->setDefaultWidgetFlags(gui::OptionAction::HorizontalButtons);
+        _appearanceOptionAction->setSettingsPrefix(getSettingsPrefix() + "AppearanceOption");
+
+        addAction(_appearanceOptionAction);
+
+        const auto appearanceOptionCurrentIndexChanged = [this](const QString& currentText) -> void {
+            //qDebug() << "Changing Appearance to " << currentText << ".";
+            if(currentText == "System")
+            {
+#ifdef Q_OS_MACX
+                macSetToAutoTheme();
+#endif // Q_OS_MACX
+            }
+            else if(currentText == "Dark")
+            {
+#ifdef Q_OS_MACX
+                macSetToDarkTheme();
+#endif // Q_OS_MACX
+            }
+            else if(currentText == "Light")
+            {
+#ifdef Q_OS_MACX
+                macSetToLightTheme();
+#endif // Q_OS_MACX
+            }
+        };
+        connect(_appearanceOptionAction, &gui::OptionAction::currentTextChanged, this, appearanceOptionCurrentIndexChanged);
+    }
+}
+
+}

HDPS/src/ApplicationSettingsAction.h

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later 
+// A corresponding LICENSE file is located in the root directory of this source tree 
+// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) 
+
+#pragma once
+
+#include "GlobalSettingsGroupAction.h"
+
+#include "actions/OptionAction.h"
+
+namespace hdps
+{
+
+/**
+ * Application global settings action class
+ *
+ * Action class which groups all global settings for the application
+ *
+ * @author Thomas Kroes
+ * @author Thomas Höllt
+ */
+class ApplicationSettingsAction final : public GlobalSettingsGroupAction
+{
+public:
+
+    /**
+     * Constructor
+     * @param parent Pointer to parent object
+     */
+    ApplicationSettingsAction(QObject* parent);
+
+public: // Action getters
+
+    gui::OptionAction* getAppearanceOptionAction() { return _appearanceOptionAction; }
+
+private:
+    gui::OptionAction* _appearanceOptionAction;       /** Options for dark, light, or system appearance */
+};
+
+}

HDPS/src/ParametersSettingsAction.cpp

@@ -37,7 +37,7 @@ ParametersSettingsAction::ParametersSettingsAction(QObject* parent) :
 
     connect(&_expertModeAction, &ToggleAction::toggled, this, updateExpertModeActionTooltip);
 
-    _expertModeAction.setIcon(Application::getIconFont("FontAwesome").getIcon("user-graduate"));
+    _expertModeAction.setIconByName("user-graduate");
 }
 
 }

HDPS/src/Plugin.cpp

@@ -31,7 +31,7 @@ Plugin::Plugin(const PluginFactory* factory) :
     _guiNameAction.setConnectionPermissionsToForceNone();
 
     _destroyAction.setToolTip(QString("Remove %1").arg(getGuiName()));
-    _destroyAction.setIcon(Application::getIconFont("FontAwesome").getIcon("trash"));
+    _destroyAction.setIconByName("trash");
     _destroyAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::VisibleInMenu);
     _destroyAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::InternalUseOnly);
     _destroyAction.setConnectionPermissionsToForceNone();

HDPS/src/PluginFactory.cpp

@@ -150,4 +150,4 @@ std::uint16_t PluginFactory::getNumberOfDatasetsForType(const Datasets& datasets
 
 }
 
-}
+}

HDPS/src/ViewPlugin.cpp

@@ -49,21 +49,21 @@ ViewPlugin::ViewPlugin(const PluginFactory* factory) :
     _widget.addAction(&_isolateAction);
     _widget.addAction(&_helpAction);
 
-    _editorAction.setIcon(Application::getIconFont("FontAwesome").getIcon("cog"));
+    _editorAction.setIconByName("cog");
     _editorAction.setShortcut(tr("F12"));
     _editorAction.setShortcutContext(Qt::WidgetWithChildrenShortcut);
     _editorAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::VisibleInMenu);
     _editorAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::InternalUseOnly);
     _editorAction.setConnectionPermissionsToForceNone();
 
-    _screenshotAction.setIcon(Application::getIconFont("FontAwesome").getIcon("camera"));
+    _screenshotAction.setIconByName("camera");
     _screenshotAction.setShortcut(tr("F2"));
     _screenshotAction.setShortcutContext(Qt::WidgetWithChildrenShortcut);
     _screenshotAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::VisibleInMenu);
     _screenshotAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::InternalUseOnly);
     _screenshotAction.setConnectionPermissionsToForceNone();
 
-    _isolateAction.setIcon(Application::getIconFont("FontAwesome").getIcon("crosshairs"));
+    _isolateAction.setIconByName("crosshairs");
     _isolateAction.setShortcut(tr("F3"));
     _isolateAction.setShortcutContext(Qt::WidgetWithChildrenShortcut);
     _isolateAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::VisibleInMenu);

HDPS/src/Workspace.cpp

@@ -118,7 +118,7 @@ void Workspace::initialize()
     _descriptionAction.setPlaceHolderString("Enter workspace description here...");
     _descriptionAction.setClearable(true);
 
-    _tagsAction.setIcon(Application::getIconFont("FontAwesome").getIcon("tag"));
+    _tagsAction.setIconByName("tag");
     _tagsAction.setCategory("Tag");
 
     _commentsAction.setPlaceHolderString("Enter workspace comments here...");

HDPS/src/actions/ColorMapAction.cpp

@@ -40,7 +40,7 @@ ColorMapAction::ColorMapAction(QObject* parent, const QString& title, const Colo
     _customColorMapGroupAction(this, "Custom color map"),
     _settingsAction(*this, "Settings")
 {
-    setIcon(Application::getIconFont("FontAwesome").getIcon("paint-roller"));
+    setIconByName("paint-roller");
     setDefaultWidgetFlags(WidgetFlag::Default);
 
     initialize(colorMap);

HDPS/src/actions/ColorMapEditor1DAction.cpp

@@ -28,7 +28,7 @@ ColorMapEditor1DAction::ColorMapEditor1DAction(QObject* parent, const QString& t
     _colorMapImage(colorMapImageSize, QImage::Format::Format_ARGB32_Premultiplied)
 {
     setText("1D custom color map");
-    setIcon(Application::getIconFont("FontAwesome").getIcon("chart-line"));
+    setIconByName("chart-line");
 
     addNode(QPointF(0.0f, 0.0f), Qt::black);
     addNode(QPointF(1.0f, 1.0f), Qt::white);
@@ -248,11 +248,11 @@ ColorMapEditor1DAction::Widget::Widget(QWidget* parent, ColorMapEditor1DAction*
 
     auto& fontAwesome = Application::getIconFont("FontAwesome");
 
-    _goToFirstNodeAction.setIcon(fontAwesome.getIcon("angle-double-left"));
-    _goToPreviousNodeAction.setIcon(fontAwesome.getIcon("angle-left"));
-    _goToNextNodeAction.setIcon(fontAwesome.getIcon("angle-right"));
-    _goToLastNodeAction.setIcon(fontAwesome.getIcon("angle-double-right"));
-    _removeNodeAction.setIcon(fontAwesome.getIcon("trash"));
+    _goToFirstNodeAction.setIconByName("angle-double-left");
+    _goToPreviousNodeAction.setIconByName("angle-left");
+    _goToNextNodeAction.setIconByName("angle-right");
+    _goToLastNodeAction.setIconByName("angle-double-right");
+    _removeNodeAction.setIconByName("trash");
 
     auto layout         = new QVBoxLayout();
     auto toolbarLayout  = new QHBoxLayout();

HDPS/src/actions/ColorMapSettingsAction.cpp

@@ -17,7 +17,7 @@ ColorMapSettingsAction::ColorMapSettingsAction(ColorMapAction& colorMapAction, c
     _colorMapAction(colorMapAction)
 {
     setText("Settings");
-    setIcon(Application::getIconFont("FontAwesome").getIcon("sliders-h"));
+    setIconByName("sliders-h");
 }
 
 ColorMapSettingsAction::Widget::Widget(QWidget* parent, ColorMapSettingsAction* colorMapSettingsAction, const std::int32_t& widgetFlags) :

HDPS/src/actions/DatasetPickerAction.cpp

@@ -26,7 +26,7 @@ DatasetPickerAction::DatasetPickerAction(QObject* parent, const QString& title,
     _eventListener()
 {
     setText(title);
-    setIcon(Application::getIconFont("FontAwesome").getIcon("database"));
+    setIconByName("database");
     setToolTip("Pick a dataset");
     setCustomModel(&_datasetsModel);
     setPlaceHolderString("--choose dataset--");

HDPS/src/actions/DirectoryPickerAction.cpp

@@ -33,7 +33,7 @@ DirectoryPickerAction::DirectoryPickerAction(QObject* parent, const QString& tit
 
     // Configure pick action
     _pickAction.setDefaultWidgetFlags(TriggerAction::Icon);
-    _pickAction.setIcon(Application::getIconFont("FontAwesome").getIcon("folder"));
+    _pickAction.setIconByName("folder");
     _pickAction.setToolTip("Click to choose a directory");
 
     // Disable trailing action

HDPS/src/actions/FilePickerAction.cpp

@@ -33,7 +33,7 @@ FilePickerAction::FilePickerAction(QObject* parent, const QString& title, const
     _filePathAction.setCompleter(&_completer);
 
     _pickAction.setDefaultWidgetFlags(TriggerAction::Icon);
-    _pickAction.setIcon(Application::getIconFont("FontAwesome").getIcon("folder-open"));
+    _pickAction.setIconByName("folder-open");
 
     const auto updatePickActionToolTip = [this]() -> void {
         _pickAction.setToolTip(QString("Click to browse for %1").arg(getFileType().toLower()));

HDPS/src/actions/GroupSectionTreeItem.cpp

@@ -10,6 +10,7 @@
 #include <QDebug>
 #include <QMenu>
 #include <QResizeEvent>
+#include <QOperatingSystemVersion>
 
 //#define GROUP_SECTION_TREE_ITEM_VERBOSE
 
@@ -62,7 +63,12 @@ GroupSectionTreeItem::PushButton::PushButton(QTreeWidgetItem* treeWidgetItem, Gr
     _overlayLayout(),
     _iconLabel()
 {
-    setFixedHeight(22);
+    auto isMacOS = QOperatingSystemVersion::currentType() == QOperatingSystemVersion::MacOS;
+
+    // on macOS the buttons look extremely squished and foreign with fixed height
+    if(!isMacOS) {
+        setFixedHeight(22);
+    }
 
     // Get reference to the Font Awesome icon font
     auto& fontAwesome = Application::getIconFont("FontAwesome");
@@ -75,7 +81,11 @@ GroupSectionTreeItem::PushButton::PushButton(QTreeWidgetItem* treeWidgetItem, Gr
     _overlayLayout.addStretch(1);
 
     _iconLabel.setAlignment(Qt::AlignCenter);
-    _iconLabel.setFont(fontAwesome.getFont(7));
+    if(isMacOS) {
+        _iconLabel.setFont(fontAwesome.getFont());
+    } else {
+        _iconLabel.setFont(fontAwesome.getFont(7));
+    }
 
     // Install event filter to synchronize overlay widget size with push button size
     installEventFilter(this);