Browse Source

Moved localization to Extensions

Krzysztof Krysiński 2 years ago
parent
commit
bcbc5a3c25
62 changed files with 77 additions and 17 deletions
  1. 4 3
      src/PixiEditor.Extensions/Common/Localization/Language.cs
  2. 1 0
      src/PixiEditor.Extensions/Common/Localization/LanguageData.cs
  3. 2 2
      src/PixiEditor.Extensions/Common/Localization/LocalizationKeyShowMode.cs
  4. 3 5
      src/PixiEditor.Extensions/Common/Localization/LocalizedString.cs
  5. 2 1
      src/PixiEditor.Extensions/Palettes/PaletteListDataSource.cs
  6. 1 0
      src/PixiEditor.Extensions/PixiEditor.Extensions.csproj
  7. 1 0
      src/PixiEditor/App.xaml.cs
  8. 1 0
      src/PixiEditor/Exceptions/CorruptedFileException.cs
  9. 1 0
      src/PixiEditor/Exceptions/InvalidFileTypeException.cs
  10. 1 0
      src/PixiEditor/Exceptions/MissingFileException.cs
  11. 1 0
      src/PixiEditor/Exceptions/RecoverableException.cs
  12. 1 0
      src/PixiEditor/Helpers/Collections/ActionDisplayList.cs
  13. 1 0
      src/PixiEditor/Helpers/Converters/BlendModeToStringConverter.cs
  14. 1 0
      src/PixiEditor/Helpers/Converters/BoolToValueConverter.cs
  15. 1 0
      src/PixiEditor/Helpers/Converters/KeyToStringConverter.cs
  16. 1 0
      src/PixiEditor/Helpers/Converters/LangConverter.cs
  17. 1 0
      src/PixiEditor/Helpers/RegistryHelpers.cs
  18. 1 0
      src/PixiEditor/Models/AppExtensions/ExtensionException.cs
  19. 1 0
      src/PixiEditor/Models/AppExtensions/ExtensionLoader.cs
  20. 1 0
      src/PixiEditor/Models/Commands/Attributes/Commands/CommandAttribute.cs
  21. 2 1
      src/PixiEditor/Models/Commands/Attributes/Commands/FilterAttribute.cs
  22. 2 1
      src/PixiEditor/Models/Commands/Attributes/Commands/GroupAttribute.cs
  23. 1 0
      src/PixiEditor/Models/Commands/CommandController.cs
  24. 1 0
      src/PixiEditor/Models/DataHolders/KeyCombination.cs
  25. 2 1
      src/PixiEditor/Models/Dialogs/ConfirmationDialog.cs
  26. 2 1
      src/PixiEditor/Models/Dialogs/NoticeDialog.cs
  27. 2 1
      src/PixiEditor/Models/Dialogs/OptionDialog.cs
  28. 1 0
      src/PixiEditor/Models/Dialogs/OptionsDialog.cs
  29. 1 0
      src/PixiEditor/Models/DocumentModels/DocumentStructureHelper.cs
  30. 1 0
      src/PixiEditor/Models/IO/Importer.cs
  31. 1 0
      src/PixiEditor/Models/IO/PaletteParsers/JascPalFile/JascFileException.cs
  32. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Document/DocumentViewModel.cs
  33. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Document/TransformOverlays/DocumentTransformViewModel.cs
  34. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Main/ColorsViewModel.cs
  35. 3 0
      src/PixiEditor/ViewModels/SubViewModels/Main/DebugViewModel.cs
  36. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs
  37. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs
  38. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Main/UpdateViewModel.cs
  39. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/ToolSettings/Settings/Setting.cs
  40. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/BrightnessToolViewModel.cs
  41. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ColorPickerToolViewModel.cs
  42. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/EllipseToolViewModel.cs
  43. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/EraserToolViewModel.cs
  44. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/FloodFillToolViewModel.cs
  45. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LassoToolViewModel.cs
  46. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LineToolViewModel.cs
  47. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MagicWandToolViewModel.cs
  48. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveToolViewModel.cs
  49. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveViewportToolViewModel.cs
  50. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/PenToolViewModel.cs
  51. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RectangleToolViewModel.cs
  52. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RotateViewportToolViewModel.cs
  53. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/SelectToolViewModel.cs
  54. 1 0
      src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ZoomToolViewModel.cs
  55. 1 0
      src/PixiEditor/Views/Dialogs/AboutPopup.xaml.cs
  56. 1 0
      src/PixiEditor/Views/Dialogs/ConfirmationPopup.xaml.cs
  57. 2 1
      src/PixiEditor/Views/Dialogs/DebugDialogs/Localization/LocalizationDebugWindow.xaml
  58. 1 0
      src/PixiEditor/Views/Dialogs/ExportFilePopup.xaml.cs
  59. 1 0
      src/PixiEditor/Views/Dialogs/ImportShortcutTemplatePopup.xaml.cs
  60. 1 0
      src/PixiEditor/Views/Dialogs/PalettesBrowser.xaml.cs
  61. 1 0
      src/PixiEditor/Views/UserControls/KeyCombinationBox.xaml.cs
  62. 1 0
      src/PixiEditor/Views/UserControls/ShortcutBox.cs

