fix merge conflict

PixiEditor/Models/Controllers/BitmapOperationsUtility.cs

@@ -58,7 +58,7 @@ namespace PixiEditor.Models.Controllers
         /// <param name="tool">Tool to execute.</param>
         public void ExecuteTool(Coordinates newPos, List<Coordinates> mouseMove, BitmapOperationTool tool)
         {
-            if (Manager.ActiveDocument != null && tool != null && tool.ToolType != ToolType.None)
+            if (Manager.ActiveDocument != null && tool != null)
             {
                 if (Manager.ActiveDocument.Layers.Count == 0 || mouseMove.Count == 0)
                 {

PixiEditor/Models/Tools/ShapeTool.cs

@@ -18,8 +18,6 @@ namespace PixiEditor.Models.Tools
             Toolbar = new BasicShapeToolbar();
         }
 
-        public abstract override ToolType ToolType { get; }
-
         public abstract override LayerChange[] Use(Layer layer, Coordinates[] coordinates, Color color);
 
         protected IEnumerable<Coordinates> GetThickShape(IEnumerable<Coordinates> shape, int thickness)

PixiEditor/Models/Tools/Tool.cs

@@ -1,21 +1,34 @@
-using System.Windows.Input;
-using PixiEditor.Helpers;
+using System;
+using System.Windows.Input;
+using PixiEditor.Helpers;
 using PixiEditor.Models.Controllers;
-using PixiEditor.Models.Tools.ToolSettings;
-using PixiEditor.Models.Tools.ToolSettings.Toolbars;
-
-namespace PixiEditor.Models.Tools
-{
-    public abstract class Tool : NotifyableObject
-    {
-        private bool isActive;
-        private string actionDisplay = "";
-
-        public abstract ToolType ToolType { get; }
+using PixiEditor.Models.Tools.ToolSettings;
+using PixiEditor.Models.Tools.ToolSettings.Toolbars;
+
+namespace PixiEditor.Models.Tools
+{
+    public abstract class Tool : NotifyableObject
+    {
+        protected string name;
+        private bool isActive;
+        private string actionDisplay = string.Empty;
+
+        public string ToolName
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(name))
+                {
+                    return GetType().Name.Replace("Tool", string.Empty);
+                }
+
+                return name;
+            }
+        }
 
-        public string ImagePath => $"/Images/{ToolType}Image.png";
+        public string ImagePath => $"/Images/{ToolName}Image.png";
 
-        public bool HideHighlight { get; set; } = false;
+        public bool HideHighlight { get; set; } = false;
 
         public string Tooltip { get; set; }
 
@@ -28,23 +41,23 @@ namespace PixiEditor.Models.Tools
                 RaisePropertyChanged("ActionDisplay");
             }
         }
-
-        public bool IsActive
-        {
-            get => isActive;
-            set
-            {
-                isActive = value;
-                RaisePropertyChanged("IsActive");
-            }
-        }
-
-        public Cursor Cursor { get; set; } = Cursors.Arrow;
-
-        public Toolbar Toolbar { get; set; } = new EmptyToolbar();
-
-        public bool CanStartOutsideCanvas { get; set; } = false;
-
+
+        public bool IsActive
+        {
+            get => isActive;
+            set
+            {
+                isActive = value;
+                RaisePropertyChanged("IsActive");
+            }
+        }
+
+        public Cursor Cursor { get; set; } = Cursors.Arrow;
+
+        public Toolbar Toolbar { get; set; } = new EmptyToolbar();
+
+        public bool CanStartOutsideCanvas { get; set; } = false;
+
         public virtual void OnMouseDown(MouseEventArgs e)
         {
         }
@@ -52,29 +65,29 @@ namespace PixiEditor.Models.Tools
         public virtual void OnMouseUp(MouseEventArgs e)
         {
         }
-
+
         public virtual void OnKeyDown(KeyEventArgs e)
         {
-        }
-
+        }
+
         public virtual void OnKeyUp(KeyEventArgs e)
         {
-        }
-
+        }
+
         public virtual void OnRecordingLeftMouseDown(MouseEventArgs e)
         {
         }
-
+
         public virtual void OnStoppedRecordingMouseUp(MouseEventArgs e)
         {
         }
-
+
         public virtual void OnMouseMove(MouseEventArgs e)
         {
         }
-
+
         public virtual void AfterAddedUndo(UndoManager undoManager)
         {
         }
-    }
+    }
 }

