X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=9f171a3a8c6a11965eb118a2b3e044af17d483eb;hb=ca56fc1424e8887b09375a52e8e02605d5dff175;hp=7bcd6dd854d103d8360c78f1396ad0c9dde62eae;hpb=2e2fa52cef9db49f82d1dec2a8c4c03c5c6f387b;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 7bcd6dd..9f171a3 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -6,19 +6,18 @@ import java.awt.event.*;
 /**
  * Moosique's graphical user interface.
  * 
- * @author  Mikael Andreen
+ * @author  Einar Pehrson
  */
  
 public class MooGUI extends JFrame {
 
 	private Sequence seq;
-
+	private MooMenu menu;
 	private MooToolbar toolbar;
-	private JPanel trackPanel;
-	private MooTrackView[] trackViews;
+	private MooView view;
 	private JLabel statusBar;
-
-	public static Font standardFont = new Font("Helvetica", Font.PLAIN, 10);
+	public static final Font FONT = new Font("Helvetica", Font.PLAIN, 10);
+	public static final Color bgColor = new Color(192, 224, 255);
 	
 	/** 
 	 * Creates the GUI.
@@ -30,25 +29,53 @@ public class MooGUI extends JFrame {
 		
 		Container pane = getContentPane();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
-		
+
 		// Adds menu bar.
-		setJMenuBar(new MooMenu());
+		menu = new MooMenu();
+		setJMenuBar(menu);
 
 		// Adds toolbar.
 		toolbar = new MooToolbar();
 		pane.add(toolbar, BorderLayout.NORTH);
 
-		// Adds tracks.
-		trackPanel = new JPanel(true);
-		createTrackViews();
-		pane.add(trackPanel, BorderLayout.CENTER);
+		// Adds main view.
+		view = new MooView(seq.getTracks());
+		pane.add(view, BorderLayout.CENTER);
 
 		// Adds status bar.
 		statusBar = new JLabel("Welcome to Moosique!", JLabel.CENTER);
+		statusBar.setFont(FONT);
 		pane.add(statusBar, BorderLayout.SOUTH);
 
+		// Brings on the colors!
+		setBackground(pane);
+		setBackground(menu);
+		setBackground(toolbar);
+		setBackground(view);
+		statusBar.setBackground(bgColor);
+		view.setBackground(bgColor);
+
+		// 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);
@@ -57,14 +84,23 @@ public class MooGUI extends JFrame {
 		setVisible(true);
 		show();
 	}
-	
+
+	private void setBackground(Container c) {
+		c.setBackground(bgColor);
+		Component[] comps = c.getComponents();
+		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;
-		createTrackViews();
+		view.setTracks(seq.getTracks());
+		toolbar.resetProgInd();
 	}
 
 	/** 
@@ -74,23 +110,19 @@ public class MooGUI extends JFrame {
 	public void setStatus(String text) {
 		statusBar.setText(text);
 	}
-	
-	/** 
-	 * Fills the track panel with track views for all tracks in the current sequence.
+
+	/**
+	 * Calls on the main view to update the track views,
+	 * and on the toolbar to update the progress indicator.
 	 */
-	private void createTrackViews() {
-		trackPanel.removeAll();
-		Track[] tracks = seq.getTracks();
-		trackPanel.setLayout(new GridLayout(1, tracks.length));
-		trackViews = new MooTrackView[tracks.length];
-		for (int i = 0; i < tracks.length; i++) {
-			trackViews[i] = new MooTrackView(tracks[i]);
-			trackPanel.add(new MooTrackView(tracks[i]));
-		}
-		trackPanel.validate();
+	public void update(long tickPosition){
+		view.update(tickPosition);
+		toolbar.updateProgInd(tickPosition);
 	}
-	
+
 	class MooGUICloser extends WindowAdapter {
-		public void windowClosing(WindowEvent e) {Moosique.quit();}
+		public void windowClosing(WindowEvent e) {
+			Moosique.quit();
+		}
 	}
-}
\ No newline at end of file
+}