+ 4 - 3
src/PixiEditor.Extensions/Common/Localization/Language.cs

@@ -1,12 +1,13 @@
 using System.Diagnostics;
 using System.Windows;
-using PixiEditor.Extensions.Common.Localization;
 
-namespace PixiEditor.Models.Localization;
+namespace PixiEditor.Extensions.Common.Localization;
 
 [DebuggerDisplay("{LanguageData.Name}, strings: {Locale.Count}")]
 public class Language
 {
+    public static bool FlipFlowDirection { get; set; } = false;
+
     private FlowDirection flowDirection;
     
     public LanguageData LanguageData { get; }
@@ -16,7 +17,7 @@ public class Language
     {
         get
         {
-            if (ViewModelMain.Current.DebugSubViewModel.ForceOtherFlowDirection)
+            if (FlipFlowDirection)
             {
                 return flowDirection switch
                 {

+ 1 - 0
src/PixiEditor.Extensions/Common/Localization/LanguageData.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using Newtonsoft.Json;
 
 namespace PixiEditor.Extensions.Common.Localization;
 

+ 2 - 2
src/PixiEditor/Models/Enums/LocalizationKeyShowMode.cs → src/PixiEditor.Extensions/Common/Localization/LocalizationKeyShowMode.cs

@@ -1,6 +1,6 @@
-namespace PixiEditor.Models.Enums;
+namespace PixiEditor.Extensions.Common.Localization;
 
-internal enum LocalizationKeyShowMode
+public enum LocalizationKeyShowMode
 {
     /// <summary>
     /// Shows just the value e.g. Open

+ 3 - 5
src/PixiEditor.Extensions/Common/Localization/LocalizedString.cs

@@ -1,10 +1,8 @@
-using PixiEditor.Extensions.Common.Localization;
-using PixiEditor.Models.Enums;
-
-namespace PixiEditor.Models.Localization;
+namespace PixiEditor.Extensions.Common.Localization;
 
 public struct LocalizedString
 {
+    public static LocalizationKeyShowMode? OverridenKeyFlowMode { get; set; } = null;
     private string key;
 
     public string Key
@@ -16,7 +14,7 @@ public struct LocalizedString
             #if DEBUG_LOCALIZATION
             Value = key;
             #else
-            Value = ViewModelMain.Current?.DebugSubViewModel?.LocalizationKeyShowMode switch
+            Value = OverridenKeyFlowMode switch
             {
                 LocalizationKeyShowMode.Key => Key,
                 LocalizationKeyShowMode.ValueKey => $"{GetValue(value)} ({Key})",

+ 2 - 1
src/PixiEditor.Extensions/Palettes/PaletteListDataSource.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Extensions.Palettes.Parsers;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Palettes.Parsers;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Extensions.Palettes;

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

@@ -10,5 +10,6 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 </Project>

+ 1 - 0
src/PixiEditor/App.xaml.cs

@@ -4,6 +4,7 @@ using System.Windows;
 using System.Windows.Media;
 using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.Extensions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.AppExtensions;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.DataHolders;

+ 1 - 0
src/PixiEditor/Exceptions/CorruptedFileException.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Runtime.Serialization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Exceptions;

+ 1 - 0
src/PixiEditor/Exceptions/InvalidFileTypeException.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Exceptions;

+ 1 - 0
src/PixiEditor/Exceptions/MissingFileException.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Exceptions;

+ 1 - 0
src/PixiEditor/Exceptions/RecoverableException.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Exceptions;

+ 1 - 0
src/PixiEditor/Helpers/Collections/ActionDisplayList.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Helpers.Collections;

+ 1 - 0
src/PixiEditor/Helpers/Converters/BlendModeToStringConverter.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using PixiEditor.ChangeableDocument.Enums;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers.Extensions;
 using PixiEditor.Models.Localization;
 

+ 1 - 0
src/PixiEditor/Helpers/Converters/BoolToValueConverter.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Helpers.Converters;

+ 1 - 0
src/PixiEditor/Helpers/Converters/KeyToStringConverter.cs

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

+ 1 - 0
src/PixiEditor/Helpers/Converters/LangConverter.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Helpers.Converters;

+ 1 - 0
src/PixiEditor/Helpers/RegistryHelpers.cs

@@ -2,6 +2,7 @@
 using System.Security.AccessControl;
 using System.Windows;
 using Microsoft.Win32;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Dialogs;
 using PixiEditor.Models.Localization;
 

+ 1 - 0
src/PixiEditor/Models/AppExtensions/ExtensionException.cs

@@ -1,4 +1,5 @@
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Models.AppExtensions;

+ 1 - 0
src/PixiEditor/Models/AppExtensions/ExtensionLoader.cs

@@ -4,6 +4,7 @@ using System.Windows;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using PixiEditor.Extensions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Metadata;
 using PixiEditor.Models.Dialogs;
 using PixiEditor.Models.IO;

+ 1 - 0
src/PixiEditor/Models/Commands/Attributes/Commands/CommandAttribute.cs

@@ -1,4 +1,5 @@
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.Localization;
 

+ 2 - 1
src/PixiEditor/Models/Commands/Attributes/Commands/FilterAttribute.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Models.Localization;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Models.Commands.Attributes.Commands;
 

+ 2 - 1
src/PixiEditor/Models/Commands/Attributes/Commands/GroupAttribute.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Models.Localization;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Models.Commands.Attributes.Commands;
 

+ 1 - 0
src/PixiEditor/Models/Commands/CommandController.cs

@@ -3,6 +3,7 @@ using System.Reflection;
 using System.Windows.Media;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Commands;
 using PixiEditor.Models.Commands.Evaluators;
 using PixiEditor.Models.DataHolders;

+ 1 - 0
src/PixiEditor/Models/DataHolders/KeyCombination.cs

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

+ 2 - 1
src/PixiEditor/Models/Dialogs/ConfirmationDialog.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Models.Enums;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views;
 using PixiEditor.Views.Dialogs;

+ 2 - 1
src/PixiEditor/Models/Dialogs/NoticeDialog.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Models.Localization;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.Localization;
 using PixiEditor.Views.Dialogs;
 
 namespace PixiEditor.Models.Dialogs;

+ 2 - 1
src/PixiEditor/Models/Dialogs/OptionDialog.cs

@@ -1,4 +1,5 @@
-using PixiEditor.Models.Enums;
+using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.Dialogs;
 

+ 1 - 0
src/PixiEditor/Models/Dialogs/OptionsDialog.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Windows.Controls;
 using System.Windows.Media;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.Dialogs;
 

+ 1 - 0
src/PixiEditor/Models/DocumentModels/DocumentStructureHelper.cs

@@ -1,4 +1,5 @@
 using PixiEditor.ChangeableDocument.Enums;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;
 using PixiEditor.ViewModels.SubViewModels.Document;

+ 1 - 0
src/PixiEditor/Models/IO/Importer.cs

@@ -9,6 +9,7 @@ using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 using PixiEditor.DrawingApi.Core.Surface.PaintImpl;
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.Localization;

+ 1 - 0
src/PixiEditor/Models/IO/PaletteParsers/JascPalFile/JascFileException.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 namespace PixiEditor.Models.IO.PaletteParsers.JascPalFile;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Document/DocumentViewModel.cs

@@ -15,6 +15,7 @@ using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Helpers;
 using PixiEditor.Helpers.Collections;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Document/TransformOverlays/DocumentTransformViewModel.cs

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

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Main/ColorsViewModel.cs

@@ -2,6 +2,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using Microsoft.Extensions.DependencyInjection;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Extensions.Palettes.Parsers;
 using PixiEditor.Helpers;

+ 3 - 0
src/PixiEditor/ViewModels/SubViewModels/Main/DebugViewModel.cs

@@ -5,6 +5,7 @@ using System.Windows;
 using System.Windows.Input;
 using Microsoft.Win32;
 using Newtonsoft.Json;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Commands.Templates.Parsers;
@@ -40,6 +41,7 @@ internal class DebugViewModel : SubViewModel<ViewModelMain>
         {
             if (SetProperty(ref localizationKeyShowMode, value))
             {
+                LocalizedString.OverridenKeyFlowMode = value;
                 Owner.LocalizationProvider.ReloadLanguage();
             }
         }
@@ -54,6 +56,7 @@ internal class DebugViewModel : SubViewModel<ViewModelMain>
         {
             if (SetProperty(ref forceOtherFlowDirection, value))
             {
+                Language.FlipFlowDirection = value;
                 Owner.LocalizationProvider.ReloadLanguage();
             }
         }

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json.Linq;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Controllers;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs

@@ -7,6 +7,7 @@ using Microsoft.Win32;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.Dialogs;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Main/UpdateViewModel.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Commands.Attributes;
 using PixiEditor.Models.Commands.Attributes.Commands;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/ToolSettings/Settings/Setting.cs

@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Localization;
 
 #pragma warning disable SA1402 // File may only contain a single type, Justification: "Same class with generic value"

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/BrightnessToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ColorPickerToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Windows.Input;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Events;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/EllipseToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/EraserToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Toolbars;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/FloodFillToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LassoToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Toolbars;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/LineToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Toolbars;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MagicWandToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Toolbars;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveViewportToolViewModel.cs

@@ -1,4 +1,5 @@
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/PenToolViewModel.cs

@@ -2,6 +2,7 @@
 using System.Windows.Media;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Events;
 using PixiEditor.Models.Localization;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RectangleToolViewModel.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RotateViewportToolViewModel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/SelectToolViewModel.cs

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

+ 1 - 0
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/ZoomToolViewModel.cs

@@ -1,4 +1,5 @@
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Localization;
 using PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;

+ 1 - 0
src/PixiEditor/Views/Dialogs/AboutPopup.xaml.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Localization;
 

+ 1 - 0
src/PixiEditor/Views/Dialogs/ConfirmationPopup.xaml.cs

@@ -1,4 +1,5 @@
 using System.Windows;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Localization;
 

+ 2 - 1
src/PixiEditor/Views/Dialogs/DebugDialogs/Localization/LocalizationDebugWindow.xaml

@@ -14,6 +14,7 @@
         xmlns:dialogs="clr-namespace:PixiEditor.Views.Dialogs"
         xmlns:globalization="clr-namespace:System.Globalization;assembly=System.Runtime"
         xmlns:main="clr-namespace:PixiEditor.ViewModels.SubViewModels.Main"
+        xmlns:localization="clr-namespace:PixiEditor.Extensions.Common.Localization;assembly=PixiEditor.Extensions"
         x:Name="popup"
         mc:Ignorable="d"
         Foreground="White"
@@ -55,7 +56,7 @@
                 <TextBlock views:Translator.Key="LOCALIZATION_VIEW_TYPE" Margin="0,0,5,0" MinWidth="160" />
                 <ComboBox
                     SelectedItem="{Binding DebugViewModel.LocalizationKeyShowMode}"
-                    ItemsSource="{helpers:Enum {x:Type enums:LocalizationKeyShowMode}}" />
+                    ItemsSource="{helpers:Enum {x:Type localization:LocalizationKeyShowMode}}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" Height="25" Margin="0,5,0,0">
                 <TextBlock views:Translator.Key="FORCE_OTHER_FLOW_DIRECTION" Margin="0,0,5,0" MinWidth="160" />

+ 1 - 0
src/PixiEditor/Views/Dialogs/ExportFilePopup.xaml.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Localization;

+ 1 - 0
src/PixiEditor/Views/Dialogs/ImportShortcutTemplatePopup.xaml.cs

@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 using PixiEditor.Exceptions;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Commands.Templates;

+ 1 - 0
src/PixiEditor/Views/Dialogs/PalettesBrowser.xaml.cs

@@ -8,6 +8,7 @@ using System.Windows.Input;
 using System.Windows.Navigation;
 using Microsoft.Win32;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Extensions.Palettes.Parsers;
 using PixiEditor.Helpers;

+ 1 - 0
src/PixiEditor/Views/UserControls/KeyCombinationBox.xaml.cs

@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
 using PixiEditor.Helpers.Behaviours;
 using PixiEditor.Models.DataHolders;

+ 1 - 0
src/PixiEditor/Views/UserControls/ShortcutBox.cs

@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Models.Commands;
 using PixiEditor.Models.Commands.Commands;
 using PixiEditor.Models.DataHolders;