Merge pull request #84 from cwensley/more-dark-mode-icons

Convert the remainder of character format icons to ansi

Source/Pablo/Drawing/ColourBox.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Eto.Drawing;
+using Eto.Forms;
+
+namespace Pablo.Drawing
+{
+	public abstract class ColourBox : Drawable
+	{
+		public abstract Color Color { get; set; }
+
+		protected override void OnPaint(PaintEventArgs pe)
+		{
+			base.OnPaint(pe);
+			var rect = new Rectangle(Size);
+			pe.Graphics.FillRectangle(Color, rect);
+			pe.Graphics.DrawButtonOutline(rect);
+		}
+	}
+}

Source/Pablo/Formats/Character/Controls/ColourEditor.cs

@@ -2,6 +2,7 @@
 using Eto.Forms;
 using Eto.Drawing;
 using Pablo.Controls;
+using Pablo.Drawing;
 
 namespace Pablo.Formats.Character.Controls
 {
@@ -16,7 +17,7 @@ public class ColourEditor : Dialog<bool>
 
 		int SelectedIndex { get; set; }
 
-		class SelectColourBox : ColourPad.ColourBox
+		class SelectColourBox : ColourBox
 		{
 			public int Index { get; set; }
 

Source/Pablo/Formats/Character/Controls/ColourPad.cs

@@ -26,19 +26,6 @@ public Palette Palette {
 
 		#region ColourBox
 
-		public abstract class ColourBox : Drawable
-		{
-			public abstract Color Color { get; set; }
-
-			protected override void OnPaint(PaintEventArgs pe)
-			{
-				base.OnPaint(pe);
-				var rect = new Rectangle(Size);
-				pe.Graphics.FillRectangle(Color, rect);
-				pe.Graphics.DrawButtonOutline(rect);
-			}
-		}
-
 		class FBColourBox : ColourBox
 		{
 			public ColourPad Pad { get; set; }

Source/Pablo/Formats/Character/Tools/BrushTool.cs

@@ -87,9 +87,9 @@ protected override void Draw(Point location, MouseEventArgs e)
 
 		Control InvertButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.Erase.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Erase.ans", false),
 				Toggle = true,
 				Pressed = Inverted,
 				ToolTip = "Erase mode (shift)"
@@ -104,9 +104,9 @@ Control InvertButton()
 
 		Control ColourButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
 				Toggle = true,
 				Pressed = ApplyColour,
 				ToolTip = "Draw with color (alt)"

Source/Pablo/Formats/Character/Tools/ColourBrush.cs

@@ -26,28 +26,13 @@ public override CharacterHandler Handler
 			}
 		}
 
-		public override Cursor MouseCursor
-		{
-			get { return new Cursor(CursorType.Crosshair); }
-		}
+		public override Cursor MouseCursor => new Cursor(CursorType.Crosshair);
 
-		public override Eto.Drawing.Image Image
-		{
-			get { return ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ColourBrush.png"); }
-		}
+		public override CharacterDocument DocumentImage => ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ColourBrush.ans", false);
 
-		public override string Description
-		{
-			get { return "Color Brush - paint only foreground and/or background colour"; }
-		}
+		public override string Description => "Color Brush - paint only foreground and/or background colour";
 
-		public override Keys Accelerator
-		{
-			get
-			{
-				return Keys.B | Keys.Shift | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
-			}
-		}
+		public override Keys Accelerator => Keys.B | Keys.Shift | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
 
 
 		public ColourBrush()
@@ -86,14 +71,12 @@ protected override void Draw(Point location, Eto.Forms.MouseEventArgs e)
 
 		Control FGButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.DrawForeground.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.DrawForeground.ans"),
 				Toggle = true,
 				Pressed = PaintForeground,
-#if DESKTOP
 				ToolTip = "Paint foreground (shift)"
-#endif
 			};
 
 			control.Click += delegate
@@ -105,14 +88,12 @@ Control FGButton()
 
 		Control BGButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.DrawBackground.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.DrawBackground.ans"),
 				Toggle = true,
 				Pressed = PaintBackground,
-#if DESKTOP
 				ToolTip = "Paint background (alt)"
-#endif
 			};
 
 			control.Click += delegate

Source/Pablo/Formats/Character/Tools/EllipseTool.cs

@@ -147,14 +147,12 @@ protected override void UpdateWithLocation(Rectangle rect, Keys modifiers, Point
 
 		Control ApplyColourButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
 				Toggle = true,
 				Pressed = ApplyColour,
-#if DESKTOP
 				ToolTip = "Draw with color"
-#endif
 			};
 
 			control.Click += delegate

Source/Pablo/Formats/Character/Tools/LineTool.cs

@@ -155,14 +155,12 @@ protected override void UpdateWithLocation(Rectangle rect, Keys modifiers, Point
 
 		Control ApplyColourButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
 				Toggle = true,
 				Pressed = ApplyColour,
-#if DESKTOP
 				ToolTip = "Draw with color"
-#endif
 			};
 
 			control.Click += delegate

Source/Pablo/Formats/Character/Tools/PencilTool.cs

@@ -98,14 +98,12 @@ protected override void Draw(Point location, Eto.Forms.MouseEventArgs e)
 
 		Control InvertButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.Erase.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Erase.ans", false),
 				Toggle = true,
 				Pressed = Inverted,
-#if DESKTOP
 				ToolTip = "Erase mode (shift)"
-#endif
 			};
 
 			control.Click += delegate
