X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=b1bbf0d8b3e6aafed3dbee05570346fcdc7859f8;hb=cf968519ee77ab329c3e739c6340a9d688a31508;hp=97b4ad0dc431b6dca32f2a42e8f8a73ea3e5e673;hpb=cd7d6166d73969c1c811ac7153cc6eee59a6a685;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 97b4ad0..b1bbf0d 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,6 +17,8 @@ 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);
 	
@@ -55,9 +58,30 @@ public class MooGUI extends JFrame {
 		statusBar.setBackground(bgColor);
 		view.setBackground(bgColor);
 
+		// Creates timer.
+		timer = new java.util.Timer();
+
+		// Sets up global key listener
+		ActionMap am = getRootPane().getActionMap();
+
+		Action playAction = new AbstractAction() {
+			public void actionPerformed(ActionEvent ae) {
+				if (!Moosique.getSequencer().isRunning()) {
+					Moosique.play();
+				} else {
+					Moosique.stop();
+				}
+			}};
+		am.put("Play", playAction);
+
+		InputMap im = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+		KeyStroke playKey = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0);
+		im.put(playKey, "Play");
+
 		// Configures window.
 		addWindowListener(new MooGUICloser());
 		pack();
+		setIconImage(Toolkit.getDefaultToolkit().getImage("images/moose.gif"));
 		Dimension bounds = Toolkit.getDefaultToolkit().getScreenSize();
 		setSize(bounds.width,bounds.height - 40);
 		setLocation(0, 0);
@@ -70,19 +94,19 @@ public class MooGUI extends JFrame {
 	private void setBackground(Container c) {
 		c.setBackground(bgColor);
 		Component[] comps = c.getComponents();
-		System.out.println(comps.length);
 		for (int i = 0; i < comps.length; i++) {
 			comps[i].setBackground(bgColor);
 		}
 	}
-	
+
 	/** 
 	 * Changes the sequence of the GUI.
 	 * @param sequence	the MIDI sequence to visualize
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.update(seq.getTracks());
+		view.setTracks(seq.getTracks());
+		toolbar.resetProgInd();
 	}
 
 	/** 
@@ -91,11 +115,27 @@ public class MooGUI extends JFrame {
 	 */
 	public void setStatus(String text) {
 		statusBar.setText(text);
+		timer.schedule(new StatusResetTask(), statusResetDelay);
 	}
-	
+
+	/**
+	 * Calls on the main view to update the track views,
+	 * and on the toolbar to update the progress indicator.
+	 */
+	public void update(long tickPosition){
+		view.update(tickPosition);
+		toolbar.updateProgInd(tickPosition);
+	}
+
 	class MooGUICloser extends WindowAdapter {
 		public void windowClosing(WindowEvent e) {
 			Moosique.quit();
 		}
 	}
-}
\ No newline at end of file
+	
+	class StatusResetTask extends TimerTask {
+		public void run() {
+			setStatus(" ");
+		}
+	}
+}