Skip to content

Commit 2478158

Browse files
cwensleycwensley
authored
Merge pull request #84 from cwensley/more-dark-mode-icons
Convert the remainder of character format icons to ansi
2 parents 9da7484 + 646e0de commit 2478158

22 files changed

+52
-100
lines changed

‎Source/Pablo/Drawing/ColourBox.cs

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Eto.Drawing;
6+
using Eto.Forms;
7+
8+
namespace Pablo.Drawing
9+
{
10+
public abstract class ColourBox : Drawable
11+
{
12+
public abstract Color Color { get; set; }
13+
14+
protected override void OnPaint(PaintEventArgs pe)
15+
{
16+
base.OnPaint(pe);
17+
var rect = new Rectangle(Size);
18+
pe.Graphics.FillRectangle(Color, rect);
19+
pe.Graphics.DrawButtonOutline(rect);
20+
}
21+
}
22+
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Eto.Forms;
33
using Eto.Drawing;
44
using Pablo.Controls;
5+
using Pablo.Drawing;
56

67
namespace Pablo.Formats.Character.Controls
78
{
@@ -16,7 +17,7 @@ public class ColourEditor : Dialog<bool>
1617

1718
int SelectedIndex { get; set; }
1819

19-
class SelectColourBox : ColourPad.ColourBox
20+
class SelectColourBox : ColourBox
2021
{
2122
public int Index { get; set; }
2223

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

-13
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,6 @@ public Palette Palette {
2626

2727
#region ColourBox
2828

29-
public abstract class ColourBox : Drawable
30-
{
31-
public abstract Color Color { get; set; }
32-
33-
protected override void OnPaint(PaintEventArgs pe)
34-
{
35-
base.OnPaint(pe);
36-
var rect = new Rectangle(Size);
37-
pe.Graphics.FillRectangle(Color, rect);
38-
pe.Graphics.DrawButtonOutline(rect);
39-
}
40-
}
41-
4229
class FBColourBox : ColourBox
4330
{
4431
public ColourPad Pad { get; set; }

‎Source/Pablo/Formats/Character/Icons/ApplyColour.ans

1.5 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/ApplyColour.png

-1004 Bytes
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/ColourBrush.ans

1.91 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/ColourBrush.png

-1.05 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/DrawBackground.ans

1.47 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/DrawBackground.png

-1004 Bytes
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/DrawForeground.ans

1.06 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/DrawForeground.png

-998 Bytes
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/Erase.ans

1.55 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/Erase.png

-1.03 KB
Binary file not shown.

‎Source/Pablo/Formats/Character/Icons/Selection.ans

752 Bytes
Binary file not shown.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ protected override void Draw(Point location, MouseEventArgs e)
8787

8888
Control InvertButton()
8989
{
90-
var control = new ImageButton
90+
var control = new AnsiButton
9191
{
92-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.Erase.png"),
92+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Erase.ans", false),
9393
Toggle = true,
9494
Pressed = Inverted,
9595
ToolTip = "Erase mode (shift)"
@@ -104,9 +104,9 @@ Control InvertButton()
104104

105105
Control ColourButton()
106106
{
107-
var control = new ImageButton
107+
var control = new AnsiButton
108108
{
109-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
109+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
110110
Toggle = true,
111111
Pressed = ApplyColour,
112112
ToolTip = "Draw with color (alt)"

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

+8-27
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,13 @@ public override CharacterHandler Handler
2626
}
2727
}
2828

29-
public override Cursor MouseCursor
30-
{
31-
get { return new Cursor(CursorType.Crosshair); }
32-
}
29+
public override Cursor MouseCursor => new Cursor(CursorType.Crosshair);
3330

34-
public override Eto.Drawing.Image Image
35-
{
36-
get { return ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ColourBrush.png"); }
37-
}
31+
public override CharacterDocument DocumentImage => ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ColourBrush.ans", false);
3832

39-
public override string Description
40-
{
41-
get { return "Color Brush - paint only foreground and/or background colour"; }
42-
}
33+
public override string Description => "Color Brush - paint only foreground and/or background colour";
4334

44-
public override Keys Accelerator
45-
{
46-
get
47-
{
48-
return Keys.B | Keys.Shift | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
49-
}
50-
}
35+
public override Keys Accelerator => Keys.B | Keys.Shift | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
5136

5237

5338
public ColourBrush()
@@ -86,14 +71,12 @@ protected override void Draw(Point location, Eto.Forms.MouseEventArgs e)
8671

8772
Control FGButton()
8873
{
89-
var control = new ImageButton
74+
var control = new AnsiButton
9075
{
91-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.DrawForeground.png"),
76+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.DrawForeground.ans"),
9277
Toggle = true,
9378
Pressed = PaintForeground,
94-
#if DESKTOP
9579
ToolTip = "Paint foreground (shift)"
96-
#endif
9780
};
9881

9982
control.Click += delegate
@@ -105,14 +88,12 @@ Control FGButton()
10588

10689
Control BGButton()
10790
{
108-
var control = new ImageButton
91+
var control = new AnsiButton
10992
{
110-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.DrawBackground.png"),
93+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.DrawBackground.ans"),
11194
Toggle = true,
11295
Pressed = PaintBackground,
113-
#if DESKTOP
11496
ToolTip = "Paint background (alt)"
115-
#endif
11697
};
11798

11899
control.Click += delegate

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,12 @@ protected override void UpdateWithLocation(Rectangle rect, Keys modifiers, Point
147147

148148
Control ApplyColourButton()
149149
{
150-
var control = new ImageButton
150+
var control = new AnsiButton
151151
{
152-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
152+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
153153
Toggle = true,
154154
Pressed = ApplyColour,
155-
#if DESKTOP
156155
ToolTip = "Draw with color"
157-
#endif
158156
};
159157

160158
control.Click += delegate

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,12 @@ protected override void UpdateWithLocation(Rectangle rect, Keys modifiers, Point
155155

156156
Control ApplyColourButton()
157157
{
158-
var control = new ImageButton
158+
var control = new AnsiButton
159159
{
160-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
160+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
161161
Toggle = true,
162162
Pressed = ApplyColour,
163-
#if DESKTOP
164163
ToolTip = "Draw with color"
165-
#endif
166164
};
167165

168166
control.Click += delegate

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

+4-8
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,12 @@ protected override void Draw(Point location, Eto.Forms.MouseEventArgs e)
9898

9999
Control InvertButton()
100100
{
101-
var control = new ImageButton
101+
var control = new AnsiButton
102102
{
103-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.Erase.png"),
103+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Erase.ans", false),
104104
Toggle = true,
105105
Pressed = Inverted,
106-
#if DESKTOP
107106
ToolTip = "Erase mode (shift)"
108-
#endif
109107
};
110108

111109
control.Click += delegate
@@ -117,14 +115,12 @@ Control InvertButton()
117115

118116
Control ColourButton()
119117
{
120-
var control = new ImageButton
118+
var control = new AnsiButton
121119
{
122-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
120+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
123121
Toggle = true,
124122
Pressed = ApplyColour,
125-
#if DESKTOP
126123
ToolTip = "Draw with color (alt)"
127-
#endif
128124
};
129125

130126
control.Click += delegate

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ public override void Cancel()
140140

141141
Control ApplyColourButton()
142142
{
143-
var control = new ImageButton
143+
var control = new AnsiButton
144144
{
145-
Image = ImageCache.BitmapFromResource("Pablo.Formats.Character.Icons.ApplyColour.png"),
145+
Document = ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.ApplyColour.ans", false),
146146
Toggle = true,
147147
Pressed = ApplyColour,
148148
ToolTip = "Draw with color"

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

+5-23
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,15 @@ public class Selection : CenterAspectTool
2121
Rectangle? selectedRegion;
2222
Canvas pasteCanvas;
2323

24-
public override Eto.Drawing.Image Image
25-
{
26-
get { return ImageCache.BitmapFromResource("Pablo.Formats.Rip.Icons.Copy.png"); }
27-
}
24+
public override CharacterDocument DocumentImage => ImageCache.CharacterFromResource("Pablo.Formats.Character.Icons.Selection.ans");
2825

29-
public override string Description
30-
{
31-
get { return "Selection - Select text and position the cursor with the mouse"; }
32-
}
26+
public override string Description => "Selection - Select text and position the cursor with the mouse";
3327

34-
public override Keys Accelerator
35-
{
36-
get
37-
{
38-
return Keys.E | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
39-
}
40-
}
28+
public override Keys Accelerator => Keys.E | (Handler.Generator.IsMac ? Keys.Control : Keys.Alt);
4129

42-
public override Cursor MouseCursor
43-
{
44-
get { return new Cursor(CursorType.IBeam); }
45-
}
30+
public override Cursor MouseCursor => new Cursor(CursorType.IBeam);
4631

47-
public override bool AllowKeyboard
48-
{
49-
get { return drawMode == DrawMode.Normal; }
50-
}
32+
public override bool AllowKeyboard => drawMode == DrawMode.Normal;
5133

5234
public override void Unselected()
5335
{

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

+1-14
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Eto;
55
using System.Collections.Generic;
66
using Pablo.Controls;
7+
using Pablo.Drawing;
78

89
namespace Pablo.Formats.Rip.Controls
910
{
@@ -23,20 +24,6 @@ public Palette Palette {
2324

2425
#region ColourBox
2526

26-
public abstract class ColourBox : Drawable
27-
{
28-
public abstract Color Color { get; set; }
29-
30-
protected override void OnPaint (PaintEventArgs pe)
31-
{
32-
base.OnPaint (pe);
33-
var rect = new Rectangle (Point.Empty, this.Size);
34-
pe.Graphics.DrawInsetRectangle (Colors.Gray, Colors.White, rect);
35-
rect.Inflate (-1, -1);
36-
pe.Graphics.FillRectangle (Color, rect);
37-
}
38-
}
39-
4027
class FBColourBox : ColourBox
4128
{
4229
public ColourPad Pad { get; set; }

0 commit comments

Comments
 (0)