PixiEditor/Models/Tools/ToolType.cs

@@ -1,19 +0,0 @@
-namespace PixiEditor.Models.Tools
-{
-    public enum ToolType
-    {
-        None,
-        MoveViewport,
-        Move,
-        Pen,
-        Select,
-        Bucket,
-        Line,
-        Circle,
-        Rectangle,
-        Eraser,
-        Brightness,
-        ColorPicker,
-        Zoom
-    }
-}

PixiEditor/Models/Tools/Tools/BrightnessTool.cs

@@ -26,8 +26,6 @@ namespace PixiEditor.Models.Tools.Tools
             Toolbar = new BrightnessToolToolbar(CorrectionFactor);
         }
 
-        public override ToolType ToolType => ToolType.Brightness;
-
         public BrightnessMode Mode { get; set; } = BrightnessMode.Default;
 
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)

PixiEditor/Models/Tools/Tools/CircleTool.cs

@@ -19,8 +19,6 @@ namespace PixiEditor.Models.Tools.Tools
             Tooltip = "Draws circle on canvas (C). Hold Shift to draw even circle.";
         }
 
-        public override ToolType ToolType => ToolType.Circle;
-
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftShift)

PixiEditor/Models/Tools/Tools/ColorPickerTool.cs

@@ -14,8 +14,6 @@ namespace PixiEditor.Models.Tools.Tools
             Tooltip = "Swaps primary color with selected on canvas. (O)";
         }
 
-        public override ToolType ToolType => ToolType.ColorPicker;
-
         public override void Use(Coordinates[] coordinates)
         {
             ViewModelMain.Current.ColorsSubViewModel.PrimaryColor = GetColorUnderMouse();

PixiEditor/Models/Tools/Tools/EraserTool.cs

@@ -18,8 +18,6 @@ namespace PixiEditor.Models.Tools.Tools
             Toolbar = new BasicToolbar();
         }
 
-        public override ToolType ToolType => ToolType.Eraser;
-
         public override LayerChange[] Use(Layer layer, Coordinates[] coordinates, Color color)
         {
             return Erase(layer, coordinates, Toolbar.GetSetting<SizeSetting>("ToolSize").Value);

PixiEditor/Models/Tools/Tools/FloodFill.cs

@@ -15,8 +15,6 @@ namespace PixiEditor.Models.Tools.Tools
             Tooltip = "Fills area with color. (G)";
         }
 
-        public override ToolType ToolType => ToolType.Bucket;
-
         public override LayerChange[] Use(Layer layer, Coordinates[] coordinates, Color color)
         {
             return Only(ForestFire(layer, coordinates[0], color), layer);

PixiEditor/Models/Tools/Tools/LineTool.cs

@@ -23,8 +23,6 @@ namespace PixiEditor.Models.Tools.Tools
             circleTool = new CircleTool();
         }
 
-        public override ToolType ToolType => ToolType.Line;
-
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftShift)

PixiEditor/Models/Tools/Tools/MoveTool.cs

@@ -40,8 +40,6 @@ namespace PixiEditor.Models.Tools.Tools
 
         public bool MoveAll { get; set; } = false;
 
-        public override ToolType ToolType => ToolType.Move;
-
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftCtrl)

PixiEditor/Models/Tools/Tools/MoveViewportTool.cs

@@ -16,8 +16,6 @@ namespace PixiEditor.Models.Tools.Tools
             ActionDisplay = "Click and move to pan viewport.";
             Tooltip = "Move viewport. (H)";
         }
-
-        public override ToolType ToolType => ToolType.MoveViewport;
 
         public override void OnMouseDown(MouseEventArgs e)
         {

PixiEditor/Models/Tools/Tools/PenTool.cs

@@ -24,8 +24,6 @@ namespace PixiEditor.Models.Tools.Tools
             lineTool = new LineTool();
         }
 
-        public override ToolType ToolType => ToolType.Pen;
-
         public override LayerChange[] Use(Layer layer, Coordinates[] coordinates, Color color)
         {
             Coordinates startingCords = coordinates.Length > 1 ? coordinates[1] : coordinates[0];

PixiEditor/Models/Tools/Tools/RectangleTool.cs

@@ -19,8 +19,6 @@ namespace PixiEditor.Models.Tools.Tools
             Tooltip = "Draws rectangle on canvas (R). Hold Shift to draw square.";
         }
 
-        public override ToolType ToolType => ToolType.Rectangle;
-
         public bool Filled { get; set; } = false;
 
         public override void OnKeyDown(KeyEventArgs e)

