Procházet zdrojové kódy

Added stabilizer icons

Krzysztof Krysiński před 1 měsícem
rodič
revize
4e8c6475f7

binární
src/PixiEditor.UI.Common/Fonts/PixiPerfect.ttf


+ 3 - 0
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml

@@ -56,6 +56,7 @@
             <system:String x:Key="icon-database">&#xE93D;</system:String>
             <system:String x:Key="icon-deselect">&#xE93E;</system:String>
             <system:String x:Key="icon-discord">&#xE911;</system:String>
+            <system:String x:Key="icon-distance-stabilizer">&#xE9D7;</system:String>
             <system:String x:Key="icon-dot">&#xE983;</system:String>
             <system:String x:Key="icon-download">&#xE99F;</system:String>
             <system:String x:Key="icon-download-cloud">&#xE989;</system:String>
@@ -128,6 +129,7 @@
             <system:String x:Key="icon-merge">&#xE95F;</system:String>
             <system:String x:Key="icon-message">&#xE98F;</system:String>
             <system:String x:Key="icon-minimize">&#xE95E;</system:String>
+            <system:String x:Key="icon-minus">&#xE9D8;</system:String>
             <system:String x:Key="icon-mirror-horizontal">&#xE97F;</system:String>
             <system:String x:Key="icon-mirror-vertical">&#xE97C;</system:String>
             <system:String x:Key="icon-mouse">&#xE9D1;</system:String>
@@ -196,6 +198,7 @@
             <system:String x:Key="icon-text-pixel">&#xE9B4;</system:String>
             <system:String x:Key="icon-text-round">&#xE9B9;</system:String>
             <system:String x:Key="icon-text-underline">&#xE9B8;</system:String>
+            <system:String x:Key="icon-time-stabilizer">&#xE9D6;</system:String>
             <system:String x:Key="icon-timeline">&#xE9A3;</system:String>
             <system:String x:Key="icon-tool">&#xE977;</system:String>
             <system:String x:Key="icon-train">&#xE9C3;</system:String>

+ 3 - 0
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml.cs

@@ -52,6 +52,7 @@ public static partial class PixiPerfectIcons
     public const string Database = "\uE93D";
     public const string Deselect = "\uE93E";
     public const string Discord = "\uE911";
+    public const string DistanceStabilizer = "\uE9D7";
     public const string Dot = "\uE983";
     public const string Download = "\uE99F";
     public const string DownloadCloud = "\uE989";
@@ -124,6 +125,7 @@ public static partial class PixiPerfectIcons
     public const string Merge = "\uE95F";
     public const string Message = "\uE98F";
     public const string Minimize = "\uE95E";
+    public const string Minus = "\uE9D8";
     public const string MirrorHorizontal = "\uE97F";
     public const string MirrorVertical = "\uE97C";
     public const string Mouse = "\uE9D1";
@@ -192,6 +194,7 @@ public static partial class PixiPerfectIcons
     public const string TextPixel = "\uE9B4";
     public const string TextRound = "\uE9B9";
     public const string TextUnderline = "\uE9B8";
+    public const string TimeStabilizer = "\uE9D6";
     public const string Timeline = "\uE9A3";
     public const string Tool = "\uE977";
     public const string Train = "\uE9C3";

+ 3 - 0
src/PixiEditor.UI.Common/Fonts/defs.svg

