Merge fixes

src/PixiEditor/Helpers/Extensions/EnumHelpers.cs → src/PixiEditor.Extensions/Helpers/EnumHelpers.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.Extensions.Helpers;
 
-internal static class EnumHelpers
+public static class EnumHelpers
 {
     public static IEnumerable<T> GetFlags<T>(this T e)
         where T : Enum

src/PixiEditor.Extensions/UI/Translator.cs

@@ -3,6 +3,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Helpers;
 using PixiEditor.Views;
 
 namespace PixiEditor.Extensions.UI;

src/PixiEditor.Platform.Standalone/StandaloneAdditionalContentProvider.cs

@@ -4,20 +4,12 @@ public sealed class StandaloneAdditionalContentProvider : IAdditionalContentProv
 {
     public bool IsContentInstalled(AdditionalContentProduct product)
     {
-        if(!PlatformHasContent(product)) return false;
-#if DEBUG
-        return true;
-#else
+        //if(!PlatformHasContent(product)) return false;
         return false;
-#endif
     }
 
     public bool PlatformHasContent(AdditionalContentProduct product)
     {
-#if DEBUG
-        return true;
-#else
         return false;
-#endif
     }
 }

src/PixiEditor/Models/DataHolders/KeyCombination.cs

@@ -5,6 +5,7 @@ using System.Globalization;
 using System.Text;
 using System.Windows.Input;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Helpers;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Models.DataHolders;

src/PixiEditor/Models/Services/NewsFeed/News.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Newtonsoft.Json;
+using PixiEditor.Extensions.Helpers;
 
 namespace PixiEditor.Models.Services.NewsFeed;
 

src/PixiEditor/Styles/ComboBoxDarkStyle.xaml

@@ -3,7 +3,8 @@
                     xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
                     xmlns:controls="clr-namespace:PixiEditor.Views.UserControls"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:views="clr-namespace:PixiEditor.Views">
+                    xmlns:views="clr-namespace:PixiEditor.Views"
+                    xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions">
 
     <SolidColorBrush x:Key="ComboBox.Static.Background" Color="#252525" />
     <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#2F2F37" />
@@ -236,7 +237,7 @@
         <Setter Property="ItemTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <TextBlock views:Translator.Enum="{Binding}"/>
+                    <TextBlock ui:Translator.Enum="{Binding}"/>
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -247,7 +248,7 @@
                         <Setter.Value>
                             <ControlTemplate TargetType="{x:Type ComboBoxItem}">
                                 <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0,1">
-                                    <TextBlock views:Translator.Enum="{Binding}" />
+                                    <TextBlock ui:Translator.Enum="{Binding}" />
                                 </Border>
                                 <ControlTemplate.Triggers>
                                     <Trigger Property="IsMouseOver" Value="False">

src/PixiEditor/ViewModels/SubViewModels/Document/TransformOverlays/DocumentTransformViewModel.cs

@@ -2,6 +2,7 @@
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Helpers;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;

src/PixiEditor/ViewModels/SubViewModels/Main/ColorsViewModel.cs

@@ -339,9 +339,9 @@ internal class ColorsViewModel : SubViewModel<ViewModelMain>
     {
         var palette = Owner.DocumentManagerSubViewModel.ActiveDocument.Palette;
 
-        if (!palette.Contains(PrimaryColor))
+        if (!palette.Contains(PrimaryColor.ToPaletteColor()))
         {
-            palette.Add(PrimaryColor);
+            palette.Add(PrimaryColor.ToPaletteColor());
         }
     }
 

src/PixiEditor/ViewModels/SubViewModels/Tools/ToolSettings/Settings/EnumSetting.cs

@@ -2,6 +2,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
+using PixiEditor.Extensions.Helpers;
 using PixiEditor.Extensions.UI;
 using PixiEditor.Helpers.Extensions;
 using PixiEditor.Views;

src/PixiEditor/Views/Dialogs/AboutPopup.xaml

@@ -128,7 +128,7 @@
                             Style="{StaticResource SocialMediaButton}" Tag="#FF4500" ui:Translator.TooltipKey="REDDIT"
                             Content="/Images/SocialMedia/RedditIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://store.steampowered.com/app/2218560"
-                            Style="{StaticResource SocialMediaButton}" Tag="#00adee" views:Translator.TooltipKey="STEAM"
+                            Style="{StaticResource SocialMediaButton}" Tag="#00adee" ui:Translator.TooltipKey="STEAM"
                             Content="/Images/SocialMedia/SteamIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
                             Style="{StaticResource SocialMediaButton}" Tag="Black" ui:Translator.TooltipKey="GITHUB"

src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml

@@ -252,13 +252,13 @@
                             Style="{StaticResource SocialMediaButton}" Tag="#e3002d"
                             Content="/Images/SocialMedia/WebsiteIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://discord.gg/tzkQFDkqQS"
-                            Style="{StaticResource SocialMediaButton}" Tag="#5865F2" views:Translator.TooltipKey="DISCORD"
+                            Style="{StaticResource SocialMediaButton}" Tag="#5865F2" ui:Translator.TooltipKey="DISCORD"
                             Content="/Images/SocialMedia/DiscordIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://reddit.com/r/PixiEditor"
                             Style="{StaticResource SocialMediaButton}" Tag="#FF4500" ui:Translator.TooltipKey="REDDIT"
                             Content="/Images/SocialMedia/RedditIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://store.steampowered.com/app/2218560"
-                            Style="{StaticResource SocialMediaButton}" Tag="#00adee" views:Translator.TooltipKey="STEAM"
+                            Style="{StaticResource SocialMediaButton}" Tag="#00adee" ui:Translator.TooltipKey="STEAM"
                             Content="/Images/SocialMedia/SteamIcon.png"/>
                     <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
                             Style="{StaticResource SocialMediaButton}" Tag="Black" ui:Translator.TooltipKey="GITHUB"

src/PixiEditor/Views/Dialogs/SettingsWindow.xaml

@@ -148,11 +148,11 @@
                                  Height="21" MaxSize="9999" HorizontalAlignment="Left"/>
                 </StackPanel>
 
-                <Label Style="{StaticResource SettingsHeader}" d:Content="Tools" views:Translator.Key="TOOLS"/>
+                <Label Style="{StaticResource SettingsHeader}" d:Content="Tools" ui:Translator.Key="TOOLS"/>
                 
                 <StackPanel Margin="27 0" Orientation="Horizontal">
                     <Label Style="{StaticResource SettingsText}" Margin="0,0,7,0"
-                           views:Translator.Key="RIGHT_CLICK_MODE"/>
+                           ui:Translator.Key="RIGHT_CLICK_MODE"/>
                     <ComboBox SelectedItem="{Binding RightClickMode, Source={vm:MainVM ToolsSVM}, Mode=TwoWay}"
                               ItemsSource="{helpers:Enum enums:RightClickMode}"
                               Width="160" Style="{StaticResource TranslatedEnum}"/>

src/PixiEditor/Views/MainWindow.xaml

@@ -260,7 +260,7 @@
                             ui1:Translator.Key="INVERT"
                             cmds:Menu.Command="PixiEditor.Selection.InvertSelection" />
                         <MenuItem
-                            views:Translator.Key="CROP_TO_SELECTION"
+                            ui1:Translator.Key="CROP_TO_SELECTION"
                             cmds:Menu.Command="PixiEditor.Selection.CropToSelection" />
                         <Separator/>
                         <MenuItem ui1:Translator.Key="SELECTION_TO_MASK">

src/PixiEditor/Views/UserControls/AnchorPointPicker.xaml

@@ -20,28 +20,28 @@
             <ColumnDefinition Width="26" />
         </Grid.ColumnDefinitions>
         <ToggleButton IsChecked="True" Checked="ToggleButton_Checked" PreviewMouseLeftButtonDown="ToggleButton_Click" Margin="0.25"
-                      Style="{DynamicResource AnchorPointToggleButtonStyle}" views:Translator.TooltipKey="TOP_LEFT" Grid.Row="0"
+                      Style="{DynamicResource AnchorPointToggleButtonStyle}" ui:Translator.TooltipKey="TOP_LEFT" Grid.Row="0"
                       Grid.Column="0" BorderBrush="Black">
             <ToggleButton.Background>
                 <ImageBrush ImageSource="../../Images/AnchorDot.png" />
             </ToggleButton.Background>
         </ToggleButton>
         <ToggleButton Checked="ToggleButton_Checked" PreviewMouseLeftButtonDown="ToggleButton_Click" Margin="0.25"
-                      Style="{DynamicResource AnchorPointToggleButtonStyle}" Grid.Row="0" views:Translator.TooltipKey="TOP_CENTER"
+                      Style="{DynamicResource AnchorPointToggleButtonStyle}" Grid.Row="0" ui:Translator.TooltipKey="TOP_CENTER"
                       Grid.Column="1" BorderBrush="Black">
             <ToggleButton.Background>
                 <ImageBrush ImageSource="../../Images/AnchorDot.png" />
             </ToggleButton.Background>
         </ToggleButton>
         <ToggleButton Checked="ToggleButton_Checked" PreviewMouseLeftButtonDown="ToggleButton_Click" Margin="0.25"
-                      Style="{DynamicResource AnchorPointToggleButtonStyle}" views:Translator.TooltipKey="TOP_RIGHT" Grid.Row="0"
+                      Style="{DynamicResource AnchorPointToggleButtonStyle}" ui:Translator.TooltipKey="TOP_RIGHT" Grid.Row="0"
                       Grid.Column="2" BorderBrush="Black">
             <ToggleButton.Background>
                 <ImageBrush ImageSource="../../Images/AnchorDot.png" />
             </ToggleButton.Background>
         </ToggleButton>
         <ToggleButton Checked="ToggleButton_Checked" PreviewMouseLeftButtonDown="ToggleButton_Click" Margin="0.25"
-                      Style="{DynamicResource AnchorPointToggleButtonStyle}" Grid.Row="1" views:Translator.TooltipKey="MIDDLE_LEFT"
+                      Style="{DynamicResource AnchorPointToggleButtonStyle}" Grid.Row="1" ui:Translator.TooltipKey="MIDDLE_LEFT"
                       Grid.Column="0" BorderBrush="Black">
             <ToggleButton.Background>
                 <ImageBrush ImageSource="../../Images/AnchorDot.png" />