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

diff --git a/MooGUI.java b/MooGUI.java
index 78105be..4c008f4 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -18,18 +18,19 @@ public class MooGUI extends JFrame {
 	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);
 	
 	/** 
 	 * 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));
@@ -37,10 +38,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());
@@ -90,6 +93,7 @@ public class MooGUI extends JFrame {
 		im.put(octave4Key, "Octave change 4");
 		im.put(octave6Key, "Octave change 6");
 		im.put(octave8Key, "Octave change 8");
+		advanceStatus();
 
 		// Configures window.
 		addWindowListener(new MooGUICloser());
@@ -98,12 +102,16 @@ public class MooGUI extends JFrame {
 		Dimension bounds = Toolkit.getDefaultToolkit().getScreenSize();
 		setSize(bounds.width,bounds.height - 40);
 		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();
@@ -118,7 +126,7 @@ public class MooGUI extends JFrame {
 	 */
 	public void setSequence(Sequence sequence) {
 		seq = sequence;
-		view.setTracks(seq.getTracks());
+		view.setTracks(seq.getTracks(), true);
 		toolbar.resetProgInd();
 	}
 
@@ -140,22 +148,10 @@ public class MooGUI extends JFrame {
 		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
+	/**
+	 * Creates an action for a specific octave.
+	 * @param octave The octave we want an action for.
 	 */
-	public void setDrawEmptyTracks(boolean state) {
-		drawEmptyTracks = state;
-	}
-
 	private Action createOctaveAction(final int octave) {
 		Action octaveAction = new AbstractAction() {
 			public void actionPerformed(ActionEvent ae) {
@@ -164,12 +160,22 @@ public class MooGUI extends JFrame {
 		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(" ");