Simplify icon assignment

ThomasKroes · ThomasKroes · commit 4e470eff5a16 · 2025-02-27T13:53:11.000+01:00
diff --git a/src/ClusteringAction.cpp b/src/ClusteringAction.cpp
@@ -21,7 +21,7 @@ ClusteringAction::ClusteringAction(QObject* parent, const QString& title) :
     _clusterDatasetWizardAction(this, "Create cluster dataset"),
     _clusterDatasetAction(this, "Target clusters dataset")
 {
-    setIcon(Application::getIconFont("FontAwesome").getIcon("th-large"));
+    setIconByName("th-large");
     setConnectionPermissionsToForceNone();
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
     setLabelSizingType(LabelSizingType::Auto);
@@ -46,7 +46,7 @@ ClusteringAction::ClusteringAction(QObject* parent, const QString& title) :
     _createClusterDatasetAction.setToolTip("Create new cluster dataset");
     _createClusterDatasetAction.setEnabled(false);
 
-    _clusterDatasetWizardAction.setIcon(Application::getIconFont("FontAwesome").getIcon("magic"));
+    _clusterDatasetWizardAction.setIconByName("magic");
     _clusterDatasetWizardAction.setToolTip("Create a new cluster dataset");
     _clusterDatasetWizardAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
     _clusterDatasetWizardAction.setLabelSizingType(LabelSizingType::Auto);
diff --git a/src/ColorSourceModel.cpp b/src/ColorSourceModel.cpp
@@ -4,13 +4,14 @@
 #include <Set.h>
 
 using namespace mv;
+using namespace mv::util;
 
 QVariant ColorSourceModel::ConstantColorItem::data(int role /*= Qt::UserRole + 1*/) const
 {
     switch (role)
     {
         case Qt::DecorationRole:
-            return Application::getIconFont("FontAwesome").getIcon("palette");
+            return StyledIcon("palette");
 
         case Qt::DisplayRole:
             return "Constant";
@@ -27,7 +28,7 @@ QVariant ColorSourceModel::ScatterLayoutItem::data(int role /*= Qt::UserRole + 1
     switch (role)
     {
         case Qt::DecorationRole:
-            return Application::getIconFont("FontAwesome").getIcon("palette");
+            return StyledIcon("palette");
 
         case Qt::DisplayRole:
             return "Scatter layout";
@@ -71,7 +72,7 @@ QVariant ColorSourceModel::DatasetItem::data(int role /*= Qt::UserRole + 1*/) co
     switch (role)
     {
         case Qt::DecorationRole:
-            return _dataset->getIcon();
+            return _dataset->icon();
 
         case Qt::DisplayRole:
             return row() == 2 ? _dataset->text() : (_colorSourceModel->getShowFullPathName() ? _dataset->getLocation() : _dataset->text());
diff --git a/src/DatasetsAction.cpp b/src/DatasetsAction.cpp
@@ -16,7 +16,7 @@ DatasetsAction::DatasetsAction(QObject* parent, const QString& title) :
     _positionDatasetPickerAction(this, "Position"),
     _colorDatasetPickerAction(this, "Color")
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("database"));
+    setIconByName("database");
     setToolTip("Manage loaded datasets for position and color");
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
     setLabelSizingType(LabelSizingType::Auto);
diff --git a/src/ExportAction.cpp b/src/ExportAction.cpp
@@ -42,7 +42,7 @@ ExportAction::ExportAction(QObject* parent, const QString& title) :
     _exportCancelAction(this, "Cancel", { TriggersAction::Trigger("Export", "Export dimensions"), TriggersAction::Trigger("Cancel", "Cancel export")  }),
     _aspectRatio()
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("camera"));
+    setIconByName("camera");
     setLabelWidthFixed(100);
     setConnectionPermissionsToForceNone(true);
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
diff --git a/src/MiscellaneousAction.cpp b/src/MiscellaneousAction.cpp
@@ -13,7 +13,7 @@ MiscellaneousAction::MiscellaneousAction(QObject* parent, const QString& title)
     _backgroundColorAction(this, "Background color"),
     _randomizedDepthAction(this, "Randomized depth", true)
 {
-    setIcon(Application::getIconFont("FontAwesome").getIcon("cog"));
+    setIconByName("cog");
     setLabelSizingType(LabelSizingType::Auto);
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
 
diff --git a/src/NavigationAction.cpp b/src/NavigationAction.cpp
@@ -16,17 +16,15 @@ NavigationAction::NavigationAction(QObject* parent, const QString& title) :
     _zoomDataExtentsAction(this, "Zoom to data extents"),
     _freezeZoomAction(this, "Freeze zoom")
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("image"));
+    setIconByName("image");
     setShowLabels(false);
 
     addAction(&_zoomRectangleAction);
     addAction(&_zoomDataExtentsAction);
     addAction(&_freezeZoomAction);
 
-    auto& fontAwesome = Application::getIconFont("FontAwesome");
-
     _zoomRectangleAction.setToolTip("Extents of the current view");
-    _zoomRectangleAction.setIcon(combineIcons(fontAwesome.getIcon("expand"), fontAwesome.getIcon("ellipsis-h")));
+    _zoomRectangleAction.setIcon(combineIcons(StyledIcon("expand"), StyledIcon("ellipsis-h")));
     _zoomRectangleAction.setIconByName("vector-square");
     _zoomRectangleAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
 
diff --git a/src/PlotAction.cpp b/src/PlotAction.cpp
@@ -11,7 +11,7 @@ PlotAction::PlotAction(QObject* parent, const QString& title) :
     _densityPlotAction(this, "Density")
 {
     setToolTip("Plot settings");
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("paint-brush"));
+    setIconByName("paint-brush");
     setLabelSizingType(LabelSizingType::Auto);
 
     addAction(&_pointPlotAction.getSizeAction());
diff --git a/src/PositionAction.cpp b/src/PositionAction.cpp
@@ -11,7 +11,7 @@ PositionAction::PositionAction(QObject* parent, const QString& title) :
     _yDimensionPickerAction(this, "Y"),
     _dontUpdateScatterplot(false)
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("ruler-combined"));
+    setIconByName("ruler-combined");
     setLabelSizingType(LabelSizingType::Auto);
 
     addAction(&_xDimensionPickerAction);
diff --git a/src/RenderModeAction.cpp b/src/RenderModeAction.cpp
@@ -11,7 +11,7 @@ RenderModeAction::RenderModeAction(QObject* parent, const QString& title) :
     _densityPlotAction(this, "Density"),
     _contourPlotAction(this, "Contour")
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("image"));
+    setIconByName("image");
     setDefaultWidgetFlags(OptionAction::HorizontalButtons);
     setEnabled(false);
 
