X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooGUI.java;h=e1ee025a60476934fcabe2a2fc03836e4e891748;hp=b1bbf0d8b3e6aafed3dbee05570346fcdc7859f8;hb=c3a31c2aa833e2197f0929655c69a2090e8bbecc;hpb=f852147b2a61dcfebc065b38dff854f609899ff0

diff --git a/MooGUI.java b/MooGUI.java
index b1bbf0d..e1ee025 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -24,6 +24,7 @@ public class MooGUI extends JFrame {
 	
 	/** 
 	 * Creates the GUI.
+	 * @param seq The sequence that the program is operating on.
 	 */
 	public MooGUI(Sequence seq) {
 		super("Moosique");
@@ -61,7 +62,7 @@ public class MooGUI extends JFrame {
 		// Creates timer.
 		timer = new java.util.Timer();
 
-		// Sets up global key listener
+		// Sets up global key listener.
 		ActionMap am = getRootPane().getActionMap();
 
 		Action playAction = new AbstractAction() {
@@ -73,10 +74,22 @@ public class MooGUI extends JFrame {
 				}
 			}};
 		am.put("Play", playAction);
+		am.put("Octave change 2", createOctaveAction(2));
+		am.put("Octave change 4", createOctaveAction(4));
+		am.put("Octave change 6", createOctaveAction(6));
+		am.put("Octave change 8", createOctaveAction(8));
 
 		InputMap im = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 		KeyStroke playKey = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0);
+		KeyStroke octave2Key = KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0);
+		KeyStroke octave4Key = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0);
+		KeyStroke octave6Key = KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0);
+		KeyStroke octave8Key = KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0);
 		im.put(playKey, "Play");
+		im.put(octave2Key, "Octave change 2");
+		im.put(octave4Key, "Octave change 4");
+		im.put(octave6Key, "Octave change 6");
+		im.put(octave8Key, "Octave change 8");
 
 		// Configures window.
 		addWindowListener(new MooGUICloser());
@@ -91,6 +104,10 @@ public class MooGUI extends JFrame {
 		show();
 	}
 
+	/**
+	 * Sets the background on Containers
+	 * @param c the Container that will have it's background change
+	 */
 	private void setBackground(Container c) {
 		c.setBackground(bgColor);
 		Component[] comps = c.getComponents();
@@ -105,7 +122,7 @@ public class MooGUI extends JFrame {
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.setTracks(seq.getTracks());
+		view.setTracks(seq.getTracks(), true);
 		toolbar.resetProgInd();
 	}
 
@@ -127,12 +144,30 @@ public class MooGUI extends JFrame {
 		toolbar.updateProgInd(tickPosition);
 	}
 
+	/**
+	 * Creates an action for a specific octave.
+	 * @param octave The octave we want an action for.
+	 */
+	private Action createOctaveAction(final int octave) {
+		Action octaveAction = new AbstractAction() {
+			public void actionPerformed(ActionEvent ae) {
+				MooKeyboard.setOctave(octave);
+			}};
+		return octaveAction;
+	}
+
+	/**
+	 * Listener for closing the program
+	 */
 	class MooGUICloser extends WindowAdapter {
 		public void windowClosing(WindowEvent e) {
 			Moosique.quit();
 		}
 	}
 	
+	/**
+	 * TimerTask that resets the statusbar
+	 */
 	class StatusResetTask extends TimerTask {
 		public void run() {
 			setStatus(" ");