PixiEditor/Models/Tools/Tools/SelectTool.cs

@@ -26,8 +26,6 @@ namespace PixiEditor.Models.Tools.Tools
 
         public SelectionType SelectionType { get; set; } = SelectionType.Add;
 
-        public override ToolType ToolType => ToolType.Select;
-
         public override void OnRecordingLeftMouseDown(MouseEventArgs e)
         {
             Enum.TryParse((Toolbar.GetSetting<DropdownSetting>("SelectMode")?.Value as ComboBoxItem)?.Content as string, out SelectionType selectionType);

PixiEditor/Models/Tools/Tools/ZoomTool.cs

@@ -24,8 +24,6 @@ namespace PixiEditor.Models.Tools.Tools
             pixelsPerZoomMultiplier = workAreaWidth / ZoomSensitivityMultiplier;
         }
 
-        public override ToolType ToolType => ToolType.Zoom;
-
         public override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.LeftAlt)

PixiEditor/PixiEditor.csproj

@@ -60,7 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\AnchorDot.png" />
-    <Resource Include="Images\BucketImage.png" />
+    <Resource Include="Images\FloodFillImage.png" />
     <Resource Include="Images\CircleImage.png" />
     <Resource Include="Images\EraserImage.png" />
     <Resource Include="Images\BrightnessImage.png" />

PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs

@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
 using PixiEditor.Helpers;
@@ -41,13 +42,13 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
                 new CircleTool(), new RectangleTool(), new EraserTool(), new ColorPickerTool(), new BrightnessTool(),
                 new ZoomTool()
             };
-            SetActiveTool(ToolType.Move);
+            SetActiveTool(typeof(MoveTool));
         }
 
-        public void SetActiveTool(ToolType tool)
+        public void SetActiveTool<T>()
+            where T : Tool
         {
-            Tool foundTool = ToolSet.First(x => x.ToolType == tool);
-            SetActiveTool(foundTool);
+            SetActiveTool(typeof(T));
         }
 
         public void SetActiveTool(Tool tool)
@@ -61,12 +62,19 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
             tool.IsActive = true;
             LastActionTool = Owner.BitmapManager.SelectedTool;
             Owner.BitmapManager.SetActiveTool(tool);
-            SetToolCursor(tool.ToolType);
+            SetToolCursor(tool.GetType());
         }
 
         public void SetTool(object parameter)
         {
-            SetActiveTool((ToolType)parameter);
+            if (parameter is Type type)
+            {
+                SetActiveTool(type);
+                return;
+            }
+
+            Tool tool = (Tool)parameter;
+            SetActiveTool(tool.GetType());
         }
 
         private void ChangeToolSize(object parameter)
@@ -79,9 +87,20 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
             }
         }
 
