X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=8c9b648dc7018b2658aceb301614ac84835d5891;hp=c4a01c1a42dd8a934e93fad4281124a43923f065;hb=6154ba318198471a2b94391df6aab6f2b6cd9b29;hpb=abdd0789dfa2329312d8cdebc114728192935360 diff --git a/MooMenu.java b/MooMenu.java index c4a01c1..8c9b648 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; @@ -136,14 +145,14 @@ public class MooMenu extends JMenuBar implements ActionListener { } /** * Gets the users command of takes and properiate action - * @param e the action perfomed + * @param e The action perfomed. */ public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); Sequence seq; if(command == "New") { - Moosique.clearSequence(); + if (!Moosique.promptOnUnsavedChanges()) Moosique.clearSequence(); } else if (command == "Open...") { // Shows a file chooser. If shown previously, starts in the current directory. if (directory != null) { @@ -158,26 +167,13 @@ public class MooMenu extends JMenuBar implements ActionListener { File file = chooser.getSelectedFile(); if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { directory = chooser.getSelectedFile().getParentFile(); - Moosique.load(chooser.getSelectedFile().getAbsolutePath()); + if (!Moosique.promptOnUnsavedChanges()) + Moosique.load(chooser.getSelectedFile().getAbsolutePath()); } } else if (command == "Save") { - Moosique.save(); + if (!Moosique.save()) showSaveAsDialog(); } else if (command == "Save as...") { - // Shows a file chooser. If shown previously, starts in the current directory. - if (directory != null) { - chooser = new JFileChooser(directory); - } else { - chooser = new JFileChooser(); - } - chooser.addChoosableFileFilter(new MidiFileFilter()); - int returnVal = chooser.showSaveDialog(this); - - // Stores the current directory and loads the selected file. - File file = chooser.getSelectedFile(); - if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { - directory = file.getParentFile(); - Moosique.saveAs(file.getAbsolutePath()); - } + showSaveAsDialog(); } else if (command == "Exit") { Moosique.quit(); } else if (command == "Copy") { @@ -198,48 +194,68 @@ public class MooMenu extends JMenuBar implements ActionListener { if (Moosique.getSequencer().isRunning()) Moosique.pause(); } else if (command == "Stop") { Moosique.stop(); - } else if (command == "Jump...") { - MooDialog what = 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 what = new MooDialog(MooDialog.ADD_TRACK); + MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK); Moosique.getSequence().createTrack(); } else if (command == "Delete track...") { - MooDialog what = new MooDialog(MooDialog.DELETE_TRACK); + MooDialog newDialog = new MooDialog(MooDialog.DELETE_TRACK); /* Let the user select a track from a list. seq = Moosique.getSequence(); seq.deleteTrack(seq.getTracks()[NUMBER]); */ } else if (command == "Copy track...") { - MooDialog what = new MooDialog(MooDialog.COPY_TRACK); + MooDialog newDialog = new MooDialog(MooDialog.COPY_TRACK); } else if (command == "Move track...") { - MooDialog what = new MooDialog(MooDialog.MOVE_TRACK); + MooDialog newDialog = new MooDialog(MooDialog.MOVE_TRACK); } else if (command == "Insert measure...") { - + MooDialog newDialog = new MooDialog(MooDialog.INSERT_MEASURE); } else if (command == "Delete measure...") { - + MooDialog newDialog = new MooDialog(MooDialog.DELETE_MEASURE); } else if (command == "Set time signature...") { } else if (command == "Set tempo...") { + MooDialog newDialog = new MooDialog(MooDialog.SET_TEMPO); } else if (command == "Scale velocity...") { } 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)); } } + private void showSaveAsDialog() { + // Shows a file chooser. If shown previously, starts in the current directory. + if (directory != null) { + chooser = new JFileChooser(directory); + } else { + chooser = new JFileChooser(); + } + chooser.addChoosableFileFilter(new MidiFileFilter()); + int returnVal = chooser.showSaveDialog(this); + + // Stores the current directory and loads the selected file. + File file = chooser.getSelectedFile(); + if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { + directory = file.getParentFile(); + Moosique.saveAs(file.getAbsolutePath()); + } + } + class MidiFileFilter extends javax.swing.filechooser.FileFilter { public boolean accept(File f) { if(f != null) { @@ -248,7 +264,7 @@ public class MooMenu extends JMenuBar implements ActionListener { return false; } - /* + /** * gets the description of the filetype * @return "Midifiles the only filetyp compatibel with the program */