Merge pull request RPTools#7 from Jaggeroth/PenPlay

Pen play

Author: Azhrei

src/main/java/net/rptools/lib/swing/ColorPicker.java

@@ -24,6 +24,7 @@
 import java.util.List;
 
 import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JSpinner;
@@ -40,11 +41,19 @@
 public class ColorPicker extends JPanel {
 	private final JFrame owner;
 
+	private final ImageIcon eraserIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/eraser.png"));
+	private final ImageIcon pencilIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/pencil.png"));
+	private final ImageIcon roundCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/round_cap2.png"));
+	private final ImageIcon squareCapIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/square_cap2.png"));
+	private final ImageIcon snapToIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/shape_handles2.png"));
+	private final ImageIcon freeDrawIcon = new ImageIcon(this.getClass().getResource("/net/rptools/lib/image/icons/freehand2.png"));
+
 	private final PaintedPanel foregroundColor;
 	private final PaintedPanel backgroundColor;
 	private final List<PaintedPanel> recentColors = new ArrayList<PaintedPanel>(16);
 	private final JToggleButton snapToggle;
 	private final JToggleButton eraseToggle;
+	private final JToggleButton squareCapToggle;
 	private final PaintChooser paintChooser;
 	private final JSpinner penWidthSpinner;
 	private final JSpinner transparencySpinner;
@@ -99,7 +108,16 @@ public ColorPicker(JFrame owner) {
 			recentColors.add(paintedPanel);
 		}
 		snapToggle = (JToggleButton) panel.getButton("toggleSnapToGrid");
+		snapToggle.setIcon(freeDrawIcon);
+		snapToggle.setSelectedIcon(snapToIcon);
+
 		eraseToggle = (JToggleButton) panel.getButton("toggleErase");
+		eraseToggle.setIcon(pencilIcon);
+		eraseToggle.setSelectedIcon(eraserIcon);
+
+		squareCapToggle = (JToggleButton) panel.getButton("toggelSquareCap");
+		squareCapToggle.setIcon(roundCapIcon);
+		squareCapToggle.setSelectedIcon(squareCapIcon);
 
 		penWidthSpinner = panel.getSpinner("penWidth");
 		penWidthSpinner.setModel(new SpinnerNumberModel(3, 1, maxPenWidth, 1));
@@ -173,6 +191,14 @@ public boolean isSnapSelected() {
 		return snapToggle.isSelected();
 	}
 
+	public boolean isSquareCapSelected() {
+		return squareCapToggle.isSelected();
+	}
+
+	public void setSquareCapSelected(boolean selected) {
+		squareCapToggle.setSelected(selected);
+	}
+
 	public void setTranslucency(int percent) {
 		percent = Math.max(0, percent);
 		percent = Math.min(100, percent);

src/main/java/net/rptools/lib/swing/PaintedPanel.java

@@ -17,8 +17,17 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.Paint;
+import java.awt.Rectangle;
+import java.awt.TexturePaint;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
 
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
 @SuppressWarnings("serial")
@@ -56,10 +65,19 @@ protected void paintComponent(Graphics g) {
 			((Graphics2D) g).setPaint(paint);
 			g.fillRect(0, 0, size.width, size.height);
 		} else {
-			g.setColor(Color.white);
-			g.fillRect(0, 0, size.width, size.height);
-			g.setColor(Color.red);
-			g.drawLine(size.width - 1, 0, 0, size.height - 1);
+			try {
+				BufferedImage texture;
+				texture = ImageIO.read(getClass().getResource("/net/rptools/lib/image/icons/transparent2.png"));
+				TexturePaint tp = new TexturePaint(texture, new Rectangle(0, 0, 28, 28));
+				((Graphics2D) g).setPaint(tp);
+				g.fillRect(0, 0, size.width, size.height);
+			} catch (IOException e) {
+				System.out.println(e.getMessage());
+				g.setColor(Color.white);
+				g.fillRect(0, 0, size.width, size.height);
+				g.setColor(Color.red);
+				g.drawLine(size.width - 1, 0, 0, size.height - 1);
+			}
 		}
 	}
 }