-        private void SetToolCursor(ToolType tool)
+        private void SetActiveTool(Type toolType)
+        {
+            if (toolType == null && toolType.IsAssignableTo(typeof(Tool)))
+            {
+                return;
+            }
+
+            Tool foundTool = ToolSet.First(x => x.GetType() == toolType);
+            SetActiveTool(foundTool);
+        }
+
+        private void SetToolCursor(Type tool)
         {
-            if (tool != ToolType.None)
+            if (tool != null)
             {
                 ToolCursor = Owner.BitmapManager.SelectedTool.Cursor;
             }

PixiEditor/ViewModels/ViewModelMain.cs

@@ -15,6 +15,7 @@ using PixiEditor.Models.Events;
 using PixiEditor.Models.IO;
 using PixiEditor.Models.Position;
 using PixiEditor.Models.Tools;
+using PixiEditor.Models.Tools.Tools;
 using PixiEditor.Models.UserPreferences;
 using PixiEditor.ViewModels.SubViewModels.Main;
 
@@ -94,18 +95,18 @@ namespace PixiEditor.ViewModels
                 Shortcuts = new List<Shortcut>
                 {
                     // Tools
-                    new Shortcut(Key.B, ToolsSubViewModel.SelectToolCommand, ToolType.Pen),
-                    new Shortcut(Key.E, ToolsSubViewModel.SelectToolCommand, ToolType.Eraser),
-                    new Shortcut(Key.O, ToolsSubViewModel.SelectToolCommand, ToolType.ColorPicker),
-                    new Shortcut(Key.R, ToolsSubViewModel.SelectToolCommand, ToolType.Rectangle),
-                    new Shortcut(Key.C, ToolsSubViewModel.SelectToolCommand, ToolType.Circle),
-                    new Shortcut(Key.L, ToolsSubViewModel.SelectToolCommand, ToolType.Line),
-                    new Shortcut(Key.G, ToolsSubViewModel.SelectToolCommand, ToolType.Bucket),
-                    new Shortcut(Key.U, ToolsSubViewModel.SelectToolCommand, ToolType.Brightness),
-                    new Shortcut(Key.V, ToolsSubViewModel.SelectToolCommand, ToolType.Move),
-                    new Shortcut(Key.M, ToolsSubViewModel.SelectToolCommand, ToolType.Select),
-                    new Shortcut(Key.Z, ToolsSubViewModel.SelectToolCommand, ToolType.Zoom),
-                    new Shortcut(Key.H, ToolsSubViewModel.SelectToolCommand, ToolType.MoveViewport),
+                    CreateToolShortcut<PenTool>(Key.B),
+                    CreateToolShortcut<EraserTool>(Key.E),
+                    CreateToolShortcut<ColorPickerTool>(Key.O),
+                    CreateToolShortcut<RectangleTool>(Key.R),
+                    CreateToolShortcut<CircleTool>(Key.C),
+                    CreateToolShortcut<LineTool>(Key.L),
+                    CreateToolShortcut<FloodFill>(Key.G),
+                    CreateToolShortcut<BrightnessTool>(Key.U),
+                    CreateToolShortcut<MoveTool>(Key.V),
+                    CreateToolShortcut<SelectTool>(Key.M),
+                    CreateToolShortcut<ZoomTool>(Key.Z),
+                    CreateToolShortcut<MoveViewportTool>(Key.H),
                     new Shortcut(Key.OemPlus, ViewportSubViewModel.ZoomCommand, 115),
                     new Shortcut(Key.OemMinus, ViewportSubViewModel.ZoomCommand, 85),
                     new Shortcut(Key.OemOpenBrackets, ToolsSubViewModel.ChangeToolSizeCommand, -1),
@@ -156,6 +157,12 @@ namespace PixiEditor.ViewModels
             return BitmapManager.ActiveDocument != null;
         }
 
+        private Shortcut CreateToolShortcut<T>(Key key, ModifierKeys modifier = ModifierKeys.None)
+            where T : Tool
+        {
+            return new Shortcut(key, ToolsSubViewModel.SelectToolCommand, typeof(T), modifier);
+        }
+
         private void CloseWindow(object property)
         {
             if (!(property is CancelEventArgs))

PixiEditor/Views/MainWindow.xaml

@@ -213,7 +213,7 @@
                                 Style="{StaticResource ToolButtonStyle}"
                                 Command="{Binding Path=DataContext.ToolsSubViewModel.SelectToolCommand,
                             RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
-                                CommandParameter="{Binding ToolType}" ToolTip="{Binding Tooltip}">
+                                CommandParameter="{Binding}" ToolTip="{Binding Tooltip}">
                             <Button.Background>
                                 <ImageBrush ImageSource="{Binding ImagePath}" Stretch="Uniform" />
                             </Button.Background>

PixiEditor/Views/UserControls/DrawingViewPort.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PixiEditor.Views.UserControls" 
-             xmlns:tools="clr-namespace:PixiEditor.Models.Tools"
+             xmlns:tools="clr-namespace:PixiEditor.Models.Tools.Tools"
              xmlns:vws="clr-namespace:PixiEditor.Views" 
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" 
              xmlns:behaviors="clr-namespace:PixiEditor.Helpers.Behaviours" xmlns:converters="clr-namespace:PixiEditor.Helpers.Converters"
@@ -19,7 +19,7 @@
                           x:Name="DrawingPanel"
                           CenterOnStart="True" Cursor="{Binding Cursor, ElementName=uc}" 
                           MiddleMouseClickedCommand="{Binding MiddleMouseClickedCommand, ElementName=uc}" 
-                          MiddleMouseClickedCommandParameter="{x:Static tools:ToolType.MoveViewport}"
+                          MiddleMouseClickedCommandParameter="{x:Type tools:MoveViewportTool}"
                           ViewportPosition="{Binding ViewportPosition, ElementName=uc, Mode=TwoWay}">
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="MouseMove">

PixiEditorTests/ModelsTests/ControllersTests/BitmapManagerTests.cs

@@ -13,8 +13,8 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
         public void TestThatBitmapManagerSetsCorrectTool()
         {
             BitmapManager bitmapManager = new BitmapManager();
-            bitmapManager.SetActiveTool(new MockedSinglePixelPen());
-            Assert.Equal(ToolType.Pen, bitmapManager.SelectedTool.ToolType);
+            bitmapManager.SetActiveTool(new MockedSinglePixelPenTool());
+            Assert.Equal(typeof(MockedSinglePixelPenTool), bitmapManager.SelectedTool.GetType());
         }
 
         [Fact]
@@ -63,7 +63,7 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
         [Fact]
         public void TestThatIsOperationToolWorks()
         {
-            MockedSinglePixelPen singlePixelPen = new MockedSinglePixelPen();
+            MockedSinglePixelPenTool singlePixelPen = new MockedSinglePixelPenTool();
             Assert.True(BitmapManager.IsOperationTool(singlePixelPen));
         }
 
@@ -81,7 +81,7 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
             bitmapManager.ActiveDocument = bitmapManager.Documents[0];
 
             bitmapManager.ActiveDocument.AddNewLayer("Layer");
-            bitmapManager.SetActiveTool(new MockedSinglePixelPen());
+            bitmapManager.SetActiveTool(new MockedSinglePixelPenTool());
             bitmapManager.PrimaryColor = Colors.Green;
 
             bitmapManager.MouseController.StartRecordingMouseMovementChanges(true);

PixiEditorTests/ModelsTests/ControllersTests/BitmapOperationsUtilityTests.cs

@@ -41,7 +41,7 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
 
             List<Coordinates> mouseMove = new List<Coordinates>(new[] { new Coordinates(0, 0) });
 
-            util.ExecuteTool(new Coordinates(0, 0), mouseMove, new MockedSinglePixelPen());
+            util.ExecuteTool(new Coordinates(0, 0), mouseMove, new MockedSinglePixelPenTool());
             Assert.Equal(manager.ActiveLayer.GetPixel(0, 0), Colors.Black);
         }
     }

