X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNoteElement.java;h=43b7b27ff6153bad1673dc63df67066222df46f2;hp=8d8778d369e57a18b778f39734a9158644b50385;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=e31778837bee5cfbbaf643d17f1eaeb086d8e50c

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 8d8778d..43b7b27 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -13,13 +13,13 @@ public class MooNoteElement extends JPanel {
 
 	private MooTrackView mtv;
 	private MooNote note;
-	private boolean selected;
 	private Rectangle pitchRect, veloRect;
+	public Color textColor;
 	public static final Color bgColor = new Color(160, 218, 255);
-	private String notePitch;
-	private String noteVelocity;
+	public static final Color invBgColor = new Color(96, 38, 0);
+	private String notePitch, noteVelocity;
 	private JPopupMenu popup;
-	private JMenuItem popupRemove, popupProp;
+	private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown;
 
 	/** 
 	 * Creates a new note element.
@@ -30,9 +30,10 @@ public class MooNoteElement extends JPanel {
 		mtv = parent;
 		note = mn;
 		calculateString();
+		addMouseListener(new MAdapter());
 		setBorder(BorderFactory.createLineBorder(Color.black));
 		setBackground(bgColor);
-		addMouseListener(new MAdapter());
+		textColor = Color.black;
 
 		// Defines coordinates.
 		pitchRect = new Rectangle(0, 0, 15, 10);
@@ -44,19 +45,15 @@ public class MooNoteElement extends JPanel {
 		popupProp = new JMenuItem("Preferences...");
 		popupProp.addActionListener(pList);
 		popup.add(popupProp);
-
 		popupRemove = new JMenuItem("Remove");
 		popupRemove.addActionListener(pList);
 		popup.add(popupRemove);
-
-	}
-
-	/** 
-	 * Returns true if the current NoteElement is selected, otherwise false.
-	 * @return if the element is selected
-	 */
-	public boolean isSelected() {
-		return selected;
+		popupTransposeOctUp = new JMenuItem("Transpose one octave up");
+		popupTransposeOctUp.addActionListener(pList);
+		popup.add(popupTransposeOctUp);
+		popupTransposeOctDown = new JMenuItem("Transpose one octave down");
+		popupTransposeOctDown.addActionListener(pList);
+		popup.add(popupTransposeOctDown);
 	}
 
 	/** 
@@ -69,10 +66,22 @@ public class MooNoteElement extends JPanel {
 
 	/** 
 	 * Selects the current NoteElement.
-	 * @param state	if the element should be selected
 	 */
-	public void setSelected(boolean state) {
-		selected = state;
+	public void select() {
+		mtv.addSelected(this);
+		setBackground(invBgColor);
+		textColor = Color.white;
+		repaint();
+	}
+
+	/** 
+	 * Deselects the current NoteElement.
+	 */
+	public void deselect() {
+		// mtv.removeSelected(this);
+		setBackground(bgColor);
+		textColor = Color.black;
+		repaint();
 	}
 
 	/**
@@ -84,6 +93,7 @@ public class MooNoteElement extends JPanel {
 		super.paintComponent(g);
 		if (!(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
+		g2.setColor(textColor);
 		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
 	/*
 		switch(columns) {
@@ -131,15 +141,15 @@ public class MooNoteElement extends JPanel {
 	class MAdapter extends MouseAdapter {
 	
 		public void mouseClicked(MouseEvent e) {
-			
+			select();
+			// Play the note
 		}
 
 		/**
 		 * Checks if the mouse is pressed.
-		 * Pops up the menu if right mousebutton is used.
-		 * Increases the pitch or velocity if the right mousebutton is pressed while holding ctrl down.
-		 * Decreases the pitch or velocity if the left mousebutton is pressed while holding ctrl down.
-		 * @param e The events recieved.
+		 * Increases the pitch or velocity if the right mouse button is pressed while holding CTRL.
+		 * Decreases the pitch or velocity if the left mouse button is pressed while holding CTRL.
+		 * @param e the event recieved.
 		 */
 		public void mousePressed(MouseEvent e) {
 			if (e.isControlDown()) {
@@ -150,6 +160,7 @@ public class MooNoteElement extends JPanel {
 						note.setPitch(note.getPitch() - 1);
 					}
 					calculateString();
+					repaint();
 				} else if (veloRect.contains(e.getPoint())) {
 					if (SwingUtilities.isRightMouseButton(e)) {
 						note.setVelocity(note.getVelocity() + 1);
@@ -157,11 +168,20 @@ public class MooNoteElement extends JPanel {
 						note.setVelocity(note.getVelocity() - 1);
 					}
 					calculateString();
+					repaint();
 				}
-				e.getComponent().repaint();
-			} else if (e.isPopupTrigger()) {
-				popup.show(e.getComponent(), e.getX(), e.getY());
-			}
+			} else maybeShowPopup(e);
+		}
+
+		public void mouseReleased(MouseEvent e) {
+			maybeShowPopup(e);
+		}
+
+		/**
+		 * Shows the menu if an OS-specific popup-trigger was activated.
+		 */
+		private void maybeShowPopup(MouseEvent e) {
+			if (e.isPopupTrigger() && !e.isControlDown()) popup.show(e.getComponent(), e.getX(), e.getY());
 		}
 	}
 
@@ -171,19 +191,29 @@ public class MooNoteElement extends JPanel {
 	class PopupListener implements ActionListener {
 		public void actionPerformed(ActionEvent e) {
 			Object source = e.getSource();
-			if  (source == popupProp) {
+			if (source == popupProp) {
 				new MooDialog(note);
-			} else if  (source == popupRemove) {
+			} else if (source == popupRemove) {
 				remove();
+			} else if (source == popupTransposeOctUp) {
+				note.setPitch(note.getPitch() + 12);
+				update();
+			} else if (source == popupTransposeOctDown) {
+				note.setPitch(note.getPitch() - 12);
+				update();
 			}
 		}
+
+		private void update() {
+			calculateString();
+			repaint();
+		}
 	}
 
 	/**
-	 * Asks the MooTrackView that it's painted on to remove this element and the note.
+	 * Asks the MooTrackView that the note element is painted on to remove this element and the note.
 	 */
 	protected void remove(){
 		mtv.removeNote(this);
 	}
-
 }