@@ -237,4 +237,7 @@
 <glyph unicode="&#xe9d3;" glyph-name="link1" data-tags="link" d="M392.491 379.776c-14.080 18.859-10.24 45.611 8.619 59.733 18.859 14.080 45.611 10.24 59.733-8.619 32.171-43.051 82.901-68.437 136.661-68.437 45.269 0 88.704 18.005 120.704 50.005l127.659 127.659c30.592 31.787 47.744 74.24 47.744 118.4 0 93.611-77.056 170.667-170.667 170.667-44.16 0-86.656-17.152-118.443-47.787l-73.088-72.661c-16.683-16.597-43.733-16.512-60.331 0.171s-16.512 43.733 0.171 60.331l73.813 73.387c47.744 46.080 111.531 71.893 177.877 71.893 140.416 0 256-115.584 256-256 0-66.347-25.813-130.133-71.893-177.877l-128.512-128.512c-48-48-113.152-75.008-181.035-75.008-80.64 0-156.715 38.101-205.013 102.656zM631.509 516.224c14.080-18.859 10.24-45.611-8.619-59.733-18.859-14.080-45.611-10.24-59.733 8.619-32.171 43.051-82.901 68.437-136.661 68.437-45.269 0-88.704-18.005-120.704-50.005l-127.659-127.659c-30.592-31.787-47.744-74.24-47.744-118.4 0-93.611 77.056-170.667 170.667-170.667 44.16 0 86.613 17.152 118.4 47.744l72.619 72.619c16.64 16.64 43.691 16.64 60.331 0s16.64-43.691 0-60.331l-73.472-73.472c-47.744-46.080-111.531-71.893-177.877-71.893-140.416 0-256 115.584-256 256 0 66.347 25.813 130.133 71.893 177.877l128.512 128.512c48 48 113.152 75.008 181.035 75.008 80.64 0 156.715-38.101 205.013-102.656z" />
 <glyph unicode="&#xe9d4;" glyph-name="chain-break" data-tags="unlink" d="M877.227 467.968v-0.341l30.080 12.416-73.387-72.96c-16.683-16.597-43.733-16.512-60.331 0.171s-16.512 43.733 0.171 60.331l67.883 67.499c1.195 1.707 2.56 3.328 4.011 4.821 65.024 67.371 63.189 176.256-4.053 241.365-65.749 63.36-171.264 63.403-237.056 0.171l-73.131-72.704c-16.683-16.597-43.733-16.512-60.331 0.171s-16.512 43.733 0.171 60.331l73.856 73.429c98.645 95.147 257.109 95.147 355.755 0l0.085-0.085c100.821-97.621 103.595-260.907 6.144-361.899l-29.867-12.715zM190.421 488.832c16.64 16.64 43.691 16.64 60.331 0s16.64-43.691 0-60.331l-72.789-72.789c-64.64-67.371-62.677-175.957 4.437-240.981 65.749-63.36 171.221-63.403 237.013-0.213l72.661 72.661c16.64 16.64 43.691 16.64 60.331 0s16.64-43.691 0-60.331l-73.515-73.515c-98.645-95.147-257.109-95.147-355.755 0l-0.085 0.085c-100.821 97.621-103.595 260.907-6.144 361.899l73.515 73.515zM298.667 874.667c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-128c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v128zM85.333 576c-23.552 0-42.667 19.115-42.667 42.667s19.115 42.667 42.667 42.667h128c23.552 0 42.667-19.115 42.667-42.667s-19.115-42.667-42.667-42.667h-128zM640 149.333c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-128c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v128zM810.667 234.667c-23.552 0-42.667 19.115-42.667 42.667s19.115 42.667 42.667 42.667h128c23.552 0 42.667-19.115 42.667-42.667s-19.115-42.667-42.667-42.667h-128z" />
 <glyph unicode="&#xe9d5;" glyph-name="ethernet-port" data-tags="ethernet-port" d="M640 64h-256c-11.307 0-22.187 4.48-30.165 12.501l-115.499 115.499h-67.669c-70.229 0-128 57.771-128 128v384c0 70.229 57.771 128 128 128h682.667c70.229 0 128-57.771 128-128v-384c0-70.229-57.771-128-128-128h-67.669l-115.499-115.499c-7.979-8.021-18.859-12.501-30.165-12.501zM622.336 149.333l115.499 115.499c7.979 8.021 18.859 12.501 30.165 12.501h85.333c23.424 0 42.667 19.243 42.667 42.667v384c0 23.424-19.243 42.667-42.667 42.667h-682.667c-23.424 0-42.667-19.243-42.667-42.667v-384c0-23.424 19.243-42.667 42.667-42.667h85.333c11.307 0 22.187-4.48 30.165-12.501l115.499-115.499h220.672zM213.333 618.667c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-42.667c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v42.667zM384 618.667c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-42.667c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v42.667zM554.667 618.667c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-42.667c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v42.667zM725.333 618.667c0 23.552 19.115 42.667 42.667 42.667s42.667-19.115 42.667-42.667v-42.667c0-23.552-19.115-42.667-42.667-42.667s-42.667 19.115-42.667 42.667v42.667z" />
