Browse Source

Wip new logo

flabbet 1 year ago
parent
commit
5431e988ef

BIN
src/PixiEditor.AvaloniaUI/Images/PixiEditorLogo.png


File diff suppressed because it is too large
+ 0 - 0
src/PixiEditor.AvaloniaUI/Images/PixiEditorLogo.svg


+ 38 - 0
src/PixiEditor.AvaloniaUI/Images/PixiEditorLogoWithName.svg

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 370 90" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Secondary" transform="matrix(0.251397,0,0,0.251397,0,0)">
+        <rect x="0" y="0" width="1920" height="1080" style="fill:none;"/>
+    </g>
+    <g transform="matrix(0.251397,0,0,0.251397,0,0)">
+        <g transform="matrix(1,0,0,1,-270,-362.433)">
+            <g>
+                <path d="M422.965,571.305L444.896,593.236C453.506,601.846 467.466,601.846 476.076,593.236L499.05,570.262L559.88,631.092L482.542,708.431C470.361,720.612 450.611,720.612 438.43,708.431L362.135,632.135L422.965,571.305Z" style="fill:url(#_Linear1);"/>
+                <path d="M494.899,574.413L513.722,555.59C522.332,546.98 522.332,533.02 513.722,524.41L492.138,502.827L552.969,441.996L628.917,517.944C641.098,530.125 641.098,549.875 628.917,562.056L555.73,635.243L494.899,574.413Z" style="fill:url(#_Linear2);"/>
+                <path d="M494.899,505.587L476.076,486.764C467.466,478.154 453.506,478.154 444.896,486.764L421.534,510.126L360.704,449.296L438.43,371.569C450.611,359.388 470.361,359.388 482.542,371.569L555.73,444.757L494.899,505.587Z" style="fill:url(#_Linear3);"/>
+                <path d="M426.073,574.413L292.055,708.431C286.206,714.28 278.272,717.567 270,717.567L270,552.92C270,544.648 273.286,536.714 279.135,530.864L365.243,444.757L426.073,505.587L407.251,524.41C398.641,533.02 398.641,546.98 407.251,555.59L426.073,574.413Z" style="fill:url(#_Linear4);"/>
+            </g>
+        </g>
+        <g transform="matrix(1,0,0,1,-270.399,-361.053)">
+            <path d="M785.298,575.306L785.298,609.909L756.254,609.909L756.254,484.408L810.578,484.408C821.813,484.408 831.495,486.231 839.622,489.876C847.75,493.522 854.025,498.751 858.447,505.564C862.87,512.377 865.081,520.504 865.081,529.947C865.081,539.27 862.87,547.338 858.447,554.151C854.025,560.963 847.75,566.193 839.622,569.838C831.495,573.484 821.813,575.306 810.578,575.306L785.298,575.306ZM785.298,551.641L808.964,551.641C817.929,551.641 824.622,549.728 829.044,545.903C833.467,542.079 835.678,536.76 835.678,529.947C835.678,523.014 833.467,517.636 829.044,513.811C824.622,509.986 817.929,508.074 808.964,508.074L785.298,508.074L785.298,551.641Z" style="fill:white;"/>
+            <rect x="885.52" y="513.452" width="27.969" height="96.456" style="fill:white;"/>
+            <path d="M916.013,479.573C918.683,482.243 918.683,486.572 916.013,489.243C912.523,492.733 907.829,497.427 904.339,500.917C901.669,503.587 897.34,503.587 894.67,500.917C891.179,497.427 886.486,492.733 882.995,489.243C880.325,486.572 880.325,482.243 882.995,479.573C886.486,476.083 891.179,471.389 894.67,467.899C897.34,465.229 901.669,465.229 904.339,467.899C907.829,471.389 912.523,476.083 916.013,479.573Z" style="fill:white;"/>
+            <path d="M1076.65,479.573C1079.32,482.243 1079.32,486.572 1076.65,489.243C1073.16,492.733 1068.47,497.427 1064.98,500.917C1062.31,503.587 1057.98,503.587 1055.31,500.917C1051.82,497.427 1047.12,492.733 1043.63,489.243C1040.96,486.572 1040.96,482.243 1043.63,479.573C1047.12,476.083 1051.82,471.389 1055.31,467.899C1057.98,465.229 1062.31,465.229 1064.98,467.899C1068.47,471.389 1073.16,476.083 1076.65,479.573Z" style="fill:white;"/>
+            <path d="M1374.27,479.573C1376.94,482.243 1376.94,486.572 1374.27,489.243C1370.78,492.733 1366.09,497.427 1362.6,500.917C1359.93,503.587 1355.6,503.587 1352.93,500.917C1349.44,497.427 1344.74,492.733 1341.25,489.243C1338.58,486.572 1338.58,482.243 1341.25,479.573C1344.74,476.083 1349.44,471.389 1352.93,467.899C1355.6,465.229 1359.93,465.229 1362.6,467.899C1366.09,471.389 1370.78,476.083 1374.27,479.573Z" style="fill:white;"/>
+            <path d="M979.679,580.364L957.772,609.909L927.294,609.909L964.4,561.255L928.549,513.452L959.924,513.452L980.385,541.622L1001.34,513.452L1031.1,513.452L995.221,560.623L1032.54,609.909L1000.8,609.909L979.679,580.364Z" style="fill:white;"/>
+            <rect x="1046.16" y="513.452" width="27.969" height="96.456" style="fill:white;"/>
+            <path d="M1130.96,557.557L1130.96,586.602L1199.27,586.602L1199.27,609.909L1102.1,609.909L1102.1,484.408L1196.94,484.408L1196.94,507.715L1130.96,507.715L1130.96,534.967L1189.23,534.967L1189.23,557.557L1130.96,557.557Z" style="fill:white;"/>
+            <path d="M1291.25,598.771C1288.86,601.686 1286.08,604.084 1282.91,605.965C1276.88,609.55 1269.62,611.343 1261.13,611.343C1252.05,611.343 1243.86,609.281 1236.57,605.158C1229.28,601.034 1223.51,595.267 1219.27,587.857C1215.02,580.446 1212.9,571.721 1212.9,561.681C1212.9,551.521 1215.02,542.736 1219.27,535.325C1223.51,527.915 1229.28,522.178 1236.57,518.114C1243.86,514.05 1252.05,512.018 1261.13,512.018C1269.26,512.018 1276.37,513.811 1282.46,517.397C1285.27,519.044 1287.78,521.082 1290,523.511L1290,476.878L1317.96,476.878L1317.96,609.909L1291.25,609.909L1291.25,598.771ZM1265.97,588.394C1270.51,588.394 1274.64,587.319 1278.34,585.167C1282.05,583.016 1285.01,579.938 1287.22,575.934C1289.43,571.93 1290.53,567.179 1290.53,561.681C1290.53,556.063 1289.43,551.282 1287.22,547.338C1285.01,543.393 1282.05,540.345 1278.34,538.194C1274.64,536.043 1270.51,534.967 1265.97,534.967C1261.31,534.967 1257.13,536.043 1253.42,538.194C1249.72,540.345 1246.76,543.393 1244.55,547.338C1242.34,551.282 1241.23,556.063 1241.23,561.681C1241.23,567.179 1242.34,571.93 1244.55,575.934C1246.76,579.938 1249.72,583.016 1253.42,585.167C1257.13,587.319 1261.31,588.394 1265.97,588.394Z" style="fill:white;"/>
+            <rect x="1343.78" y="513.452" width="27.969" height="96.456" style="fill:white;"/>
+            <path d="M1401.15,537.118L1386.27,537.118L1386.27,515.604L1401.15,515.604L1401.15,492.117L1429.12,492.117L1429.12,515.604L1453.14,515.604L1453.14,537.118L1429.12,537.118L1429.12,576.382C1429.12,580.446 1430.19,583.584 1432.35,585.795C1434.5,588.006 1437.43,589.112 1441.13,589.112C1445.55,589.112 1449.32,587.916 1452.43,585.526L1459.96,605.247C1457.09,607.279 1453.65,608.803 1449.65,609.819C1445.64,610.835 1441.49,611.343 1437.19,611.343C1425.83,611.343 1416.99,608.445 1410.65,602.648C1404.32,596.851 1401.15,588.215 1401.15,576.741L1401.15,537.118Z" style="fill:white;"/>
+            <path d="M1518.58,611.343C1508.3,611.343 1499.19,609.192 1491.24,604.889C1483.29,600.586 1477.02,594.699 1472.41,587.229C1467.81,579.759 1465.51,571.243 1465.51,561.681C1465.51,551.999 1467.81,543.423 1472.41,535.953C1477.02,528.483 1483.29,522.626 1491.24,518.383C1499.19,514.14 1508.3,512.018 1518.58,512.018C1528.74,512.018 1537.82,514.14 1545.83,518.383C1553.84,522.626 1560.11,528.453 1564.66,535.863C1569.2,543.274 1571.47,551.88 1571.47,561.681C1571.47,571.243 1569.2,579.759 1564.66,587.229C1560.11,594.699 1553.84,600.586 1545.83,604.889C1537.82,609.192 1528.74,611.343 1518.58,611.343ZM1518.58,588.394C1523.24,588.394 1527.42,587.319 1531.13,585.167C1534.84,583.016 1537.76,579.938 1539.91,575.934C1542.07,571.93 1543.14,567.179 1543.14,561.681C1543.14,556.063 1542.07,551.282 1539.91,547.338C1537.76,543.393 1534.84,540.345 1531.13,538.194C1527.42,536.043 1523.24,534.967 1518.58,534.967C1513.92,534.967 1509.74,536.043 1506.03,538.194C1502.32,540.345 1499.37,543.393 1497.15,547.338C1494.94,551.282 1493.84,556.063 1493.84,561.681C1493.84,567.179 1494.94,571.93 1497.15,575.934C1499.37,579.938 1502.32,583.016 1506.03,585.167C1509.74,587.319 1513.92,588.394 1518.58,588.394Z" style="fill:white;fill-rule:nonzero;"/>
+            <path d="M1616.83,526.106C1619.47,522.499 1622.81,519.566 1626.87,517.307C1633.2,513.781 1640.91,512.018 1650,512.018L1650,537.835C1648.8,537.716 1647.73,537.626 1646.77,537.566C1645.82,537.507 1644.8,537.477 1643.72,537.477C1636.07,537.477 1629.89,539.658 1625.17,544.021C1620.45,548.383 1618.09,555.167 1618.09,564.37L1618.09,609.909L1590.12,609.909L1590.12,513.452L1616.83,513.452L1616.83,526.106Z" style="fill:white;"/>
+        </g>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-86.2056,-86.2056,86.2056,-86.2056,460.486,650.538)"><stop offset="0" style="stop-color:rgb(223,0,44);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(127,0,25);stop-opacity:1"/></linearGradient>
+        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-153.164,165.444,-165.444,-153.164,607.19,496.217)"><stop offset="0" style="stop-color:rgb(203,17,51);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(125,0,23);stop-opacity:1"/></linearGradient>
+        <linearGradient id="_Linear3" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(192.902,188.071,-188.071,192.902,411.153,398.846)"><stop offset="0" style="stop-color:rgb(189,6,37);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(105,0,18);stop-opacity:1"/></linearGradient>
+        <linearGradient id="_Linear4" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(251.854,-251.854,251.854,251.854,270,672.994)"><stop offset="0" style="stop-color:rgb(155,8,31);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(79,0,12);stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>

