[Pixelle-commit] SF.net SVN: pixelle: [46] trunk/pixelle

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

Revision: 46
          http://pixelle.svn.sourceforge.net/pixelle/?rev=46&view=rev
Author:   dbrosius
Date:     2008-06-21 09:48:00 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
add in options dialog item

Modified Paths:
--------------
    trunk/pixelle/build.xml
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties

Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml	2008-06-21 16:45:44 UTC (rev 45)
+++ trunk/pixelle/build.xml	2008-06-21 16:48:00 UTC (rev 46)
@@ -42,13 +42,8 @@
 		<delete dir="${classes.dir}"/>
 		<delete dir="${antlr.gen.dir}"/>
 		<delete dir="${javadoc.dir}"/>
+		<delete dir="${jnlp.dir}"/>
 		<delete>
-			<fileset dir="${jnlp.dir}">
-				<include name="pixelle*.jar"/>
-				<include name="*.jnlp"/>
-			</fileset>
-		</delete>
-		<delete>
     		<fileset dir="${basedir}" includes="*.zip"/>
   		</delete>
 	</target>
@@ -58,6 +53,7 @@
 		<mkdir dir="${antlr.gen.dir}"/>
 		<mkdir dir="${src.dir}/com/mebigfatguy"/>
 		<mkdir dir="${javadoc.dir}"/>
+		<mkdir dir="${jnlp.dir}"/>
 		<path id="pixelle.classpath">
 			<pathelement location="${lib.dir}/antlr-runtime-3.1b1.jar"/>
 			<pathelement location="${lib.dir}/asm-3.1.jar"/>

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2008-06-21 16:45:44 UTC (rev 45)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2008-06-21 16:48:00 UTC (rev 46)
@@ -44,6 +44,7 @@
 	public static final String EIGHTTIMES_ITEM = "menu.view.eight_times";
 	public static final String FITTOWINDOW_ITEM = "menu.view.fit_to_window";
 	public static final String TRANSFORM_MENU = "menu.transform.title";
+	public static final String OPTIONS_ITEM = "menu.transform.options";
 	public static final String TRANSFORM_ITEM = "menu.transform.transform";
 	public static final String RED_FORMULA = "formula.red";
 	public static final String GREEN_FORMULA = "formula.green";

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2008-06-21 16:45:44 UTC (rev 45)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2008-06-21 16:48:00 UTC (rev 46)
@@ -43,6 +43,7 @@
 import com.mebigfatguy.pixelle.actions.CloseFileAction;
 import com.mebigfatguy.pixelle.actions.NewFileAction;
 import com.mebigfatguy.pixelle.actions.OpenFileAction;
+import com.mebigfatguy.pixelle.actions.OptionsAction;
 import com.mebigfatguy.pixelle.actions.PageSetupAction;
 import com.mebigfatguy.pixelle.actions.PrintAction;
 import com.mebigfatguy.pixelle.actions.QuitAction;
@@ -77,6 +78,7 @@
 	JCheckBoxMenuItem fitToWindowItem;
 	
 	JMenu transformMenu;
+	JMenuItem optionsItem;
 	JMenuItem transformItem;
 	
 	ResourceBundle rb = ResourceBundle.getBundle("com.mebigfatguy.pixelle.pixelle");
@@ -163,6 +165,8 @@
 		mb.add(viewMenu);
 		
 		transformMenu = new JMenu(rb.getString(PixelleBundle.TRANSFORM_MENU));
+		optionsItem = new JMenuItem(new OptionsAction(this));
+		transformMenu.add(optionsItem);
 		transformItem = new JMenuItem(new TransformAction(this));
 		transformMenu.add(transformItem);
 		

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2008-06-21 16:45:44 UTC (rev 45)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2008-06-21 16:48:00 UTC (rev 46)
@@ -22,12 +22,11 @@
 
 import javax.swing.AbstractAction;
 
-import com.mebigfatguy.pixelle.FrameMgr;
 import com.mebigfatguy.pixelle.PixelleBundle;
-import com.mebigfatguy.pixelle.PixelleExpressionDialog;
 import com.mebigfatguy.pixelle.PixelleFrame;
 import com.mebigfatguy.pixelle.PixelleImage;
 import com.mebigfatguy.pixelle.PixelleTransformer;
+import com.mebigfatguy.pixelle.dialogs.PixelleExpressionDialog;
 
 public class TransformAction extends AbstractAction {
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties	2008-06-21 16:45:44 UTC (rev 45)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/pixelle.properties	2008-06-21 16:48:00 UTC (rev 46)
@@ -43,6 +43,7 @@
 menu.view.fit_to_window = Fit to Window
 
 menu.transform.title = Transform
+menu.transform.options = Options
 menu.transform.transform = Transform
 
 formula.red = p[x,y].r


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