Adhere to changed theming API

ExampleAnalysis/src/ExampleAnalysisPlugin.cpp

@@ -278,7 +278,7 @@ mv::gui::PluginTriggerActions ExampleAnalysisPluginFactory::getPluginTriggerActi
     const auto numberOfDatasets = datasets.count();
 
     if (numberOfDatasets >= 1 && PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
-        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleAnalysisPluginFactory*>(this), this, "Example Analysis", "Perform an Example Analysis", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleAnalysisPluginFactory*>(this), this, "Example Analysis", "Perform an Example Analysis", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
             for (auto dataset : datasets)
                 getPluginInstance(dataset);
             });

ExampleData/src/ExampleDataPlugin.cpp

@@ -71,11 +71,6 @@ Dataset<DatasetImpl> PixelSet::copy() const
     return copySet;
 }
 
-QIcon PixelSet::getIcon(const QColor& color /*= Qt::black*/) const
-{
-    return QIcon();
-}
-
 std::vector<std::uint32_t>& PixelSet::getSelectionIndices()
 {
     return _indices;
@@ -162,6 +157,8 @@ void PixelSet::selectInvert()
 
 ExampleDataPluginFactory::ExampleDataPluginFactory()
 {
+    setIconByName("database");
+
     getPluginMetadata().setDescription("Example data plugin");
     getPluginMetadata().setSummary("This example shows how to implement a basic data plugin in ManiVault Studio.");
     getPluginMetadata().setCopyrightHolder({ "BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft)" });
@@ -177,11 +174,6 @@ ExampleDataPluginFactory::ExampleDataPluginFactory()
     getPluginMetadata().setLicenseText("This plugin is distributed under the [LGPL v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html) license.");
 }
 
-QIcon ExampleDataPluginFactory::getIcon(const QColor& color /*= Qt::black*/) const
-{
-    return Application::getIconFont("FontAwesome").getIcon("database", color);
-}
-
 plugin::RawData* ExampleDataPluginFactory::produce()
 {
     return new ExampleDataPlugin(this);

ExampleData/src/ExampleDataPlugin.h

@@ -62,13 +62,6 @@ class EXAMPLEDATAPLUGIN_EXPORT PixelSet : public mv::DatasetImpl
     /** Mandatory override for copying of data sets */
     mv::Dataset<mv::DatasetImpl> copy() const override;
 
-    /**
-     * Get set icon
-     * @param color Icon color for flat (font) icons
-     * @return Icon
-     */
-    QIcon getIcon(const QColor& color = Qt::black) const override;
-
 public: // Selection
 
     /**
@@ -122,12 +115,5 @@ class ExampleDataPluginFactory : public RawDataFactory
 public:
     ExampleDataPluginFactory();
 
-    /**
-     * Get plugin icon
-     * @param color Icon color for flat (font) icons
-     * @return Icon
-     */
-    QIcon getIcon(const QColor& color = Qt::black) const override;
-
     mv::plugin::RawData* produce() override;
 };

ExampleDependencies/src/ExampleDependenciesPlugin.cpp

@@ -185,7 +185,7 @@ mv::gui::PluginTriggerActions ExampleDependenciesPluginFactory::getPluginTrigger
     const auto numberOfDatasets = datasets.count();
 
     if (numberOfDatasets >= 1 && PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
-        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleDependenciesPluginFactory*>(this), this, "Example dependencies", "Perform an Example Analysis", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleDependenciesPluginFactory*>(this), this, "Example dependencies", "Perform an Example Analysis", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
             for (auto& dataset : datasets)
                 getPluginInstance(dataset);
             });

ExampleTransformation/src/ExampleTransformationPlugin.cpp