+<glyph unicode="&#xe9d6;" glyph-name="time-stabilizer" data-tags="TimeStabilizer" d="M725.333 277.333c0 117.82-95.514 213.333-213.333 213.333s-213.333-95.514-213.333-213.333c0-117.82 95.513-213.333 213.333-213.333s213.333 95.514 213.333 213.333zM469.333 362.667c0 23.565 19.102 42.667 42.667 42.667s42.667-19.102 42.667-42.667v-70.165l48.209-30.17c19.981-12.489 26.074-38.848 13.581-58.833-12.489-19.972-38.81-26.022-58.79-13.542l-68.292 42.667c-12.463 7.799-20.036 21.466-20.041 36.169v93.875zM810.667 277.333c0-164.949-133.717-298.667-298.667-298.667s-298.667 133.717-298.667 298.667c0 164.949 133.718 298.667 298.667 298.667s298.667-133.717 298.667-298.667zM938.667 789.333c23.565 0 42.667-19.103 42.667-42.667s-19.102-42.667-42.667-42.667h-853.333c-23.564 0-42.667 19.103-42.667 42.667s19.103 42.667 42.667 42.667h853.333zM128 832c47.128 0 85.333-38.205 85.333-85.333s-38.205-85.333-85.333-85.333c-47.128 0-85.333 38.205-85.333 85.333s38.205 85.333 85.333 85.333zM896 832c47.128 0 85.333-38.205 85.333-85.333s-38.205-85.333-85.333-85.333c-47.128 0-85.333 38.205-85.333 85.333s38.205 85.333 85.333 85.333z" />
+<glyph unicode="&#xe9d7;" glyph-name="distance-stabilizer" data-tags="DistanceStabilizer" d="M896 320c0 23.565-19.102 42.667-42.667 42.667h-42.667v-85.333c0-23.561-19.102-42.667-42.667-42.667s-42.667 19.106-42.667 42.667v85.333h-85.333v-85.333c0-23.561-19.102-42.667-42.667-42.667s-42.667 19.106-42.667 42.667v85.333h-85.333v-85.333c0-23.561-19.102-42.667-42.667-42.667s-42.667 19.106-42.667 42.667v85.333h-85.333v-85.333c0-23.561-19.103-42.667-42.667-42.667s-42.667 19.106-42.667 42.667v85.333h-42.667c-23.564 0-42.667-19.102-42.667-42.667v-170.667c0-23.561 19.103-42.667 42.667-42.667h682.667c23.565 0 42.667 19.106 42.667 42.667v170.667zM90.75 694.877c266.396 177.596 615.456 169.379 873.21-20.542 18.97-13.977 23.014-40.655 9.041-59.625-13.978-18.969-40.657-23.016-59.627-9.041-228.838 168.619-538.776 175.884-775.29 18.208l-26.083-17.375c-19.606-13.065-46.097-7.77-59.167 11.833s-7.767 46.094 11.833 59.167l26.083 17.375zM981.333 149.333c0-70.69-57.306-128-128-128h-682.667c-70.692 0-128 57.31-128 128v170.667c0 70.694 57.308 128 128 128h682.667c70.694 0 128-57.306 128-128v-170.667zM85.333 746.667c47.128 0 85.333-38.205 85.333-85.333s-38.205-85.333-85.333-85.333c-47.128 0-85.333 38.205-85.333 85.333s38.205 85.333 85.333 85.333zM938.667 746.667c47.128 0 85.333-38.205 85.333-85.333s-38.205-85.333-85.333-85.333c-47.128 0-85.333 38.205-85.333 85.333s38.205 85.333 85.333 85.333z" />
+<glyph unicode="&#xe9d8;" glyph-name="minus" data-tags="minus" d="M810.667 490.667c23.565 0 42.667-19.102 42.667-42.667s-19.102-42.667-42.667-42.667h-597.333c-23.564 0-42.667 19.102-42.667 42.667s19.103 42.667 42.667 42.667h597.333z" />
 </font></defs></svg>

+ 3 - 3
src/PixiEditor/Models/Handlers/Toolbars/IBrushToolbar.cs

@@ -20,12 +20,12 @@ internal interface IBrushToolbar : IToolbar, IToolSizeToolbar
 public enum StabilizationMode
 {
     [Description("NONE_STABILIZATION")]
-    [IconName("icon-sun")]
+    [IconName(PixiPerfectIcons.Minus)]
     None,
     [Description("TIME_BASED_STABILIZATION")]
-    [IconName("icon-clock")]
+    [IconName(PixiPerfectIcons.TimeStabilizer)]
     TimeBased,
     [Description("DISTANCE_BASED_STABILIZATION")]
-    [IconName("icon-circle")]
+    [IconName(PixiPerfectIcons.DistanceStabilizer)]
     CircleRope
 }

+ 0 - 1
src/PixiEditor/ViewModels/SubViewModels/IoViewModel.cs

@@ -22,7 +22,6 @@ using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.ViewModels.Document;
 using PixiEditor.ViewModels.Tools.Tools;
 using PixiEditor.Views;
-using SharpHook;
 
 namespace PixiEditor.ViewModels.SubViewModels;
 #nullable enable