]> ruin.nu Git - moosique.git/commitdiff
försökt få in lyssnare i MooToolbar men det gick inte...och börjat med prog idikator
authorBjörn Lanneskog <lannesko@itstud.chalmers.se>
Wed, 7 May 2003 18:40:17 +0000 (18:40 +0000)
committerBjörn Lanneskog <lannesko@itstud.chalmers.se>
Wed, 7 May 2003 18:40:17 +0000 (18:40 +0000)
puss

MooMenu.java
MooToolbar.java

index d1d8f3c46390d2a1e22fcf5817224020a981b735..a1ce4bdc7d8cfb68a6f164d1971ba227bbb8544f 100644 (file)
@@ -17,14 +17,14 @@ Track               Insert New...           Har vi
                Rechannel...            Kanske
                Split by Pitch...       Onödig
                
-Music          Insert Measure...       Lägg till
-               Delete Measure...       Lägg till
+Music          Insert Measure...       Lagt till
+               Delete Measure...       Lagt till
                Clef...                 Onödig
-               Time Signature...       Lägg till
+               Time Signature...       Lagt till
                Key Signature...        Onödig
-               Tempo...                Lägg till
-               Scale Velocity...       Lägg till
-               Transpose...            Lägg till
+               Tempo...                Lagt till
+               Scale Velocity...       Lagt till
+               Transpose...            Lagt till
                Quantize...             Onödig
 
 Kanske också:  Reset Solo / Mute
@@ -68,7 +68,7 @@ Kanske ocks
                track.add(makeAccItem(track, "Copy track", KeyEvent.VK_Y));
                track.add(makeAccItem(track, "Move", KeyEvent.VK_M));
                
-               music = makeMenu("Music", KeyEvent.VK_T);
+               music = makeMenu("Music", KeyEvent.VK_M);
                add(music);
                
                music.add(makeItem(track, "Insert measure..."));
index 22cde75db5c1bf8bee0e10601478fa0d2368118e..3045118d7cbe573f14105a6cf8c286ded0bbae6a 100644 (file)
@@ -1,6 +1,7 @@
 import javax.swing.*;
 import java.awt.event.*;
 import java.awt.*;
+import java.awt.Color;
 
 public class MooToolbar extends JToolBar implements ActionListener     {
 
@@ -18,6 +19,14 @@ public class MooToolbar extends JToolBar implements ActionListener   {
                fastforward = createButton("images/forward.gif", "fast forward");
                add(fastforward);
                
+               meas = createLabel("Measure");
+               add(meas);
+               
+               beat = createLabel("Beats");
+               add(beat);
+               
+               ticks = createLabel("Ticks");
+               add(ticks);
                
                }
                
@@ -25,14 +34,17 @@ public class MooToolbar extends JToolBar implements ActionListener  {
                        JButton button = new JButton (new ImageIcon(imageLocation));
                        button.setToolTipText(toolTip);
                        button.addActionListener(this);
-                       //JOptionPane.showMessageDialog(rewind.getActionEvent());
                        return button;
                }
                
-               public void actionPerformed(ActionEvent e) {
+               private JLabel createLabel(String name) {
+                       JLabel label = new JLabel(name);
+                       return label;
                        
+               }
+               
+               public void actionPerformed(ActionEvent e) {
                        
-               System.out.println(e.getSource());
                        
                        /*if () {
                        
@@ -49,4 +61,7 @@ public class MooToolbar extends JToolBar implements ActionListener    {
                private JButton playpause;
                private JButton stop;
                private JButton fastforward;
+               private JLabel meas;
+               private JLabel beat;
+               private JLabel ticks;
 }