Fixed recording!!!

[moosique.git] / MooToolbar.java

diff --git a/MooToolbar.java b/MooToolbar.java
index 50aaf4dafbfae93daf83e778a0a357d9a49ebfbb..1ea47ab08f5e3af9becb759089bc58889cdda5ef 100644 (file)
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -102,11 +102,12 @@ public class MooToolbar extends JToolBar {
        }
 
        /**
-        * Creates a button with the specified image and tooltip.
+        * Creates a button with the specified image and action command / tooltip.
         */
-       private JButton createButton(String imagelocation, String tooltip) {
+       private JButton createButton(String imagelocation, String command) {
                JButton button = new JButton (new ImageIcon(imagelocation));
-               button.setToolTipText(tooltip);
+               button.setToolTipText(command);
+               button.setActionCommand(command);
                button.addMouseListener(mouseAdapter);
                return button;
        }
@@ -133,20 +134,29 @@ public class MooToolbar extends JToolBar {
        class MAdapter extends MouseAdapter {
                public void mouseClicked(MouseEvent e) {
                        if (e.getSource() instanceof JButton) {
-                               String toolTip = ((JButton)e.getSource()).getToolTipText();
-                               if (toolTip == "Play") {
+                               String command = ((JButton)e.getSource()).getActionCommand();
+                               if (command == "Play") {
                                        playpause.setIcon(pauseIcon);
+                                       playpause.setActionCommand("Pause");
                                        playpause.setToolTipText("Pause");
                                        Moosique.play();
-                               } else if (toolTip == "Pause") {
+                               } else if (command == "Pause") {
                                        playpause.setIcon(playIcon);
+                                       playpause.setActionCommand("Resume");
                                        playpause.setToolTipText("Resume");
                                        Moosique.pause();
-                               } else if (toolTip == "Resume") {
+                               } else if (command == "Resume") {
                                        playpause.setIcon(pauseIcon);
+                                       playpause.setActionCommand("Pause");
                                        playpause.setToolTipText("Pause");
                                        Moosique.resume();
-                               } else if (toolTip == "Stop") {
+                               } else if (command == "Rewind") {
+                                       // Different implementation, perhaps?
+                                       Moosique.setEditPosition(0);
+                                       Moosique.stop();
+                               } else if (command == "Fast forward") {
+
+                               } else if (command == "Stop") {
                                        Moosique.stop();
                                }
                        } else if (e.getSource() instanceof JLabel) {