diff --git a/src/ScalarSourceModel.cpp b/src/ScalarSourceModel.cpp
@@ -5,10 +5,10 @@
 #include <Set.h>
 
 using namespace mv;
+using namespace mv::util;
 
 ScalarSourceModel::ScalarSourceModel(QObject* parent /*= nullptr*/) :
     QAbstractListModel(parent),
-    _datasets(),
     _showFullPathName(true)
 {
 }
@@ -47,13 +47,13 @@ QVariant ScalarSourceModel::data(const QModelIndex& index, int role) const
         case Qt::DecorationRole:
         {
             if (row == DefaultRow::Constant)
-                return Application::getIconFont("FontAwesome").getIcon("ruler");
+                return StyledIcon("ruler");
 
             if (row == DefaultRow::Selection)
-                return Application::getIconFont("FontAwesome").getIcon("mouse-pointer");
+                return StyledIcon("mouse-pointer");
 
             if (row >= DefaultRow::DatasetStart)
-                return scalarDataset->getIcon();
+                return scalarDataset->icon();
 
             break;
         }
diff --git a/src/ScatterplotPlugin.h b/src/ScatterplotPlugin.h
@@ -139,13 +139,6 @@ class ScatterplotPluginFactory : public ViewPluginFactory
 public:
     ScatterplotPluginFactory();
 
