From 5c3064893cb97b93312138749761b24283d23caf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Lanneskog?= <lannesko@itstud.chalmers.se>
Date: Tue, 6 May 2003 13:34:37 +0000
Subject: [PATCH] =?utf8?q?lagt=20till=20en=20toolbar=20och=20tillh=F6rande?=
 =?utf8?q?=20gif=20bilder=20i=20mappen=20images?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 MooGUI.java     | 12 +++++++-----
 MooMenu.java    | 14 +++++++-------
 MooToolbar.java | 25 +++++++++++--------------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/MooGUI.java b/MooGUI.java
index b7031d8..944ed98 100644
--- 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 1315bfb..0947fb2 100644
--- 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 3d7f93d..db736f2 100644
--- 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;
 	}
-- 
2.39.2