some gui changes..

[moosique.git] / MooToolbar.java

diff --git a/MooToolbar.java b/MooToolbar.java
index dfac2a576c0106c01c4e07cea88cbb99d82fcb15..84f0c5377238292b3102e61fb5fa70c687e5e52c 100644 (file)
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -1,7 +1,6 @@
 import javax.swing.*;
 import java.awt.event.*;
 import java.awt.*;
-import java.awt.Color;
 
 public class MooToolbar extends JToolBar implements ActionListener     {
 
@@ -19,15 +18,25 @@ public class MooToolbar extends JToolBar implements ActionListener  {
                fastforward = createButton("images/forward.gif", "fast forward");
                add(fastforward);
                
-               meas = createJump("Measure:", "1");
-               add(meas);
+               meas = createProjIndLabel("Mrs");
+               beat = createProjIndLabel("Beat");
+               tick = createProjIndLabel("Tick");
                
-               beat = createJump("Beats:", "1");
-               add(beat);
+               measvalue = createProjIndLabel("1");
+               beatvalue = createProjIndLabel("1");
+               ticksvalue = createProjIndLabel("1");
                
-               ticks = createJump("Ticks:", "1");
-               add(ticks);
-
+               JPanel measbeattick = new JPanel();
+               measbeattick.setMaximumSize(new Dimension(80,40));
+               measbeattick.setLayout(new GridLayout(2,3));
+               measbeattick.add(meas);
+               measbeattick.add(beat);
+               measbeattick.add(tick);         
+               measbeattick.add(measvalue);
+               measbeattick.add(beatvalue);
+               measbeattick.add(ticksvalue);
+               
+               add(measbeattick);
                }
                
                private JButton createButton(String imageLocation, String toolTip) {
@@ -37,15 +46,14 @@ public class MooToolbar extends JToolBar implements ActionListener  {
                        return button;
                }
                
-               private JPanel createJump(String labelname, String inivalu) {
-                       JLabel label = new JLabel(labelname);
-                       JTextField field = new JTextField(inivalu);
-                       JPanel panel = new JPanel();
-                       panel.setLayout(new BorderLayout());
-                       panel.add(label, BorderLayout.NORTH);
-                       panel.add(field, BorderLayout.SOUTH);
-                       return panel;
+               
+               private JLabel createProjIndLabel(String title){
+                       JLabel titelvalue = new JLabel(title, JLabel.CENTER);
+                       titelvalue.setFont(new Font("Times New Roman", Font.PLAIN ,8));
+                       titelvalue.setHorizontalTextPosition(JLabel.CENTER);
+                       return titelvalue;
                }
+               
                        
                public void actionPerformed(ActionEvent e) {}
                                        
@@ -63,8 +71,11 @@ public class MooToolbar extends JToolBar implements ActionListener   {
                private JButton playpause;
                private JButton stop;
                private JButton fastforward;
-               private JPanel meas;
-               private JPanel beat;
-               private JPanel ticks;
-
+               private JLabel meas;
+               private JLabel beat;
+               private JLabel tick;
+               private JLabel measvalue;
+               private JLabel beatvalue;
+               private JLabel ticksvalue;
+               
 }