Merged node-icons to pixi icons

src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml

@@ -3,7 +3,7 @@
         xmlns:system="clr-namespace:System;assembly=System.Runtime">
     <Styles.Resources>
         <ResourceDictionary>
-            <FontFamily x:Key="PixiPerfectIcons">avares://PixiEditor.UI.Common/Fonts/PixiPerfect.ttf#PixiPerfect</FontFamily>
+            <FontFamily x:Key="PixiPerfectIcons">avares://PixiEditor.UI.Common/Fonts/PixiPerfect.ttf#pixiperfect</FontFamily>
 
             <system:String x:Key="icon-add-reference">&#xE900;</system:String>
             <system:String x:Key="icon-add-to-mask">&#xE901;</system:String>

src/PixiEditor/App.axaml

@@ -21,7 +21,6 @@
         <StyleInclude Source="/Styles/PixiEditor.Layers.axaml" />
         <StyleInclude Source="/Styles/PixiEditorPopupTemplate.axaml" />
         <StyleInclude Source="/Styles/Buttons/CaptionButtonsStyle.axaml" />
-        <StyleInclude Source="/Styles/NodeIcons.axaml"/>
     </Application.Styles>
     <Application.Resources>
         <ResourceDictionary>

src/PixiEditor/Initialization/ClassicDesktopEntry.cs

@@ -86,7 +86,7 @@ internal class ClassicDesktopEntry
             return;
         }
 
-#if !STEAM
+#if !STEAM && !DEBUG
         if (!HandleNewInstance(dispatcher))
         {
             return;

src/PixiEditor/Styles/NodeIcons.axaml

@@ -1,22 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
-    <Styles.Resources>
-        <ResourceDictionary>
-            <FontFamily x:Key="NodeIcons">avares://PixiEditor/Fonts/nodeicons.ttf#nodeicons</FontFamily>
-        </ResourceDictionary>
-    </Styles.Resources>
-    
-    <Style Selector="TextBlock.node-icon">
-        <Setter Property="FontFamily" Value="{DynamicResource NodeIcons}" />
-    </Style>
-
-    <Style Selector="Run.node-icon">
-        <Setter Property="FontFamily" Value="{DynamicResource NodeIcons}" />
-    </Style>
-</Styles>

src/PixiEditor/Styles/Templates/NodePicker.axaml

@@ -55,7 +55,7 @@
                                                             HorizontalContentAlignment="Left"
                                                             IsVisible="{Binding !Hidden}">
                                                             <TextBlock Margin="10 0 0 0">
-                                                                <Run Classes="node-icon"
+                                                                <Run Classes="pixi-icon"
                                                                      BaselineAlignment="Center"
                                                                      Text="{Binding Icon}" />
                                                                 <Run ui:Translator.Key="{Binding FinalPickerName}" />

src/PixiEditor/ViewModels/Document/Nodes/Animable/TimeNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.Animable;
 
-[NodeViewModel("TIME_NODE", "ANIMATION", "\uE900")]
+[NodeViewModel("TIME_NODE", "ANIMATION", "\uE800")]
 internal class TimeNodeViewModel : NodeViewModel<TimeNode>;

src/PixiEditor/ViewModels/Document/Nodes/ColorNodeViewModel.cs

@@ -3,7 +3,7 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("COLOR_NODE", "COLOR", "\ue907")]
+[NodeViewModel("COLOR_NODE", "COLOR", "\uE912")]
 internal class ColorNodeViewModel : NodeViewModel<ColorNode>
 {
     

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/CombineChannelsNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("COMBINE_CHANNELS_NODE", "IMAGE", "\ue915")]
+[NodeViewModel("COMBINE_CHANNELS_NODE", "IMAGE", "\uE815")]
 internal class CombineChannelsNodeViewModel : NodeViewModel<CombineChannelsNode>;

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/CombineColorNodeViewModel.cs

