Added some popup-menu items.

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 4b5d967ab9b3c8721020a4a236efa6352b7fd11e..3a068cd67908b13456b1ae0bf014401ff7f0cd7c 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -13,25 +13,23 @@ public class MooNoteElement extends JPanel {
 
        private MooTrackView mtv;
        private MooNote note;
-       private int columns;
        private boolean selected;
        private Rectangle pitchRect, veloRect;
        public static final Color bgColor = new Color(160, 218, 255);
        private String notePitch;
        private String noteVelocity;
        private JPopupMenu popup;
-       private JMenuItem popupRemove, popupProp;
+       private JMenuItem popupRemove, popupProp, popupTransposeOctUp, popupTransposeOctDown;
 
        /** 
         * Creates a new note element.
+        * @param parent        The MooTrackView that this element will be painted on.
         * @param mn    the note that will be graphically represented
-        * @param rows  the number of rows that the note will occupy
         */
        public MooNoteElement (MooTrackView parent, MooNote mn) {
                mtv = parent;
                note = mn;
                calculateString();
-               columns = mn.getDuration() / (Moosique.getSequence().getResolution() / 4);
                setBorder(BorderFactory.createLineBorder(Color.black));
                setBackground(bgColor);
                addMouseListener(new MAdapter());
@@ -46,10 +44,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);
+               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);
 
        }
 
@@ -61,6 +64,14 @@ public class MooNoteElement extends JPanel {
                return selected;
        }
 
+       /** 
+        * Returns the note of this element.
+        * @return the note
+        */
+       public MooNote getNote() {
+               return note;
+       }
+
        /** 
         * Selects the current NoteElement.
         * @param state if the element should be selected
@@ -70,7 +81,8 @@ public class MooNoteElement extends JPanel {
        }
 
        /**
-        *
+        * Draws the string that shows the note's properties.
+        * @param g     The Graphics object used to draw the strings.
         */
        public void paintComponent(Graphics g)
        {
@@ -86,10 +98,13 @@ public class MooNoteElement extends JPanel {
                }
        */
                
-               g2.drawString(notePitch, 1, 9);
-               g2.drawString("" + noteVelocity, 21, 9);
+               g2.drawString(notePitch, 1, 8);
+               g2.drawString("" + noteVelocity, 21, 8);
        }
 
+       /**
+        * Calculate what the string that shows the note properties should look like.
+        */
        protected void calculateString(){
 
                noteVelocity = ""; 
@@ -115,11 +130,21 @@ public class MooNoteElement extends JPanel {
                noteVelocity = ""+note.getVelocity();
        }
 
-       public MooNote getNote(){
-               return note;
-       }
-
+       /**
+        * Listener that checks the mouse actions on this element.
+        */
        class MAdapter extends MouseAdapter {
+       
+               public void mouseClicked(MouseEvent e) {
+                       // Play the note
+               }
+
+               /**
+                * Checks if the mouse is pressed.
+                * 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 event recieved.
+                */
                public void mousePressed(MouseEvent e) {
                        if (e.isControlDown()) {
                                if (pitchRect.contains(e.getPoint())) {
@@ -129,6 +154,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);
@@ -136,28 +162,52 @@ public class MooNoteElement extends JPanel {
                                                note.setVelocity(note.getVelocity() - 1);
                                        }
                                        calculateString();
+                                       repaint();
                                }
-                               e.getComponent().repaint();
-                       }
-                       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());
                }
        }
 
+       /**
+        * Listens on the actions made to the popupmenu.
+        */
        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 the note element is painted on to remove this element and the note.
+        */
        protected void remove(){
-               mtv.remove(this);
+               mtv.removeNote(this);
        }
-
 }