Added cursors and new icons

johannes85 · Jul 16, 2014 · 1fa6fe3 · 1fa6fe3
1 parent b4c87ae
commit 1fa6fe3
Show file tree

Hide file tree

Showing 43 changed files with 320 additions and 478 deletions.
diff --git a/MagicPaint/Form1.Designer.cs b/MagicPaint/Form1.Designer.cs
diff --git a/MagicPaint/MagicPaint.csproj b/MagicPaint/MagicPaint.csproj
@@ -182,6 +182,23 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
+    <None Include="Resources\removepage.png" />
+    <None Include="Resources\imageadd.png" />
+    <None Include="Resources\save.png" />
+    <None Include="Resources\undo.png" />
+    <None Include="Resources\newdoc.png" />
+    <None Include="Resources\newpage.png" />
+    <None Include="Resources\open.png" />
+    <None Include="Resources\picture.png" />
+    <None Include="Resources\fill_color.png" />
+    <None Include="Resources\draw_brush.png" />
+    <None Include="Resources\device.png" />
+    <None Include="Resources\color_picker.png" />
+    <None Include="Resources\arrow_right.png" />
+    <None Include="Resources\arrow_left.png" />
+    <None Include="Resources\cursors\fill.cur" />
+    <None Include="Resources\cursors\pipette.cur" />
+    <None Include="Resources\cursors\brush.cur" />
     <None Include="Resources\fill-color.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/MagicPaint/MagicPixler.Designer.cs b/MagicPaint/MagicPixler.Designer.cs
diff --git a/MagicPaint/MagicPixler.cs b/MagicPaint/MagicPixler.cs
@@ -27,6 +27,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Diagnostics;
+using System.IO;
 
 namespace MagicPaint
 {
@@ -36,6 +37,7 @@ public partial class MagicPixler : UserControl
         private Bitmap buffer;
         private Pen penHelpingLines;
         private Pen penCursor;
+        private Tool currentTool;
 
         private Point cursorPosition;
         private bool cursorEnabled;
@@ -47,7 +49,29 @@ public partial class MagicPixler : UserControl
         public event EventHandler OnChanged;
 
         public Boolean EditEnabled { get; set; }
-        public Tool CurrentTool { get; set; }
+        public Tool CurrentTool {
+            get
+            {
+                return currentTool;
+            }
+            set
+            {
+                currentTool = value;
+
+                switch (currentTool)
+                {
+                    case Tool.Brush:
+                        Cursor = GetCursor("brush");
+                        break;
+                    case Tool.ColorPicker:
+                        Cursor = GetCursor("pipette");
+                        break;
+                    case Tool.Fill:
+                        Cursor = GetCursor("fill");
+                        break;
+                }
+            } 
+        }
         public Color CurrentColor { get; set; }
         public int PixelSize
         {
@@ -220,6 +244,16 @@ private Boolean EqualColor(Color color1, Color color2)
             return (color1.ToArgb() == color2.ToArgb());
         }
 
+        private Cursor GetCursor(string cursorName)
+        {
+            var buffer = Properties.Resources.ResourceManager.GetObject(cursorName) as byte[];
+
+            using (var m = new MemoryStream(buffer))
+            {
+                return new Cursor(m);
+            }
+        }
+
         private void MagicPixler_Resize(object sender, EventArgs e)
         {
             RefreshEditor();

diff --git a/MagicPaint/Properties/Resources.Designer.cs b/MagicPaint/Properties/Resources.Designer.cs