@@ -7,5 +7,5 @@ using PixiEditor.ViewModels.Nodes.Properties;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("COMBINE_COLOR_NODE", "COLOR", "\ue908")]
+[NodeViewModel("COMBINE_COLOR_NODE", "COLOR", "\uE808")]
 internal class CombineColorNodeViewModel() : CombineSeparateColorNodeViewModel<CombineColorNode>(true);

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/CombineVecDNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("COMBINE_VECD_NODE", "NUMBERS", "\ue916")]
+[NodeViewModel("COMBINE_VECD_NODE", "NUMBERS", "\uE816")]
 internal class CombineVecDNodeViewModel : NodeViewModel<CombineVecDNode>;

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/CombineVecINodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("COMBINE_VECI_NODE", "NUMBERS", "\ue917")]
+[NodeViewModel("COMBINE_VECI_NODE", "NUMBERS", "\uE817")]
 internal class CombineVecINodeViewModel : NodeViewModel<CombineVecINode>;

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/SeparateChannelsNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("SEPARATE_CHANNELS_NODE", "IMAGE", "\ue910")]
+[NodeViewModel("SEPARATE_CHANNELS_NODE", "IMAGE", "\uE810")]
 internal class SeparateChannelsNodeViewModel : NodeViewModel<SeparateChannelsNode>;

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/SeparateColorNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("SEPARATE_COLOR_NODE", "COLOR", "\ue913")]
+[NodeViewModel("SEPARATE_COLOR_NODE", "COLOR", "\uE813")]
 internal class SeparateColorNodeViewModel() : CombineSeparateColorNodeViewModel<SeparateColorNode>(false);

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/SeparateVecDNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("SEPARATE_VECD_NODE", "NUMBERS", "\ue918")]
+[NodeViewModel("SEPARATE_VECD_NODE", "NUMBERS", "\uE818")]
 internal class SeparateVecDNodeViewModel : NodeViewModel<SeparateVecDNode>;

src/PixiEditor/ViewModels/Document/Nodes/CombineSeparate/SeparateVecINodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.CombineSeparate;
 
-[NodeViewModel("SEPARATE_VECI_NODE", "NUMBERS", "\ue917")]
+[NodeViewModel("SEPARATE_VECI_NODE", "NUMBERS", "\uE817")]
 internal class SeparateVecINodeViewModel : NodeViewModel<SeparateVecINode>;

src/PixiEditor/ViewModels/Document/Nodes/CreateImageNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("CREATE_IMAGE_NODE", "IMAGE", "\ue902")]
+[NodeViewModel("CREATE_IMAGE_NODE", "IMAGE", "\uE802")]
 internal class CreateImageNodeViewModel : NodeViewModel<CreateImageNode>;

src/PixiEditor/ViewModels/Document/Nodes/CustomOutputNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("CUSTOM_OUTPUT_NODE", null, "\ue920")]
+[NodeViewModel("CUSTOM_OUTPUT_NODE", null, "\uE81A")]
 internal class CustomOutputNodeViewModel : NodeViewModel<CustomOutputNode>;

src/PixiEditor/ViewModels/Document/Nodes/FilterNodes/ApplyFilterNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.FilterNodes;
 
-[NodeViewModel("APPLY_FILTER_NODE", "FILTERS", "\ue909")]
+[NodeViewModel("APPLY_FILTER_NODE", "FILTERS", "\uE809")]
 internal class ApplyFilterNodeViewModel : NodeViewModel<ApplyFilterNode>;

src/PixiEditor/ViewModels/Document/Nodes/FilterNodes/BlurNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.FilterNodes;
 
-[NodeViewModel("BLUR_FILTER_NODE", "FILTERS", "\ue822")]
+[NodeViewModel("BLUR_FILTER_NODE", "FILTERS", "\uE822")]
 internal class BlurNodeViewModel : NodeViewModel<BlurNode>;

src/PixiEditor/ViewModels/Document/Nodes/FilterNodes/ColorMatrixFilterNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.FilterNodes;
 
-[NodeViewModel("COLOR_MATRIX_TRANSFORM_FILTER_NODE", "FILTERS", "\ue911")]
+[NodeViewModel("COLOR_MATRIX_TRANSFORM_FILTER_NODE", "FILTERS", "\uE811")]
 internal class ColorMatrixFilterNodeViewModel : NodeViewModel<ColorMatrixFilterNode>;

src/PixiEditor/ViewModels/Document/Nodes/FilterNodes/GrayscaleNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.FilterNodes;
 
-[NodeViewModel("GRAYSCALE_FILTER_NODE", "FILTERS", "\ue912")]
+[NodeViewModel("GRAYSCALE_FILTER_NODE", "FILTERS", "\ue812")]
 internal class GrayscaleNodeViewModel : NodeViewModel<GrayscaleNode>;

src/PixiEditor/ViewModels/Document/Nodes/FilterNodes/KernelFilterNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.FilterNodes;
 
-[NodeViewModel("KERNEL_FILTER_NODE", "FILTERS", "\ue90f")]
+[NodeViewModel("KERNEL_FILTER_NODE", "FILTERS", "\uE80F")]
 internal class KernelFilterNodeViewModel : NodeViewModel<KernelFilterNode>;

src/PixiEditor/ViewModels/Document/Nodes/FolderNodeViewModel.cs

