Added Filters and many Blocks

+corrected display renderer
+a lot more

Author: apocist

.gitignore

@@ -1,5 +1,5 @@
-.bin/*
-.cache/thumbnails/*
+bin/*
+cache/thumbnails/*.jpg
 *.class
 
 # Windows image file caches

src/com/inverseinnovations/VisualMALSignatureDesigner/BlockWindow.java

@@ -4,6 +4,7 @@
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GridLayout;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -20,10 +21,12 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 import com.inverseinnovations.VisualMALSignatureDesigner.BuildingBlock.*;
+import com.inverseinnovations.VisualMALSignatureDesigner.BuildingBlock.Filter.*;
 
 public class BlockWindow {
 	public final Main Main;
@@ -122,7 +125,9 @@ public void actionPerformed(ActionEvent e){
 
 				//blockFrame.getContentPane().add(imageLabel, BorderLayout.CENTER);
 				blockFrame.pack();
-				blockFrame.setLocationRelativeTo(null);
+				//blockFrame.setLocationRelativeTo(null);
+				Point loc = Main.ImageWindow.getLocation();
+				blockFrame.setLocation((int) loc.getX()-400, (int) loc.getY());
 				blockFrame.setVisible(true);
 
 			}
@@ -136,37 +141,89 @@ public void actionPerformed(ActionEvent e){
 	public JDialog createBlockSelectionDialog(){
 		final JDialog d = new JDialog(blockFrame, "Add Block", true);
 
-		//show selection panel
-		String[] types = {"Background","Text","Anime Title","Anime Status"};
-		final JList<String> list = new JList<String>(types); //data has type Object[]
-		list.setPrototypeCellValue(" Anime Status ");
-		list.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-		list.setLayoutOrientation(JList.HORIZONTAL_WRAP);
-		list.setVisibleRowCount(-1);
-		JScrollPane listScroller = new JScrollPane(list);
-		listScroller.setPreferredSize(new Dimension(250, 80));
-		listScroller.setAlignmentX(JScrollPane.LEFT_ALIGNMENT);
-
-		JPanel listPane = new JPanel();
-		listPane.setLayout(new BoxLayout(listPane, BoxLayout.PAGE_AXIS));
-		listPane.add(Box.createRigidArea(new Dimension(0,5)));
-		listPane.add(listScroller);
-		listPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-
+		String longestBlockName = " Anime Thumbnail ";
+
+		//show block selection panel
+		String[] blockTypes = {"Background","Text","Image","Anime Thumbnail","Anime Title","Anime Status"};
+		final JList<String> blockList = new JList<String>(blockTypes); //data has type Object[]
+		blockList.setPrototypeCellValue(longestBlockName);
+		blockList.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+		blockList.setLayoutOrientation(JList.HORIZONTAL_WRAP);
+		blockList.setVisibleRowCount(-1);
+		JScrollPane blockListScroller = new JScrollPane(blockList);
+		blockListScroller.setPreferredSize(new Dimension(250, 80));
+		blockListScroller.setAlignmentX(JScrollPane.LEFT_ALIGNMENT);
+
+		JPanel blockListPane = new JPanel();
+		blockListPane.setLayout(new BoxLayout(blockListPane, BoxLayout.PAGE_AXIS));
+		blockListPane.add(Box.createRigidArea(new Dimension(0,5)));
+		blockListPane.add(blockListScroller);
+		blockListPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
+		//show filter selection panel
+		String[] filterTypes = {"Rotate"};
+		final JList<String> filterList = new JList<String>(filterTypes); //data has type Object[]
+		filterList.setPrototypeCellValue(longestBlockName);
+		filterList.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+		filterList.setLayoutOrientation(JList.HORIZONTAL_WRAP);
+		filterList.setVisibleRowCount(-1);
+		JScrollPane filterListScroller = new JScrollPane(filterList);
+		filterListScroller.setPreferredSize(new Dimension(250, 80));
+		filterListScroller.setAlignmentX(JScrollPane.LEFT_ALIGNMENT);
+
+		JPanel filterListPane = new JPanel();
+		filterListPane.setLayout(new BoxLayout(filterListPane, BoxLayout.PAGE_AXIS));
+		filterListPane.add(Box.createRigidArea(new Dimension(0,5)));
+		filterListPane.add(filterListScroller);
+		filterListPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
+		//buttons
 		JButton okButton = new JButton("OK");
+
+		JButton cancelButton = new JButton("Cancel");
+		cancelButton.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e){
+				d.dispose();
+			}
+		});
+
+		JPanel buttonPane = new JPanel();
+		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
+		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 3, 3, 3));
+		buttonPane.add(Box.createHorizontalGlue());
+		buttonPane.add(okButton);
+		buttonPane.add(Box.createRigidArea(new Dimension(25, 0)));
+		buttonPane.add(cancelButton);
+		buttonPane.add(Box.createHorizontalGlue());
+
+		//tabs
+		final JTabbedPane tabbedPane = new JTabbedPane();
+		tabbedPane.addTab("Blocks", blockListPane);
+		tabbedPane.addTab("Filters", filterListPane);
+
 		okButton.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e){
-				if(list.getSelectedValue() != null){
+				JList<String> selectedList;
+				if(tabbedPane.getSelectedIndex() == 1){selectedList = filterList;}
+				else{selectedList = blockList;}
+				if(selectedList.getSelectedValue() != null){
 					BuildingBlock child = new BuildingBlock("Null", Main);
-					switch(list.getSelectedValue()){
+					switch(selectedList.getSelectedValue()){
 					case "Background":
 						d.dispose();
 						child = new AddBackground(Main);
 						break;
 					case "Text":
 						d.dispose();
 						child = new AddText(Main);
-
+						break;
+					case "Image":
+						d.dispose();
+						child = new AddImage(Main);
+						break;
+					case "Anime Thumbnail":
+						d.dispose();
+						child = new AddThumbnail(Main);
 						break;
 					case "Anime Title":
 						d.dispose();
@@ -176,30 +233,19 @@ public void actionPerformed(ActionEvent e){
 						d.dispose();
 						child = new AddStatus(Main);
 						break;
+					case "Rotate":
+						d.dispose();
+						child = new FilterRotate(Main);
+						break;
 					}
 					blocks.addObject(child);
 					child.settingsDialog(blockFrame);
 				}
 			}
 		});
-		JButton cancelButton = new JButton("Cancel");
-		cancelButton.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e){
-				d.dispose();
-			}
-		});
-
-		JPanel buttonPane = new JPanel();
-		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
-		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 3, 3, 3));
-		buttonPane.add(Box.createHorizontalGlue());
-		buttonPane.add(okButton);
-		buttonPane.add(Box.createRigidArea(new Dimension(25, 0)));
-		buttonPane.add(cancelButton);
-		buttonPane.add(Box.createHorizontalGlue());
-
+		//content
 		Container contentPane = d.getContentPane();
-		contentPane.add(listPane, BorderLayout.CENTER);
+		contentPane.add(tabbedPane, BorderLayout.CENTER);
 		contentPane.add(buttonPane, BorderLayout.PAGE_END);
 
 		d.pack();

src/com/inverseinnovations/VisualMALSignatureDesigner/BuildingBlock/AddBackground.java

@@ -141,7 +141,7 @@ public BufferedImage display(BufferedImage image){
 		if(getChildCount() > 0){
 			//send this to each child to rerender(filter)
 			for(int i = 0; i< getChildCount(); i++){
-				if(!((BuildingBlock) ((DefaultMutableTreeNode) getChildAt(i)).getUserObject()).ISFILTER){
+				if(!((BuildingBlock) ((DefaultMutableTreeNode) getChildAt(i)).getUserObject()).isFilter()){
 					image = Main.sig.filter.composite(image, ((BuildingBlock) ((DefaultMutableTreeNode) getChildAt(i)).getUserObject()).display(image), 0, 0);
 				}
 				else{//if filter