X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=78105be707d229b2743fae15323b1bebe879e6a8;hb=049faea5b17c1cd2c7af02bd8b162ae5c7f0eb45;hp=7019828a67abbe19af427caa1432fb6b8d369c98;hpb=f97b2830039d5217536a815e08b987c783501975;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 7019828..78105be 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,9 @@ public class MooGUI extends JFrame {
 	private MooToolbar toolbar;
 	private MooView view;
 	private JLabel statusBar;
+	private java.util.Timer timer;
+	private boolean drawEmptyTracks = false;
+	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);
 	
@@ -39,7 +43,7 @@ public class MooGUI extends JFrame {
 		pane.add(toolbar, BorderLayout.NORTH);
 
 		// Adds main view.
-		view = new MooView(seq);
+		view = new MooView(seq.getTracks());
 		pane.add(view, BorderLayout.CENTER);
 
 		// Adds status bar.
@@ -55,9 +59,42 @@ 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);
+		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());
 		pack();
+		setIconImage(Toolkit.getDefaultToolkit().getImage("images/moose.gif"));
 		Dimension bounds = Toolkit.getDefaultToolkit().getScreenSize();
 		setSize(bounds.width,bounds.height - 40);
 		setLocation(0, 0);
@@ -74,14 +111,15 @@ public class MooGUI extends JFrame {
 			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.setSequence(seq);
+		view.setTracks(seq.getTracks());
+		toolbar.resetProgInd();
 	}
 
 	/** 
@@ -90,20 +128,51 @@ public class MooGUI extends JFrame {
 	 */
 	public void setStatus(String text) {
 		statusBar.setText(text);
+		timer.schedule(new StatusResetTask(), statusResetDelay);
 	}
 
 	/**
-	 * Update the view.
+	 * Calls on the main view to update the track views,
+	 * and on the toolbar to update the progress indicator.
 	 */
-	public void update(){
-		view.update();
-		// Calls on the toolbar to update the progress indicator.
-		//toolbar.updateProgInd();
+	public void update(long tickPosition){
+		view.update(tickPosition);
+		toolbar.updateProgInd(tickPosition);
 	}
-	
+
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public boolean drawEmptyTracks() {
+		return drawEmptyTracks;
+	}
+
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
+	private Action createOctaveAction(final int octave) {
+		Action octaveAction = new AbstractAction() {
+			public void actionPerformed(ActionEvent ae) {
+				MooKeyboard.setOctave(octave);
+			}};
+		return octaveAction;
+	}
+
 	class MooGUICloser extends WindowAdapter {
 		public void windowClosing(WindowEvent e) {
 			Moosique.quit();
 		}
 	}
+	
+	class StatusResetTask extends TimerTask {
+		public void run() {
+			setStatus(" ");
+		}
+	}
 }