fixed full-image changes, layers, other stuff.

.gitignore

@@ -14,6 +14,7 @@
 # Other #
 /etc
 /doc
+/test
 *.sh
 *.directory
 .license

src/heroesgrave/paint/gui/AboutDialog.java

@@ -36,10 +36,9 @@
 import com.alee.laf.rootpane.WebFrame;
 import com.alee.laf.text.WebTextPane;
 
+@SuppressWarnings("serial")
 public class AboutDialog extends WebDialog
 {
-	private static final long serialVersionUID = -1020702247965837857L;
-
 	public AboutDialog(WebFrame frame)
 	{
 		super(frame, "About Paint.JAVA");

src/heroesgrave/paint/gui/ColourChooser.java

@@ -20,7 +20,6 @@
 
 package heroesgrave.paint.gui;
 
-import heroesgrave.paint.gui.Menu.CentredJDialog;
 import heroesgrave.paint.main.Paint;
 import heroesgrave.utils.io.IOUtils;
 import heroesgrave.utils.io.TxtFileFilter;
@@ -55,9 +54,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JDialog;
 import javax.swing.JFileChooser;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
@@ -66,6 +63,9 @@
 import javax.swing.WindowConstants;
 import javax.swing.border.TitledBorder;
 
+import com.alee.laf.rootpane.WebDialog;
+import com.alee.laf.rootpane.WebFrame;
+
 public class ColourChooser
 {
 
@@ -1096,7 +1096,7 @@ public void mouseExited(MouseEvent e)
 	/**                                              **/
 	/**                                              **/
 
-	JDialog dialog;
+	WebDialog dialog;
 	SpringLayout dialogLayout;
 
 	JPanel chooserLeft;
@@ -1173,11 +1173,11 @@ public void mouseExited(MouseEvent e)
 	}
 
 	@SuppressWarnings("serial")
-	public ColourChooser(JFrame mainFrame)
+	public ColourChooser(WebFrame mainFrame)
 	{
 
 		// ----- Create the Dialog
-		dialog = new CentredJDialog(mainFrame, "Colour-Chooser - Editing PRIMARY Color");
+		dialog = new WebDialog(mainFrame, "Colour-Chooser - Editing PRIMARY Color");
 		dialogLayout = new SpringLayout();
 
 		// ----- Do the typical configurations for it.
@@ -1633,7 +1633,6 @@ public void show()
 		// We do this because we don't wan't to spend an awful lot of time on the Swing-side of Java internally changing states.
 		if(!dialog.isVisible())
 			dialog.setVisible(true);
-
 	}
 
 	/**
@@ -1803,7 +1802,7 @@ public void setSelectedEditColour(int c, boolean invert)
 	 * 
 	 * @return The colour-choosers JDialog instance.
 	 **/
-	public JDialog getDialog()
+	public WebDialog getDialog()
 	{
 		return dialog;
 	}

src/heroesgrave/paint/gui/Effects.java

@@ -0,0 +1,28 @@
+package heroesgrave.paint.gui;
+
+import heroesgrave.paint.gui.ToolMenu.EffectMenuItem;
+import heroesgrave.paint.tools.effects.Effect;
+import heroesgrave.paint.tools.effects.Invert;
+
+import com.alee.laf.menu.WebMenu;
+
+public class Effects
+{
+	public WebMenu effects, operations;
+
+	public void addEffect(Effect effect, String shortcut)
+	{
+		effects.add(new EffectMenuItem(effect.name, effect, shortcut));
+	}
+
+	public void addOperation(Effect effect, String shortcut)
+	{
+		operations.add(new EffectMenuItem(effect.name, effect, shortcut));
+	}
+
+	public void registerEffects()
+	{
+		addEffect(new Invert("Invert Colour"), "I");
+		//PluginManager.instance.registerEffects(this);
+	}
+}

src/heroesgrave/paint/gui/GUIManager.java

@@ -40,7 +40,6 @@
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
@@ -134,13 +133,12 @@ public void init()
 	{
 		initFrame();
 		initMenu();
-		//initBGPanel();
 		this.canvasPanel = new PaintCanvas(frame);
 		panel.add(canvasPanel, BorderLayout.CENTER);
-
 		chooser = new ColourChooser(frame);
-		layers = new LayerManager();
+		layers = new LayerManager(frame);
 		about = new AboutDialog(frame);
+
 		Paint.main.tools.toolbox = toolBox = new ToolBox();
 		panel.add(toolBox.getToolbar(), BorderLayout.WEST);
 		finish();
@@ -165,59 +163,6 @@ public void setTitle(String title)
 		frame.setTitle(title);
 	}
 
-	/*
-	public void setRenderer(Renderer r)
-	{
-		this.canvasPanel.setRenderer(r);
-	}
-	
-	public void initBGPanel()
-	{
-		this.canvasPanel = new BackgroundPanel();
-		
-		scroll = new WebScrollPane(canvasPanel);
-		scroll.removeMouseWheelListener(scroll.getMouseWheelListeners()[0]);
-		scroll.addMouseWheelListener(new MouseWheelListener()
-		{
-			@Override
-			public void mouseWheelMoved(final MouseWheelEvent e)
-			{
-				if(e.isControlDown())
-				{
-					if(e.getUnitsToScroll() > 0)
-					{
-						canvasPanel.decZoom();
-					}
-					else if(e.getUnitsToScroll() < 0)
-					{
-						canvasPanel.incZoom();
-					}
-				}
-				else
-				{
-					if(e.isShiftDown())
-					{
-						// Horizontal scrolling
-						Adjustable adj = scroll.getHorizontalScrollBar();
-						int scroll = e.getUnitsToScroll() * adj.getBlockIncrement();
-						adj.setValue(adj.getValue() + scroll);
-					}
-					else
-					{
-						// Vertical scrolling
-						Adjustable adj = scroll.getVerticalScrollBar();
-						int scroll = e.getUnitsToScroll() * adj.getBlockIncrement();
-						adj.setValue(adj.getValue() + scroll);
-					}
-				}
-			}
-		});
-		scroll.getVerticalScrollBar().setUnitIncrement(16);
-		scroll.getHorizontalScrollBar().setUnitIncrement(16);
-		this.panel.add(scroll, BorderLayout.CENTER);
-	}
-	*/
-
 	public void initMenu()
 	{
 		info = new InfoMenuBar();
@@ -298,7 +243,7 @@ public void displayCloseDialogue()
 		}
 
 		// dialogue creation
-		final JDialog close = new WebDialog(frame, "Save before you quit?");
+		final WebDialog close = new WebDialog(frame, "Save before you quit?");
 		close.setAlwaysOnTop(true);
 		close.setAutoRequestFocus(true);
 		close.setLayout(new BorderLayout());
@@ -347,7 +292,7 @@ public void actionPerformed(ActionEvent e)
 		close.pack();
 		close.setResizable(false);
 		close.setVisible(true);
-		close.setLocationRelativeTo(null);
+		close.setLocationRelativeTo(frame);
 	}
 
 	/**
@@ -364,11 +309,7 @@ public void finish()
 
 	public void initInputs()
 	{
-		Input in = new Input();
-
-		frame.addKeyListener(in);
-		chooser.getDialog().addKeyListener(in);
-		layers.getDialog().addKeyListener(in);
+		frame.addKeyListener(new Input());
 	}
 
 	public static final ImageIcon getIcon(String name)
@@ -405,5 +346,7 @@ public void repaint()
 	public void setDocument(Document document)
 	{
 		canvasPanel.setDocument(document);
+		layers.setDocument(document);
+		document.reconstructFlatmap();
 	}
 }