X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=3b1e9fabb3f637abeceb02a07626c8b82d3f7662;hp=f4090bdc5d70ef1fabffafbe71c45a8dba24357a;hb=a8b0b5e27d120df964c5b6d8554a6207951b00d0;hpb=fed0170e819d14b07d7081a0a314ebabac3b29fe

diff --git a/MooMenu.java b/MooMenu.java
index f4090bd..3b1e9fa 100644
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -12,7 +12,7 @@ import java.awt.*;
  */
 public class MooMenu extends JMenuBar implements ActionListener {
 	
-	private JMenu file, edit, playback, music, help;
+	private JMenu file, edit, keyboard, playback, music, help;
 	private JFileChooser chooser;
 	private File directory;
 
@@ -26,7 +26,8 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		addItem(file, "New", KeyEvent.VK_N, ActionEvent.CTRL_MASK);
 		addItem(file, "Open...", KeyEvent.VK_O, ActionEvent.CTRL_MASK);
 		addItem(file, "Save", KeyEvent.VK_S, ActionEvent.CTRL_MASK);
-		addItem(file, "Save as...");
+		addItem(file, "Save as...", KeyEvent.VK_A);
+		file.addSeparator();
 		addItem(file, "Exit", KeyEvent.VK_Q, ActionEvent.CTRL_MASK);
 		
 		edit = createMenu("Edit", KeyEvent.VK_E);
@@ -35,6 +36,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		addItem(edit, "Copy", KeyEvent.VK_C, ActionEvent.CTRL_MASK);
 		addItem(edit, "Cut", KeyEvent.VK_X, ActionEvent.CTRL_MASK);
 		addItem(edit, "Paste", KeyEvent.VK_V, ActionEvent.CTRL_MASK);
+		edit.addSeparator();
 		addItem(edit, "Select all", KeyEvent.VK_E, ActionEvent.CTRL_MASK);
 		addItem(edit, "Invert selection", KeyEvent.VK_I, ActionEvent.CTRL_MASK);
 		edit.addSeparator();
@@ -43,10 +45,15 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		playback = createMenu("Playback", KeyEvent.VK_P);
 		add(playback);
 		
-		addItem(playback, "Play", "F5");
-		addItem(playback, "Pause", "F7");
-		addItem(playback, "Stop", "F6");
-		addItem(playback, "Jump...");
+		addItem(playback, "Play", "F5", KeyEvent.VK_P);
+		addItem(playback, "Pause", "F7", KeyEvent.VK_A);
+		addItem(playback, "Stop", "F6", KeyEvent.VK_S);
+		playback.addSeparator();
+		addItem(playback, "Set position...", KeyEvent.VK_E);
+		playback.addSeparator();
+		keyboard = createMenu("Set keyboard octave", KeyEvent.VK_K);
+		edit.add(keyboard);
+		for (int i = 9; i >= 0; i--) addItem(keyboard, "Octave " + i, i + 48);
 		
 		music = createMenu("Music", KeyEvent.VK_M);
 		add(music);
@@ -56,20 +63,20 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		addItem(music, "Copy track...", KeyEvent.VK_Y, ActionEvent.CTRL_MASK);
 		addItem(music, "Move track...", KeyEvent.VK_M, ActionEvent.CTRL_MASK);
 		music.addSeparator();
-		addItem(music, "Insert measure...");
-		addItem(music, "Delete measure...");
+		addItem(music, "Insert measure...", KeyEvent.VK_I);
+		addItem(music, "Delete measure...", KeyEvent.VK_E);
 		music.addSeparator();
-		addItem(music, "Set time signature...");
-		addItem(music, "Set tempo...");
-		addItem(music, "Scale velocity...");
-		addItem(music, "Transpose...");
+		addItem(music, "Set time signature...", KeyEvent.VK_S);
+		addItem(music, "Set tempo...", KeyEvent.VK_M);
+		addItem(music, "Scale velocity...", KeyEvent.VK_V);
+		addItem(music, "Transpose...", KeyEvent.VK_T);
 		
 		help = createMenu("Help", KeyEvent.VK_L);
 		add(help);
 		
-		addItem(help, "Contents", "F1");
-		addItem(help, "Getting started");
-		addItem(help, "About");
+		addItem(help, "User manual", "F1", KeyEvent.VK_M);
+		help.addSeparator();
+		addItem(help, "About", KeyEvent.VK_A);
 	}
 	/**
 	 * Creats a menu in the menubar.
@@ -89,7 +96,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 	 * @param name		The name of the menuitem.
 	 * @return item		The menuitem created.
 	 */
-	private JMenuItem addItem(JMenu menu, String name) {
+	private JMenuItem addItem(JMenu menu, String name, int mnemonic) {
 		JMenuItem item = new JMenuItem(name);
 		item.addActionListener(this);
 		menu.add(item);
@@ -103,9 +110,10 @@ public class MooMenu extends JMenuBar implements ActionListener {
 	 * @param key		The keystroke to access this menuitem.
 	 * @return item		The menuitem created.
 	 */
-	private JMenuItem addItem(JMenu menu, String name, String key) {
+	private JMenuItem addItem(JMenu menu, String name, String key, int mnemonic) {
 		JMenuItem item = new JMenuItem(name);
 		item.setAccelerator(KeyStroke.getKeyStroke(key));
+		item.setMnemonic(mnemonic);
 		item.addActionListener(this);
 		menu.add(item);
 		return item;
@@ -122,6 +130,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 	private JMenuItem addItem(JMenu menu, String name, int key, int mask) {
 		JMenuItem item = new JMenuItem(name);
 		item.setAccelerator(KeyStroke.getKeyStroke(key, mask));
+		item.setMnemonic(key);
 		item.addActionListener(this);
 		menu.add(item);
 		return item;
@@ -184,9 +193,11 @@ public class MooMenu extends JMenuBar implements ActionListener {
 			if (Moosique.getSequencer().isRunning()) Moosique.pause();
 		} else if (command == "Stop") {
 			Moosique.stop();
-		} else if (command == "Jump...") {
-			MooDialog newDialog = new MooDialog(MooDialog.JUMP);
+		} else if (command == "Set position...") {
+			MooDialog newDialog = new MooDialog(MooDialog.SET_POSITION);
 			// Moosique.setPosition(???); Räkna ut från msr, beats, ticks, time sig.
+		} else if (command.startsWith("Octave")) {
+			MooKeyboard.setOctave(Integer.parseInt(command.substring(7,8)));
 		} else if (command == "Add track...") {
 			MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK);
 			Moosique.getSequence().createTrack();
@@ -214,15 +225,14 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		
 		} else if (command == "Transpose...") {
 		
-		} else if (command == "Contents") {
-			MooDialog contents = new MooDialog(MooDialog.CONTENTS);
-		} else if (command == "Getting started") {
-			
-			JOptionPane.showMessageDialog(null, "här kommer getting started komma");
-		
+		} else if (command == "User manual") {
+			MooDialog manual = new MooDialog(MooDialog.MANUAL);
 		} else if (command == "About") {
-			
-			JOptionPane.showMessageDialog(null, "här kommer about att komma");
+			JOptionPane.showMessageDialog(null,
+				"Moosique\nversion 1.0\n\nby\n\nRoland Andersson\nMichael Andreen\nBjörn Lanneskog\nEinar Pehrson",
+				"About Moosique",
+				JOptionPane.INFORMATION_MESSAGE,
+				new ImageIcon(Moosique.getGUI().logo));
 		}
 	}