X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=490026440350483e48b0f7bfd0aac2a4ab8afeba;hb=f520dce96c76f627677c5d9957e8371d02a31ec0;hp=21dbdd553b09073b609b94ba090ff64eddb67a2c;hpb=a25242af0e55e3db5135b29e2d7e554d5fafaaaa;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 21dbdd5..4900264 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -2,6 +2,7 @@ import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.*;
 
 /**
  * Moosique's graphical user interface.
@@ -16,17 +17,21 @@ public class MooGUI extends JFrame {
 	private MooToolbar toolbar;
 	private MooView view;
 	private JLabel statusBar;
+	private java.util.Timer timer;
+	public static final int statusResetDelay = 3000;
 	public static final Font FONT = new Font("Helvetica", Font.PLAIN, 10);
 	public static final Color bgColor = new Color(192, 224, 255);
+	public static final Image logo = Toolkit.getDefaultToolkit().getImage("images/moose.gif");
 	
 	/** 
 	 * Creates the GUI.
+	 * @param seq The sequence that the program is operating on.
 	 */
 	public MooGUI(Sequence seq) {
 		super("Moosique");
 
-
 		this.seq = seq;
+		advanceStatus();
 		
 		Container pane = getContentPane();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
@@ -34,10 +39,12 @@ public class MooGUI extends JFrame {
 		// Adds menu bar.
 		menu = new MooMenu();
 		setJMenuBar(menu);
+		advanceStatus();
 
 		// Adds toolbar.
 		toolbar = new MooToolbar();
 		pane.add(toolbar, BorderLayout.NORTH);
+		advanceStatus();
 
 		// Adds main view.
 		view = new MooView(seq.getTracks());
@@ -53,10 +60,11 @@ public class MooGUI extends JFrame {
 		setBackground(menu);
 		setBackground(toolbar);
 		setBackground(view);
-		statusBar.setBackground(bgColor);
-		view.setBackground(bgColor);
 
-		// Sets up global key listener
+		// Creates timer.
+		timer = new java.util.Timer();
+
+		// Sets up global key listener.
 		ActionMap am = getRootPane().getActionMap();
 
 		Action playAction = new AbstractAction() {
@@ -68,24 +76,35 @@ public class MooGUI extends JFrame {
 				}
 			}};
 		am.put("Play", playAction);
+		am.put("Change octave up", createOctaveAction(true));
+		am.put("Change octave down", createOctaveAction(false));
 
 		InputMap im = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 		KeyStroke playKey = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0);
+		KeyStroke octaveUpKey = KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0);
+		KeyStroke octaveDownKey = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0);
 		im.put(playKey, "Play");
+		im.put(octaveUpKey, "Change octave up");
+		im.put(octaveDownKey, "Change octave down");
+		advanceStatus();
 
 		// Configures window.
 		addWindowListener(new MooGUICloser());
 		pack();
-		setIconImage(Toolkit.getDefaultToolkit().getImage("images/moose.gif"));
+		setIconImage(logo);
 		Dimension bounds = Toolkit.getDefaultToolkit().getScreenSize();
-		setSize(bounds.width,bounds.height - 40);
+		setSize(bounds.width,bounds.height - 28);
 		setLocation(0, 0);
-		// setResizable(false);
 		setBackground(Color.white);
+		advanceStatus();
 		setVisible(true);
 		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();
@@ -100,7 +119,7 @@ public class MooGUI extends JFrame {
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.setTracks(seq.getTracks());
+		view.setTracks(seq.getTracks(), true);
 		toolbar.resetProgInd();
 	}
 
@@ -110,6 +129,7 @@ public class MooGUI extends JFrame {
 	 */
 	public void setStatus(String text) {
 		statusBar.setText(text);
+		timer.schedule(new StatusResetTask(), statusResetDelay);
 	}
 
 	/**
@@ -121,9 +141,37 @@ public class MooGUI extends JFrame {
 		toolbar.updateProgInd(tickPosition);
 	}
 
+	/**
+	 * Creates an action for a specific octave.
+	 * @param increase 	true for increase, false for decrease
+	 */
+	private Action createOctaveAction(final boolean increase) {
+		Action octaveAction = new AbstractAction() {
+			public void actionPerformed(ActionEvent ae) {
+				MooKeyboard.setRelativeOctave(increase);
+			}};
+		return octaveAction;
+	}
+
+	private void advanceStatus() {
+		System.out.print(".");
+	}
+
+	/**
+	 * 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(" ");
+		}
+	}
 }