[Pixelle-commit] SF.net SVN: pixelle: [50] trunk/pixelle/src/com/mebigfatguy/pixelle

[<dbr...@us...>]

Revision: 50
          http://pixelle.svn.sourceforge.net/pixelle/?rev=50&view=rev
Author:   dbrosius
Date:     2008-06-22 07:10:25 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
more options dialog work

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2008-06-22 14:09:48 UTC (rev 49)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2008-06-22 14:10:25 UTC (rev 50)
@@ -62,6 +62,7 @@
 	public static final String STATIC_COLOR = "label.color";
 	public static final String BORDER_COLOR = "label.border_color";
 	public static final String WRAPPED_COLOR = "label.wrapped_color";
+	public static final String PICK_COLOR = "title.pick_color";
 
 	private static ResourceBundle rb = ResourceBundle.getBundle("com/mebigfatguy/pixelle/pixelle");
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2008-06-22 14:09:48 UTC (rev 49)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2008-06-22 14:10:25 UTC (rev 50)
@@ -43,7 +43,6 @@
 		d.setModal(true);
 		d.setVisible(true);
 		if (d.isOK()) {
-			
 		}
 	}
 }

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2008-06-22 14:09:48 UTC (rev 49)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2008-06-22 14:10:25 UTC (rev 50)
@@ -18,6 +18,7 @@
  */
 package com.mebigfatguy.pixelle.dialogs;
 
+import java.awt.Color;
 import java.awt.Container;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -31,6 +32,7 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 
@@ -40,12 +42,16 @@
 
 public class PixelleOptionsDialog extends JDialog {
 
+	private static final long serialVersionUID = -2593224982080676492L;
+	
 	private JCheckBox colorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.STATIC_COLOR));
 	private JCheckBox borderColorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.BORDER_COLOR));
 	private JCheckBox wrappedColorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.WRAPPED_COLOR));
+	private ColorButton colorButton = new ColorButton(Color.WHITE);
 	private JButton ok = new JButton(PixelleBundle.getString(PixelleBundle.OK));
 	private JButton cancel = new JButton(PixelleBundle.getString(PixelleBundle.CANCEL));
 	private boolean okClicked = false;
+	private Color defColor = Color.WHITE;
 	
 	public PixelleOptionsDialog(PixelleFrame owner) {
 		super(owner, PixelleBundle.getString(PixelleBundle.PIXEL_OPTIONS));
@@ -67,9 +73,17 @@
 			p.setLayout(new GridLayout(3, 1));
 			p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), PixelleBundle.getString(PixelleBundle.OUT_OF_BOUNDS_PIXELS)));
 			
-			GuiUtils.sizeUniformly(GuiUtils.Sizing.Both, colorBox, borderColorBox, wrappedColorBox);
+			GuiUtils.sizeUniformly(GuiUtils.Sizing.Height, colorBox, colorButton, borderColorBox, wrappedColorBox);
+			colorButton.setColor(defColor);
 			
-			p.add(colorBox);
+			JPanel colorP = new JPanel();
+			colorP.setLayout(new BoxLayout(colorP, BoxLayout.X_AXIS));
+			colorP.add(colorBox);
+			colorP.add(Box.createHorizontalStrut(5));
+			colorP.add(colorButton);
+			colorP.add(Box.createHorizontalGlue());
+			
+			p.add(colorP);
 			p.add(borderColorBox);
 			p.add(wrappedColorBox);
 			
@@ -120,5 +134,17 @@
 				dispose();
 			}
 		});
+		
+		colorButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent ae) {
+				colorBox.setSelected(true);
+				Color chosenColor = JColorChooser.showDialog(PixelleOptionsDialog.this, PixelleBundle.getString(PixelleBundle.PICK_COLOR), defColor);
+				if (chosenColor != null) {
+					defColor = chosenColor;
+					colorButton.setColor(defColor);
+					colorButton.repaint();
+				}
+			}
+		});
 	}
 }

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties	2008-06-22 14:09:48 UTC (rev 49)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties	2008-06-22 14:10:25 UTC (rev 50)
@@ -60,7 +60,8 @@
 label.selection = (Selection)
 
 title.pixel_options = Pixel Options
-title.out_of_bounds_pixels = For out of Bounds Pixels use: 
+title.out_of_bounds_pixels = For out-of-bounds pixels use: 
 label.color = Color
 label.border_color = Closest border color
-label.wrapped_color = Wrapped color
\ No newline at end of file
+label.wrapped_color = Wrapped color
+title.pick_color = Pick a color for out of bounds indices
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.