[Pixelle-commit] SF.net SVN: pixelle: [156] trunk/pixelle/src/com/mebigfatguy/pixelle
Brought to you by:
dbrosius
Menu
▾
▴
[Pixelle-commit] SF.net SVN: pixelle: [156] trunk/pixelle/src/com/mebigfatguy/pixelle
|
From: <dbr...@us...> - 2008-07-09 05:35:40
|
Revision: 156
http://pixelle.svn.sourceforge.net/pixelle/?rev=156&view=rev
Author: dbrosius
Date: 2008-07-08 22:35:48 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
build out the saveAlgorithmDialog class
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-07-08 04:02:26 UTC (rev 155)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-07-09 05:35:48 UTC (rev 156)
@@ -113,6 +113,9 @@
}
+ public String[] getUserGroups() {
+ return userAlgorithms.keySet().toArray(new String[userAlgorithms.size()]);
+ }
public void addAlgorithm(String group, String name, Map<PixelleComponent, String> algorithm) {
}
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2008-07-08 04:02:26 UTC (rev 155)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2008-07-09 05:35:48 UTC (rev 156)
@@ -61,6 +61,7 @@
public static final String SELECTION_FORMULA = "formula.selection";
public static final String PIXEL_ALGORITHMS = "title.algorithms";
public static final String PIXEL_ALGORITHM = "label.algorithm";
+ public static final String PIXEL_GROUP = "label.group";
public static final String RED_LABEL = "label.red";
public static final String GREEN_LABEL = "label.green";
public static final String BLUE_LABEL = "label.blue";
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-07-08 04:02:26 UTC (rev 155)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-07-09 05:35:48 UTC (rev 156)
@@ -210,7 +210,7 @@
save.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
- SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame, null);
+ SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame);
dialog.setLocationRelativeTo(frame);
dialog.setModal(true);
dialog.setVisible(true);
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2008-07-08 04:02:26 UTC (rev 155)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2008-07-09 05:35:48 UTC (rev 156)
@@ -18,33 +18,101 @@
*/
package com.mebigfatguy.pixelle.dialogs;
-import java.awt.BorderLayout;
import java.awt.Container;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.util.Map;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import com.mebigfatguy.pixelle.AlgorithmArchiver;
import com.mebigfatguy.pixelle.PixelleBundle;
-import com.mebigfatguy.pixelle.PixelleComponent;
import com.mebigfatguy.pixelle.PixelleFrame;
+import com.mebigfatguy.pixelle.utils.GuiUtils;
-public class SaveAlgorithmDialog extends JDialog {
-
- private Map<PixelleComponent, String> algorithm;
+public class SaveAlgorithmDialog extends JDialog {
+ private static final long serialVersionUID = -6991592080722431427L;
- public SaveAlgorithmDialog(PixelleFrame owner, Map<PixelleComponent, String> algorithmToSave) {
+ private JLabel[] labels = new JLabel[] {
+ new JLabel(PixelleBundle.getString(PixelleBundle.PIXEL_GROUP)),
+ new JLabel(PixelleBundle.getString(PixelleBundle.PIXEL_ALGORITHM))
+ };
+
+ private JComboBox groupBox;
+ private JTextField nameField;
+ private JButton ok;
+ private JButton cancel;
+ private boolean okClicked = false;
+
+ public SaveAlgorithmDialog(PixelleFrame owner) {
super(owner, PixelleBundle.getString(PixelleBundle.SAVE_ALGORITHM));
- algorithm = algorithmToSave;
initComponents();
initListeners();
}
+ public boolean isOK() {
+ return okClicked;
+ }
+
+ public String getGroup() {
+ return (String)groupBox.getSelectedItem();
+ }
+
+ public String getName() {
+ return nameField.getText();
+ }
+
private void initComponents() {
Container cp = getContentPane();
- cp.setLayout(new BorderLayout(4, 4));
+ cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS));
+ String[] groups = AlgorithmArchiver.getArchiver().getUserGroups();
+ groupBox = new JComboBox(new DefaultComboBoxModel(groups));
+ groupBox.setEditable(true);
+ nameField = new JTextField(10);
+ GuiUtils.sizeUniformly(GuiUtils.Sizing.Both, labels);
+ GuiUtils.sizeUniformly(GuiUtils.Sizing.Both, groupBox, nameField);
+
+ JComponent[] fields = new JComponent[] {groupBox, nameField};
+ cp.add(Box.createVerticalStrut(20));
+ for (int i = 0; i < labels.length; i++) {
+ JPanel p = new JPanel();
+ p.setBorder(BorderFactory.createEmptyBorder(2, 30, 2, 30));
+ p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS));
+ p.add(Box.createHorizontalGlue());
+ p.add(labels[i]);
+ p.add(Box.createHorizontalStrut(10));
+ p.add(fields[i]);
+ labels[i].setLabelFor(fields[i]);
+ p.add(Box.createHorizontalGlue());
+ cp.add(p);
+ cp.add(Box.createVerticalStrut(10));
+ }
+
+ JPanel p = new JPanel();
+ p.setBorder(BorderFactory.createEmptyBorder(2, 30, 20, 30));
+ p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS));
+ ok = new JButton(PixelleBundle.getString(PixelleBundle.OK));
+ cancel = new JButton(PixelleBundle.getString(PixelleBundle.CANCEL));
+ GuiUtils.sizeUniformly(GuiUtils.Sizing.Both, ok, cancel);
+ p.add(Box.createHorizontalGlue());
+ p.add(ok);
+ p.add(Box.createHorizontalStrut(10));
+ p.add(cancel);
+ p.add(Box.createHorizontalGlue());
+
+ cp.add(p);
pack();
}
@@ -57,6 +125,18 @@
dispose();
}
});
-
+
+ ok.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent ae) {
+ okClicked = true;
+ dispose();
+ }
+ });
+
+ cancel.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent ae) {
+ dispose();
+ }
+ });
}
}
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2008-07-08 04:02:26 UTC (rev 155)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2008-07-09 05:35:48 UTC (rev 156)
@@ -55,6 +55,7 @@
formula.transparency = p[x,y].t
formula.selection = p[x,y].s
+label.group = Group
title.algorithms = Pixel Algorithms
label.algorithm = Algorithm
save.algorithm = Save
@@ -77,4 +78,3 @@
label.wave_color = Color Waving
label.save_overwrite = The file "{0}" already exists, do you want to overwrite it?
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