-    /**
-     * Get plugin icon
-     * @param color Icon color for flat (font) icons
-     * @return Icon
-     */
-    QIcon getIcon(const QColor& color = Qt::black) const override;
-
     ViewPlugin* produce() override;
 
     /**
diff --git a/src/SubsetAction.cpp b/src/SubsetAction.cpp
@@ -19,7 +19,7 @@ SubsetAction::SubsetAction(QObject* parent, const QString& title) :
     _sourceDataAction(this, "Source data"),
     _createSubsetAction(this, "Create subset")
 {
-    setIcon(mv::Application::getIconFont("FontAwesome").getIcon("crop"));
+    setIconByName("crop");
     setConnectionPermissionsToForceNone(true);
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
     setLabelSizingType(LabelSizingType::Auto);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ DatasetsAction::DatasetsAction(QObject* parent, const QString& title) :`
`16`	`16`	`_positionDatasetPickerAction(this, "Position"),`
`17`	`17`	`_colorDatasetPickerAction(this, "Color")`
`18`	`18`	`{`
`19`		`- setIcon(mv::Application::getIconFont("FontAwesome").getIcon("database"));`
	`19`	`+ setIconByName("database");`
`20`	`20`	`setToolTip("Manage loaded datasets for position and color");`
`21`	`21`	`setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);`
`22`	`22`	`setLabelSizingType(LabelSizingType::Auto);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ ExportAction::ExportAction(QObject* parent, const QString& title) :`
`42`	`42`	`_exportCancelAction(this, "Cancel", { TriggersAction::Trigger("Export", "Export dimensions"), TriggersAction::Trigger("Cancel", "Cancel export") }),`
`43`	`43`	`_aspectRatio()`
`44`	`44`	`{`
`45`		`- setIcon(mv::Application::getIconFont("FontAwesome").getIcon("camera"));`
	`45`	`+ setIconByName("camera");`
`46`	`46`	`setLabelWidthFixed(100);`
`47`	`47`	`setConnectionPermissionsToForceNone(true);`
`48`	`48`	`setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ MiscellaneousAction::MiscellaneousAction(QObject* parent, const QString& title)`
`13`	`13`	`_backgroundColorAction(this, "Background color"),`
`14`	`14`	`_randomizedDepthAction(this, "Randomized depth", true)`
`15`	`15`	`{`
`16`		`- setIcon(Application::getIconFont("FontAwesome").getIcon("cog"));`
	`16`	`+ setIconByName("cog");`
`17`	`17`	`setLabelSizingType(LabelSizingType::Auto);`
`18`	`18`	`setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ PlotAction::PlotAction(QObject* parent, const QString& title) :`
`11`	`11`	`_densityPlotAction(this, "Density")`
`12`	`12`	`{`
`13`	`13`	`setToolTip("Plot settings");`
`14`		`- setIcon(mv::Application::getIconFont("FontAwesome").getIcon("paint-brush"));`
	`14`	`+ setIconByName("paint-brush");`
`15`	`15`	`setLabelSizingType(LabelSizingType::Auto);`
`16`	`16`
`17`	`17`	`addAction(&_pointPlotAction.getSizeAction());`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ PositionAction::PositionAction(QObject* parent, const QString& title) :`
`11`	`11`	`_yDimensionPickerAction(this, "Y"),`
`12`	`12`	`_dontUpdateScatterplot(false)`
`13`	`13`	`{`
`14`		`- setIcon(mv::Application::getIconFont("FontAwesome").getIcon("ruler-combined"));`
	`14`	`+ setIconByName("ruler-combined");`
`15`	`15`	`setLabelSizingType(LabelSizingType::Auto);`
`16`	`16`
`17`	`17`	`addAction(&_xDimensionPickerAction);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ RenderModeAction::RenderModeAction(QObject* parent, const QString& title) :`
`11`	`11`	`_densityPlotAction(this, "Density"),`
`12`	`12`	`_contourPlotAction(this, "Contour")`
`13`	`13`	`{`
`14`		`- setIcon(mv::Application::getIconFont("FontAwesome").getIcon("image"));`
	`14`	`+ setIconByName("image");`
`15`	`15`	`setDefaultWidgetFlags(OptionAction::HorizontalButtons);`
`16`	`16`	`setEnabled(false);`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`#include <Set.h>`
`6`	`6`
`7`	`7`	`using namespace mv;`
	`8`	`+using namespace mv::util;`
`8`	`9`
`9`	`10`	`ScalarSourceModel::ScalarSourceModel(QObject* parent /= nullptr/) :`
`10`	`11`	`QAbstractListModel(parent),`
`11`		`- _datasets(),`
`12`	`12`	`_showFullPathName(true)`
`13`	`13`	`{`
`14`	`14`	`}`
`@@ -47,13 +47,13 @@ QVariant ScalarSourceModel::data(const QModelIndex& index, int role) const`
`47`	`47`	`case Qt::DecorationRole:`
`48`	`48`	`{`
`49`	`49`	`if (row == DefaultRow::Constant)`
`50`		`- return Application::getIconFont("FontAwesome").getIcon("ruler");`
	`50`	`+ return StyledIcon("ruler");`
`51`	`51`
`52`	`52`	`if (row == DefaultRow::Selection)`
`53`		`- return Application::getIconFont("FontAwesome").getIcon("mouse-pointer");`
	`53`	`+ return StyledIcon("mouse-pointer");`
`54`	`54`
`55`	`55`	`if (row >= DefaultRow::DatasetStart)`
`56`		`- return scalarDataset->getIcon();`
	`56`	`+ return scalarDataset->icon();`
`57`	`57`
`58`	`58`	`break;`
`59`	`59`	`}`