@@ -6,7 +6,7 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("FOLDER_NODE", "STRUCTURE", "\ue901")]
+[NodeViewModel("FOLDER_NODE", "STRUCTURE", "\uE801")]
 internal class FolderNodeViewModel : StructureMemberViewModel<FolderNode>, IFolderHandler
 {
     public ObservableCollection<IStructureMemberHandler> Children { get; } = new();

src/PixiEditor/ViewModels/Document/Nodes/ImageLayerNodeViewModel.cs

@@ -6,7 +6,7 @@ using PixiEditor.ViewModels.Tools.Tools;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("IMAGE_LAYER_NODE", "STRUCTURE", "\ue905")]
+[NodeViewModel("IMAGE_LAYER_NODE", "STRUCTURE", "\uE805")]
 internal class ImageLayerNodeViewModel : StructureMemberViewModel<ImageLayerNode>, ITransparencyLockableMember, IRasterLayerHandler
 {
     bool lockTransparency;

src/PixiEditor/ViewModels/Document/Nodes/LerpColorNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("LERP_NODE", "NUMBERS", "\ue90b")]
+[NodeViewModel("LERP_NODE", "NUMBERS", "\uE80B")]
 internal class LerpColorNodeViewModel : NodeViewModel<LerpColorNode>;

src/PixiEditor/ViewModels/Document/Nodes/MathNodeViewModel.cs

@@ -9,7 +9,7 @@ using PixiEditor.ViewModels.Nodes.Properties;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("MATH_NODE", "NUMBERS", "\ue90e")]
+[NodeViewModel("MATH_NODE", "NUMBERS", "\uE80E")]
 internal class MathNodeViewModel : NodeViewModel<MathNode>
 {
     private GenericEnumPropertyViewModel Mode { get; set; }

src/PixiEditor/ViewModels/Document/Nodes/MergeNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("MERGE_NODE", "IMAGE", "\ue903")]
+[NodeViewModel("MERGE_NODE", "IMAGE", "\uE803")]
 internal class MergeNodeViewModel : NodeViewModel<MergeNode>;

src/PixiEditor/ViewModels/Document/Nodes/ModifyImageLeftNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("MODIFY_IMAGE_LEFT_NODE", "IMAGE", "\ue904")]
+[NodeViewModel("MODIFY_IMAGE_LEFT_NODE", "IMAGE", "\uE804")]
 internal class ModifyImageLeftNodeViewModel : NodeViewModel<ModifyImageLeftNode>;

src/PixiEditor/ViewModels/Document/Nodes/NoiseNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("NOISE_NODE", "IMAGE", "\ue90c")]
+[NodeViewModel("NOISE_NODE", "IMAGE", "\uE80C")]
 internal class NoiseNodeViewModel : NodeViewModel<NoiseNode>;

src/PixiEditor/ViewModels/Document/Nodes/SampleImageNodeViewModel.cs

@@ -4,5 +4,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("SAMPLE_IMAGE", "IMAGE", "\ue907")]
+[NodeViewModel("SAMPLE_IMAGE", "IMAGE", "\uE807")]
 internal class SampleImageNodeViewModel : NodeViewModel<SampleImageNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/DistributePointsNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
-[NodeViewModel("DISTRIBUTE_POINTS", "SHAPE", "\ue90a")]
+[NodeViewModel("DISTRIBUTE_POINTS", "SHAPE", "\uE80A")]
 internal class DistributePointsNodeViewModel : NodeViewModel<DistributePointsNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/EllipseNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
-[NodeViewModel("ELLIPSE_NODE", "SHAPE", "\ue90d")]
+[NodeViewModel("ELLIPSE_NODE", "SHAPE", "\uE910")]
 internal class EllipseNodeViewModel : NodeViewModel<EllipseNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/RasterizeShapeNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
-[NodeViewModel("RASTERIZE_SHAPE", "SHAPE", "\ue906")]
+[NodeViewModel("RASTERIZE_SHAPE", "SHAPE", "\uE806")]
 internal class RasterizeShapeNodeViewModel : NodeViewModel<RasterizeShapeNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/RemoveClosePointsNodeViewModel.cs

@@ -3,5 +3,5 @@ using PixiEditor.ViewModels.Nodes;
 
 namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
-[NodeViewModel("REMOVE_CLOSE_POINTS", "SHAPE", "\ue914")]
+[NodeViewModel("REMOVE_CLOSE_POINTS", "SHAPE", "\uE814")]
 internal class RemoveClosePointsNodeViewModel : NodeViewModel<RemoveClosePointsNode>;

src/PixiEditor/ViewModels/Document/Nodes/VectorLayerNodeViewModel.cs

@@ -9,7 +9,7 @@ using PixiEditor.ViewModels.Tools.Tools;
 
 namespace PixiEditor.ViewModels.Document.Nodes;
 
-[NodeViewModel("VECTOR_LAYER", "STRUCTURE", "\ue916")]
+[NodeViewModel("VECTOR_LAYER", "STRUCTURE", "\uE816")]
 internal class VectorLayerNodeViewModel : StructureMemberViewModel<VectorLayerNode>, IVectorLayerHandler
 {
     private Dictionary<Type, Type> quickToolsMap = new Dictionary<Type, Type>()