X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooToolbar.java;fp=MooToolbar.java;h=5be8fdb77a29d0ddfd251bce0fd60433c9c79333;hp=1ea47ab08f5e3af9becb759089bc58889cdda5ef;hb=e7289eb46e09ee6ed3bc5bb4a814f59902d885cb;hpb=f7097bc07b6688d1629e6894c1c42dc06485dc12

diff --git a/MooToolbar.java b/MooToolbar.java
index 1ea47ab..5be8fdb 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -93,12 +93,11 @@ public class MooToolbar extends JToolBar {
 	 * Resets the progress indicator.
 	 */
 	public void resetProgInd() {
-			measuresValue.setText("1");
-			beatsValue.setText("1");
-			ticksValue.setText("1");
-			playpause.setIcon(playIcon);
-			playpause.setToolTipText("Play");
-			ticksPerBeat = Moosique.getSequence().getResolution();
+		measuresValue.setText("1");
+		beatsValue.setText("1");
+		ticksValue.setText("1");
+		updatePlayButton("Play", playIcon);
+		ticksPerBeat = Moosique.getSequence().getResolution();
 	}
 
 	/**
@@ -131,32 +130,37 @@ public class MooToolbar extends JToolBar {
 		return label;
 	}
 
+	/**
+	 * Updates the play button with the given command and icon.
+	 */
+	private void updatePlayButton(String command, Icon icon) {
+		playpause.setIcon(icon);
+		playpause.setActionCommand(command);
+		playpause.setToolTipText(command);
+	}
+
 	class MAdapter extends MouseAdapter {
 		public void mouseClicked(MouseEvent e) {
 			if (e.getSource() instanceof JButton) {
 				String command = ((JButton)e.getSource()).getActionCommand();
 				if (command == "Play") {
-					playpause.setIcon(pauseIcon);
-					playpause.setActionCommand("Pause");
-					playpause.setToolTipText("Pause");
+					updatePlayButton("Pause", pauseIcon);
 					Moosique.play();
 				} else if (command == "Pause") {
-					playpause.setIcon(playIcon);
-					playpause.setActionCommand("Resume");
-					playpause.setToolTipText("Resume");
+					updatePlayButton("Resume", playIcon);
 					Moosique.pause();
 				} else if (command == "Resume") {
-					playpause.setIcon(pauseIcon);
-					playpause.setActionCommand("Pause");
-					playpause.setToolTipText("Pause");
+					updatePlayButton("Pause", pauseIcon);
 					Moosique.resume();
 				} else if (command == "Rewind") {
+					System.out.println("Rewound!");
 					// Different implementation, perhaps?
+					updatePlayButton("Play", playIcon);
 					Moosique.setEditPosition(0);
 					Moosique.stop();
 				} else if (command == "Fast forward") {
-
 				} else if (command == "Stop") {
+					updatePlayButton("Play", playIcon);
 					Moosique.stop();
 				}
 			} else if (e.getSource() instanceof JLabel) {
@@ -185,7 +189,7 @@ public class MooToolbar extends JToolBar {
 			}
 		}
 
-		public void mousePressed(MouseEvent e) {
+/*		public void mousePressed(MouseEvent e) {
 			if (e.getSource() instanceof JButton) {
 				if (((JButton)e.getSource()).getToolTipText() == "Rewind") {
 					Moosique.rewind(beatsPerMeasure * ticksPerBeat);
@@ -196,5 +200,5 @@ public class MooToolbar extends JToolBar {
 		}
 
 		public void mouseReleased(MouseEvent e) {}
-	}
+*/	}
 }