X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooGUI.java;h=43c553a5d0f11336cb3a1a25f56e5733124ce8b3;hb=623c453a916803c781d32f667fca8698d0814c8c;hp=85968182d7ce3a48e3855b655838ff926fb576d6;hpb=6e3b48dc131ea8abaa475da14ff58b1c637ae1e5;p=moosique.git

diff --git a/MooGUI.java b/MooGUI.java
index 8596818..43c553a 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -21,6 +21,7 @@ public class MooGUI extends JFrame {
 	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.
@@ -30,6 +31,7 @@ public class MooGUI extends JFrame {
 		super("Moosique");
 
 		this.seq = seq;
+		advanceStatus();
 		
 		Container pane = getContentPane();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
@@ -37,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());
@@ -56,8 +60,6 @@ public class MooGUI extends JFrame {
 		setBackground(menu);
 		setBackground(toolbar);
 		setBackground(view);
-		statusBar.setBackground(bgColor);
-		view.setBackground(bgColor);
 
 		// Creates timer.
 		timer = new java.util.Timer();
@@ -74,32 +76,27 @@ 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));
+		am.put("Change octave up", createOctaveAction(1));
+		am.put("Change octave down", createOctaveAction(-1));
 
 		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);
+		KeyStroke octaveUpKey = KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0);
+		KeyStroke octaveDownKey = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 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");
+		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();
 	}
@@ -122,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();
 	}
 
@@ -156,6 +153,10 @@ public class MooGUI extends JFrame {
 		return octaveAction;
 	}
 
+	private void advanceStatus() {
+		System.out.print(".");
+	}
+
 	/**
 	 * Listener for closing the program
 	 */