@@ -172,7 +172,7 @@ mv::gui::PluginTriggerActions ExampleTransformationPluginFactory::getPluginTrigg
             const auto addPluginTriggerAction = [this, &pluginTriggerActions, datasets](const ExampleTransformationPlugin::Type& type) -> void {
                 const auto typeName = ExampleTransformationPlugin::getTypeName(type);
 
-                auto pluginTriggerAction = new mv::gui::PluginTriggerAction(const_cast<ExampleTransformationPluginFactory*>(this), this, QString("Example/%1").arg(typeName), QString("Perform %1 data transformation").arg(typeName), getIcon(), [this, datasets, type](mv::gui::PluginTriggerAction& pluginTriggerAction) -> void {
+                auto pluginTriggerAction = new mv::gui::PluginTriggerAction(const_cast<ExampleTransformationPluginFactory*>(this), this, QString("Example/%1").arg(typeName), QString("Perform %1 data transformation").arg(typeName), icon(), [this, datasets, type](mv::gui::PluginTriggerAction& pluginTriggerAction) -> void {
                     for (const auto& dataset : datasets) {
                         auto pluginInstance = dynamic_cast<ExampleTransformationPlugin*>(plugins().requestPlugin(getKind()));
 

ExampleView/src/ExampleViewPlugin.cpp

@@ -230,7 +230,7 @@ mv::gui::PluginTriggerActions ExampleViewPluginFactory::getPluginTriggerActions(
     const auto numberOfDatasets = datasets.count();
 
     if (numberOfDatasets >= 1 && PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
-        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewPluginFactory*>(this), this, "Example", "View example data", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewPluginFactory*>(this), this, "Example", "View example data", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
             for (auto dataset : datasets)
                 getPluginInstance();
         });

ExampleViewJS/src/ExampleViewJSPlugin.cpp

@@ -235,6 +235,8 @@ void ExampleViewJSPlugin::createData()
 
 ExampleViewJSPluginFactory::ExampleViewJSPluginFactory()
 {
+    setIconByName("bullseye");
+
     getPluginMetadata().setDescription("Example Javascript view plugin");
     getPluginMetadata().setSummary("This plugin shows how to implement a basic Javascript-based view plugin in ManiVault Studio.");
     getPluginMetadata().setCopyrightHolder({ "BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft)" });
@@ -250,11 +252,6 @@ ExampleViewJSPluginFactory::ExampleViewJSPluginFactory()
     getPluginMetadata().setLicenseText("This plugin is distributed under the [LGPL v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html) license.");
 }
 
-QIcon ExampleViewJSPluginFactory::getIcon(const QColor& color /*= Qt::black*/) const
-{
-    return mv::Application::getIconFont("FontAwesome").getIcon("bullseye", color);
-}
-
 ViewPlugin* ExampleViewJSPluginFactory::produce()
 {
     return new ExampleViewJSPlugin(this);
@@ -279,7 +276,7 @@ mv::gui::PluginTriggerActions ExampleViewJSPluginFactory::getPluginTriggerAction
     const auto numberOfDatasets = datasets.count();
 
     if (numberOfDatasets >= 1 && PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
-        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewJSPluginFactory*>(this), this, "Example JS", "View JavaScript visualization", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewJSPluginFactory*>(this), this, "Example JS", "View JavaScript visualization", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
             for (auto dataset : datasets)
                 getPluginInstance()->loadData(Datasets({ dataset }));
 

ExampleViewJS/src/ExampleViewJSPlugin.h

@@ -91,9 +91,6 @@ class ExampleViewJSPluginFactory : public ViewPluginFactory
     /** Default constructor */
     ExampleViewJSPluginFactory();
 
-    /** Get plugin icon */
-    QIcon getIcon(const QColor& color = Qt::black) const override;
-
     /** Creates an instance of the example view plugin */
     ViewPlugin* produce() override;
 

ExampleViewOpenGL/src/ExampleViewGLPlugin.cpp

@@ -239,6 +239,8 @@ ExampleViewGLPluginFactory::ExampleViewGLPluginFactory() :
     _statusBarPopupGroupAction(this, "Popup Group"),
     _statusBarPopupAction(this, "Popup")
 {
+    setIconByName("cube");
+
     getPluginMetadata().setDescription("Example OpenGL view");
     getPluginMetadata().setSummary("This example shows how to implement a basic OpenGL-based view plugin in ManiVault Studio.");
     getPluginMetadata().setCopyrightHolder({ "BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft)" });
@@ -296,11 +298,6 @@ void ExampleViewGLPluginFactory::initialize()
     setStatusBarAction(_statusBarAction);
 }
 
-QIcon ExampleViewGLPluginFactory::getIcon(const QColor& color /*= Qt::black*/) const
-{
-    return mv::Application::getIconFont("FontAwesome").getIcon("cube", color);
-}
-
 mv::DataTypes ExampleViewGLPluginFactory::supportedDataTypes() const
 {
     DataTypes supportedTypes;
@@ -322,7 +319,7 @@ mv::gui::PluginTriggerActions ExampleViewGLPluginFactory::getPluginTriggerAction
     const auto numberOfDatasets = datasets.count();
 
     if (numberOfDatasets >= 1 && PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
-        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewGLPluginFactory*>(this), this, "Example GL", "OpenGL view example data", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+        auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleViewGLPluginFactory*>(this), this, "Example GL", "OpenGL view example data", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
             for (auto& dataset : datasets)
                 getPluginInstance()->loadData(Datasets({ dataset }));
         });

ExampleViewOpenGL/src/ExampleViewGLPlugin.h

@@ -94,9 +94,6 @@ class ExampleViewGLPluginFactory : public ViewPluginFactory
     /** Perform post-construction initialization */
     void initialize() override;
 
-    /** Get plugin icon */
-    QIcon getIcon(const QColor& color = Qt::black) const override;
-
     /** Creates an instance of the example view plugin */
     ViewPlugin* produce() override;
 

ExampleWriter/src/ExampleWriterPlugin.cpp

@@ -111,7 +111,7 @@ PluginTriggerActions ExampleWriterPluginFactory::getPluginTriggerActions(const m
 
     if (PluginFactory::areAllDatasetsOfTheSameType(datasets, PointType)) {
         if (datasets.count() >= 1) {
-            auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleWriterPluginFactory*>(this), this, "Example Writer", "Export random data to disk (not the selected data set)", getIcon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
+            auto pluginTriggerAction = new PluginTriggerAction(const_cast<ExampleWriterPluginFactory*>(this), this, "Example Writer", "Export random data to disk (not the selected data set)", icon(), [this, getPluginInstance, datasets](PluginTriggerAction& pluginTriggerAction) -> void {
                 for (auto dataset : datasets)
                     getPluginInstance(dataset);
                 });