lagt till en toolbar och tillhörande gif bilder i mappen images

diff --git a/MooGUI.java b/MooGUI.java
index b7031d8b1f78fdd1660fb5430ae1943f42dba897..944ed986fcf26993440ca78a1c576874b6671542 100644 (file)
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -18,17 +18,19 @@ public class MooGUI extends JFrame implements WindowListener {
         */
        public MooGUI(Sequence seq) {
                super("Moosique");
+               setJMenuBar(new MooMenu());
+               getContentPane().add(new MooToolbar(), BorderLayout.NORTH);
                addWindowListener(this);
                MooInstrumentList m = new MooInstrumentList();
-               getContentPane().add(m);
+               getContentPane().add(m, BorderLayout.CENTER);
                m.addKeyListener(new MooKeyboard());
                pack();
-               Dimension bounds = new Dimension(300,70);
-               setJMenuBar(new MooMenu());
+               //Dimension bounds = new Dimension(300,70);
+               
 //             setSize(bounds.width,bounds.height);
-               setLocation((Toolkit.getDefaultToolkit().getScreenSize().width / 2) - (bounds.width / 2), (Toolkit.getDefaultToolkit().getScreenSize().height / 2) - (bounds.height / 2));
+               //setLocation((Toolkit.getDefaultToolkit().getScreenSize().width / 2) - (bounds.width / 2), (Toolkit.getDefaultToolkit().getScreenSize().height / 2) - (bounds.height / 2));
 //             setResizable(false);
-               setBackground(Color.white);
+               //setBackground(Color.white);
                setVisible(true);
        }
        

diff --git a/MooMenu.java b/MooMenu.java
index 1315bfbd504b00155a5f49d69a69c63973b64b9b..0947fb24c5ccfa2cebd0a12db9044d349b4137af 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -5,13 +5,13 @@ public class MooMenu extends JMenuBar
        // empty contructor that anropar the createMooMenu in the mainmethod
        public MooMenu()
        {
-               JMenuBar menubar = new JMenuBar();
-               menubar.add(createFileMenu());
-               menubar.add(createEditMenu());
-               menubar.add(createSequenceMenu());
-               menubar.add(createTrackMenu());
-               menubar.add(createNoteMenu());
-               menubar.add(createHelpMenu());
+               
+               add(createFileMenu());
+               add(createEditMenu());
+               add(createSequenceMenu());
+               add(createTrackMenu());
+               add(createNoteMenu());
+               add(createHelpMenu());
        }
 
        // creates the filemenu

diff --git a/MooToolbar.java b/MooToolbar.java
index 3d7f93dde4afdd67468387902f518703beeb624a..db736f2b2b79d8f583372b6ffc80c97866fc5443 100644 (file)
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -4,42 +4,39 @@ public class MooToolbar extends JToolBar
 {
        public MooToolbar()
        {
-       }
-
-       public JToolBar createMooToolBar()
-       {
-               JToolBar toolbar = new JToolBar();
-               toolbar.add(createRewindButton());
-               toolbar.add(createPlayPauseButton());
-               toolbar.add(createStopButton());
-               toolbar.add(createFastForwardButton());
-               return toolbar;
+       
+               add(createRewindButton());
+               add(createPlayPauseButton());
+               add(createStopButton());
+               add(createFastForwardButton());
+               
        }
 
        public JButton createRewindButton()
        {
-               JButton rewind = new JButton(new ImageIcon("plats/namn"));
+               JButton rewind = new JButton(new ImageIcon("images/rewind.gif"));
                rewind.setToolTipText("rewind");
                return rewind;
        }
        
        public JButton createPlayPauseButton()
        {
-               JButton playpause = new JButton(new ImageIcon("plats/namn"));
+               JButton playpause = new JButton(new ImageIcon("images/play.gif"));
                playpause.setToolTipText("play/pause");
                return playpause;
        }
         
        public JButton createStopButton()
        {
-               JButton stop = new JButton(new ImageIcon("plats/namn"));
+               JButton stop = new JButton(new ImageIcon("images/stop.gif"));
                stop.setToolTipText("stop");
                return stop;
        }
        
        public JButton createFastForwardButton()
        {
-               JButton fastforward = new JButton(new ImageIcon("plats/namn"));
+               JButton fastforward = new JButton(new
+               ImageIcon("images/forward.gif"));
                fastforward.setToolTipText("fast forward");
                return fastforward;
        }