PixiEditorTests/ModelsTests/ControllersTests/MockedSinglePixelPen.cs → PixiEditorTests/ModelsTests/ControllersTests/MockedSinglePixelPenTool.cs

@@ -1,15 +1,13 @@
-using System.Windows.Media;
-using PixiEditor.Models.DataHolders;
+using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.Layers;
 using PixiEditor.Models.Position;
 using PixiEditor.Models.Tools;
+using System.Windows.Media;
 
 namespace PixiEditorTests.ModelsTests.ControllersTests
 {
-    public class MockedSinglePixelPen : BitmapOperationTool
+    public class MockedSinglePixelPenTool : BitmapOperationTool
     {
-        public override ToolType ToolType { get; } = ToolType.Pen;
-
         public override LayerChange[] Use(Layer layer, Coordinates[] mouseMove, Color color)
         {
             return Only(BitmapPixelChanges.FromSingleColoredArray(new[] { mouseMove[0] }, color), 0);

PixiEditorTests/ModelsTests/ControllersTests/TestReadonlyTool.cs

@@ -13,8 +13,6 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
 
         public Action ToolAction { get; set; }
 
-        public override ToolType ToolType => ToolType.Select;
-
         public override void Use(Coordinates[] pixels)
         {
             ToolAction();

PixiEditorTests/ViewModelsTests/ViewModelMainTests.cs

@@ -6,6 +6,7 @@ using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.IO;
 using PixiEditor.Models.Position;
 using PixiEditor.Models.Tools;
+using PixiEditor.Models.Tools.Tools;
 using PixiEditor.ViewModels;
 using Xunit;
 
@@ -72,11 +73,11 @@ namespace PixiEditorTests.ViewModelsTests
         {
             ViewModelMain viewModel = new ViewModelMain();
 
-            Assert.Equal(ToolType.Move, viewModel.BitmapManager.SelectedTool.ToolType);
+            Assert.Equal(typeof(MoveTool), viewModel.BitmapManager.SelectedTool.GetType());
 
-            viewModel.ToolsSubViewModel.SelectToolCommand.Execute(ToolType.Line);
+            viewModel.ToolsSubViewModel.SelectToolCommand.Execute(new LineTool());
 
-            Assert.Equal(ToolType.Line, viewModel.BitmapManager.SelectedTool.ToolType);
+            Assert.Equal(typeof(LineTool), viewModel.BitmapManager.SelectedTool.GetType());
         }
 
         [StaFact]