BIN
src/PixiEditor.AvaloniaUI/Images/favicon.ico


+ 2 - 1
src/PixiEditor.AvaloniaUI/Models/IO/Paths.cs

@@ -8,7 +8,8 @@ public static class Paths
     public static string DataFullPath { get; } = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Data");
     public static string DataFullPath { get; } = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Data");
 
 
     public static string ExtensionPackagesPath { get; } = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Extensions");
     public static string ExtensionPackagesPath { get; } = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Extensions");
-    public static string UserExtensionsPath { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), 
+    public static string UserExtensionsPath { get; } = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), 
         "PixiEditor", "Extensions");
         "PixiEditor", "Extensions");
 
 
     public static string PathToPalettesFolder { get; } = Path.Join(
     public static string PathToPalettesFolder { get; } = Path.Join(

+ 1 - 0
src/PixiEditor.AvaloniaUI/PixiEditor.AvaloniaUI.csproj

@@ -153,6 +153,7 @@
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0.18"/>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
     <PackageReference Include="ByteSize" Version="2.1.1"/>
     <PackageReference Include="ByteSize" Version="2.1.1"/>

+ 1 - 1
src/PixiEditor.AvaloniaUI/Views/Main/MainTitleBar.axaml

@@ -18,7 +18,7 @@
     <Grid>
     <Grid>
         <dialogs:DialogTitleBar 
         <dialogs:DialogTitleBar 
             DockPanel.Dock="Top"/>
             DockPanel.Dock="Top"/>
-        <Image DockPanel.Dock="Left" Margin="10, 0, 0, 0" HorizontalAlignment="Left" Source="/Images/PixiEditorLogo.png" Width="20" Height="20"/>
+        <Svg DockPanel.Dock="Left" Margin="10, 0, 0, 0" HorizontalAlignment="Left" Path="/Images/PixiEditorLogo.svg" Width="30" Height="30"/>
         <xaml:Menu
         <xaml:Menu
             Margin="40, 0, 0, 0"
             Margin="40, 0, 0, 0"
                 DockPanel.Dock="Left"
                 DockPanel.Dock="Left"

+ 1 - 4
src/PixiEditor.AvaloniaUI/Views/Windows/HelloTherePopup.axaml

@@ -78,10 +78,7 @@
                     </CheckBox>
                     </CheckBox>
                     </Grid>
                     </Grid>
                     <StackPanel Grid.Row="0" HorizontalAlignment="Center">
                     <StackPanel Grid.Row="0" HorizontalAlignment="Center">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="avares://PixiEditor.UI.Common/Assets/PixiEditorLogo.png" Height="40" VerticalAlignment="Center"/>
-                            <TextBlock FontSize="40" FontWeight="SemiBold" VerticalAlignment="Center" Margin="10,0,0,0">PixiEditor</TextBlock>
-                        </StackPanel>
+                        <Svg Path="/Images/PixiEditorLogoWithName.svg" Height="60" VerticalAlignment="Top"/>
                         <TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Medium" Text="{Binding VersionText}"/>
                         <TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Medium" Text="{Binding VersionText}"/>
                     </StackPanel>
                     </StackPanel>
 
 

Some files were not shown because too many files changed in this diff