Merge remote-tracking branch 'origin/master' into crash-fixes

PixiEditor · May 6, 2023 · 42d1e2d · 42d1e2d
2 parents 4f7a66f + 6eeb98e
commit 42d1e2d
Show file tree

Hide file tree

Showing 193 changed files with 4,517 additions and 1,182 deletions.
diff --git a/README.md b/README.md
@@ -22,8 +22,7 @@ Want to create beautiful pixel art for your games? PixiEditor can help you! Our
 
 Have you ever used Photoshop or Gimp? Reinventing the wheel is unnecessary, we wanted users to get familiar with the tool quickly and with ease. 
 
-![](https://user-images.githubusercontent.com/45312141/146670495-ae521a18-a89e-4e94-9317-6838b51407fa.png)
-
+![](https://user-images.githubusercontent.com/45312141/235351211-e00bcaea-9c63-4ecd-a2ee-e4fb2b2c9651.png)
 
 ### Fast
 
@@ -83,7 +82,7 @@ Struggling with something? You can find support in a few places:
 
 ### Software Requirements
 
-* .NET 7.0.104 (7.0.202 is broken! Make sure to use 7.0.104)
+* .NET 7
 
 ### Instructions
 

diff --git a/src/ChunkyImageLib/ChunkyImageLib.csproj b/src/ChunkyImageLib/ChunkyImageLib.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.ChangeableDocument/Enums/SelectionMode.cs b/src/PixiEditor.ChangeableDocument/Enums/SelectionMode.cs
@@ -1,5 +1,14 @@
-namespace PixiEditor.ChangeableDocument.Enums;
+using System.ComponentModel;
+
+namespace PixiEditor.ChangeableDocument.Enums;
 public enum SelectionMode
 {
-    New, Add, Subtract, Intersect
+    [Description("NEW")]
+    New,
+    [Description("ADD")]
+    Add,
+    [Description("SUBTRACT")]
+    Subtract,
+    [Description("INTERSECT")]
+    Intersect
 }
diff --git a/src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj b/src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.DrawingApi.Core/ColorsImpl/Color.cs b/src/PixiEditor.DrawingApi.Core/ColorsImpl/Color.cs
@@ -208,5 +208,14 @@ public static bool TryParse(string hexString, out Color color)
           return false;
       }
     }
+
+    /// <summary>
+    ///     Returns hex string representation of the color.
+    /// </summary>
+    /// <returns>Color string in format: AARRGGBB</returns>
+    public string? ToHex()
+    {
+        return this == Empty ? null : $"{this._colorValue:X8}";
+    }
   }
 }
diff --git a/src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj b/src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj
@@ -7,6 +7,7 @@
         <LangVersion>10</LangVersion>
         <Configurations>Debug;Release;Steam;DevRelease</Configurations>
         <Platforms>AnyCPU;x64;x86</Platforms>
+      <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj b/src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj
@@ -6,6 +6,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Configurations>Debug;Release;Steam;DevRelease</Configurations>
         <Platforms>AnyCPU;x64;x86</Platforms>
+      <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.MSIX/Package.appxmanifest b/src/PixiEditor.MSIX/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="56069PixiEditorOrganizati.PixiEditor"
     Publisher="CN=0AFA75AD-56A3-481D-B5E4-D3C6274DD38A"
-    Version="1.0.0.0" />
+    Version="1.0.3.0" />
 
   <Properties>
     <DisplayName>PixiEditor</DisplayName>

diff --git a/src/PixiEditor.MSIX/PixiEditor.MSIX.wapproj b/src/PixiEditor.MSIX/PixiEditor.MSIX.wapproj
@@ -59,7 +59,7 @@
     <PackageCertificateKeyFile>PixiEditor.MSIX_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>

diff --git a/src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj b/src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>net7.0</TargetFramework>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj b/src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj
@@ -7,6 +7,7 @@
     <WarningsAsErrors>Nullable</WarningsAsErrors>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor/App.xaml.cs b/src/PixiEditor/App.xaml.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows;
+using PixiEditor.Localization;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.Dialogs;
@@ -110,7 +111,9 @@ protected override void OnSessionEnding(SessionEndingCancelEventArgs e)
 
         if (vm.DocumentManagerSubViewModel.Documents.Any(x => !x.AllChangesSaved))
         {
-            ConfirmationType confirmation = ConfirmationDialog.Show($"{e.ReasonSessionEnding} with unsaved data. Are you sure?", $"{e.ReasonSessionEnding}");
+            ConfirmationType confirmation = ConfirmationDialog.Show(
+                new LocalizedString("SESSION_UNSAVED_DATA", e.ReasonSessionEnding),
+                $"{e.ReasonSessionEnding}");
             e.Cancel = confirmation != ConfirmationType.Yes;
         }
     }

diff --git a/src/PixiEditor/Data/Localization/Languages/ar.json b/src/PixiEditor/Data/Localization/Languages/ar.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/PixiEditor/Data/Localization/Languages/cs.json b/src/PixiEditor/Data/Localization/Languages/cs.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/PixiEditor/Data/Localization/Languages/de.json b/src/PixiEditor/Data/Localization/Languages/de.json
@@ -0,0 +1,2 @@
+{
+}