viktigt

[moosique.git] / MooGUI.java

diff --git a/MooGUI.java b/MooGUI.java
index 60bb7aca9ed424b63c7231a7010109f54cfb81d2..944ed986fcf26993440ca78a1c576874b6671542 100644 (file)
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -3,7 +3,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 
-/*
+/**
  * Moosique's graphical user interface.
  * 
  * @author  Mikael Andreen
@@ -13,25 +13,28 @@ public class MooGUI extends JFrame implements WindowListener {
 
        Sequence seq;
        
-       /* 
+       /** 
         * Creates the GUI.
         */
        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);
+               //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);
        }
        
-       /* 
+       /** 
         * Changes the sequence of the GUI.
         * @param sequence      the MIDI sequence to visualize
         */
@@ -46,4 +49,4 @@ public class MooGUI extends JFrame implements WindowListener {
        public void windowDeiconified(WindowEvent e) {}
        public void windowActivated(WindowEvent e) {}
        public void windowDeactivated(WindowEvent e) {}
-}
\ No newline at end of file
+}