@@ -117,14 +115,12 @@ Control InvertButton()
 
 		Control ColourButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
 				Toggle = true,
 				Pressed = ApplyColour,
-#if DESKTOP
 				ToolTip = "Draw with color (alt)"
-#endif
 			};
 
 			control.Click += delegate

Source/Pablo/Formats/Character/Tools/RectangleTool.cs

@@ -140,9 +140,9 @@ public override void Cancel()
 
 		Control ApplyColourButton()
 		{
-			var control = new ImageButton
+			var control = new AnsiButton
 			{
-				Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
+				Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
 				Toggle = true,
 				Pressed = ApplyColour,
 				ToolTip = "Draw with color"

Source/Pablo/Formats/Character/Tools/Selection.cs

@@ -21,33 +21,15 @@ public class Selection : CenterAspectTool
 		Rectangle? selectedRegion;
 		Canvas pasteCanvas;
 
-		public override Eto.Drawing.Image Image
-		{
-			get { return ImageCache.BitmapFromResource("Pablo.Formats.Rip.Icons.Copy.png"); }
-		}
+		public override CharacterDocument DocumentImage => ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Selection.ans");
 
-		public override string Description
-		{
-			get { return "Selection - Select text and position the cursor with the mouse"; }
-		}
+		public override string Description => "Selection - Select text and position the cursor with the mouse";
 
-		public override Keys Accelerator
-		{
-			get
-			{
-				return Keys.E | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
-			}
-		}
+		public override Keys Accelerator => Keys.E | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
 
-		public override Cursor MouseCursor
-		{
-			get { return new Cursor(CursorType.IBeam); }
-		}
+		public override Cursor MouseCursor => new Cursor(CursorType.IBeam);
 
-		public override bool AllowKeyboard
-		{
-			get { return drawMode == DrawMode.Normal; }
-		}
+		public override bool AllowKeyboard => drawMode == DrawMode.Normal;
 
 		public override void Unselected()
 		{

Source/Pablo/Formats/Rip/Controls/ColourPad.cs

@@ -4,6 +4,7 @@
 using Eto;
 using System.Collections.Generic;
 using Pablo.Controls;
+using Pablo.Drawing;
 
 namespace Pablo.Formats.Rip.Controls
 {
@@ -23,20 +24,6 @@ public Palette Palette {
 
 		#region ColourBox
 
-		public abstract class ColourBox : Drawable
-		{
-			public abstract Color Color { get; set; }
-
-			protected override void OnPaint (PaintEventArgs pe)
-			{
-				base.OnPaint (pe);
-				var rect = new Rectangle (Point.Empty, this.Size);
-				pe.Graphics.DrawInsetRectangle (Colors.Gray, Colors.White, rect);
-				rect.Inflate (-1, -1);
-				pe.Graphics.FillRectangle (Color, rect);
-			}
-		}
-
 		class FBColourBox : ColourBox
 		{
 			public ColourPad Pad { get; set; }