From 5c89e592698dba86380de9bebc21edeaf03ebbd2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Lanneskog?= <lannesko@itstud.chalmers.se>
Date: Tue, 6 May 2003 17:15:28 +0000
Subject: [PATCH] =?utf8?q?lagt=20till=20n=E5gra=20kortkommandon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 MooMenu.java    | 23 +++++++++++++++++------
 MooToolbar.java |  8 ++++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/MooMenu.java b/MooMenu.java
index 788a3f0..f206457 100644
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -20,19 +20,20 @@ public class MooMenu extends JMenuBar implements ActionListener
 	{
 		file = new JMenu("File");
 		file.setMnemonic(KeyEvent.VK_F);
+		
 		neww = new JMenuItem("New");
-		neww.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.ALT_MASK));
+		neww.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK));
 		file.add(neww);
 		open = new JMenuItem("Open...");
-		open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.ALT_MASK));
+		open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
 		file.add(open);
 		save = new JMenuItem("Save");
-		save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.ALT_MASK));
+		save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
 		file.add(save);
 		saveas = new JMenuItem("Save as...");
 		file.add(saveas);
 		exit = new JMenuItem("Exit");
-		exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK));
+		exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
 		file.add(exit);
 		return file;
 	}
@@ -41,16 +42,22 @@ public class MooMenu extends JMenuBar implements ActionListener
 	private JMenu createEditMenu()
 	{
 		edit = new JMenu("Edit");
-
+		edit.setMnemonic(KeyEvent.VK_E);
+		
 		copy = new JMenuItem("Copy");
+		copy.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.CTRL_MASK));
 		edit.add(copy);
 		cut = new JMenuItem("Cut");
+		cut.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.CTRL_MASK));
 		edit.add(cut);
 		paste = new JMenuItem("Paste");
+		paste.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, ActionEvent.CTRL_MASK));
 		edit.add(paste);
 		selectall = new JMenuItem("Select All");
+		selectall.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, ActionEvent.CTRL_MASK));
 		edit.add(selectall);
 		invertselection = new JMenuItem("Invert selection");
+		invertselection.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.CTRL_MASK));
 		edit.add(invertselection);
 		return edit;
 	}
@@ -59,6 +66,8 @@ public class MooMenu extends JMenuBar implements ActionListener
 	private JMenu createPlayBackMenu()
 	{
 		playback = new JMenu("Playback");
+		playback.setMnemonic(KeyEvent.VK_P);
+		
 		play = new JMenuItem("Play");
 		play.addActionListener(this);
 		playback.add(play);
@@ -76,7 +85,8 @@ public class MooMenu extends JMenuBar implements ActionListener
 	private JMenu createTrackMenu()
 	{
 		track = new JMenu("Track");
-
+		track.setMnemonic(KeyEvent.VK_T);
+		
 		add = new JMenuItem("Add...");
 		track.add(add);
 		delete= new JMenuItem("Delete...");
@@ -92,6 +102,7 @@ public class MooMenu extends JMenuBar implements ActionListener
 	private JMenu createHelpMenu()
 	{
 		help = new JMenu("Help");
+		help.setMnemonic(KeyEvent.VK_P);
 		
 		contents = new JMenuItem("Contents");
 		help.add(contents);
diff --git a/MooToolbar.java b/MooToolbar.java
index db736f2..39cf00b 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -12,28 +12,28 @@ public class MooToolbar extends JToolBar
 		
 	}
 
-	public JButton createRewindButton()
+	private JButton createRewindButton()
 	{
 		JButton rewind = new JButton(new ImageIcon("images/rewind.gif"));
 		rewind.setToolTipText("rewind");
 		return rewind;
 	}
 	
-	public JButton createPlayPauseButton()
+	private JButton createPlayPauseButton()
 	{
 		JButton playpause = new JButton(new ImageIcon("images/play.gif"));
 		playpause.setToolTipText("play/pause");
 		return playpause;
 	}
 	 
-	public JButton createStopButton()
+	private JButton createStopButton()
 	{
 		JButton stop = new JButton(new ImageIcon("images/stop.gif"));
 		stop.setToolTipText("stop");
 		return stop;
 	}
 	
-	public JButton createFastForwardButton()
+	private JButton createFastForwardButton()
 	{
 		JButton fastforward = new JButton(new
 		ImageIcon("images/forward.gif"));
-- 
2.39.2