X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=ee3c0d47c746a3e4afaaecb3752ff89429d31a4c;hp=141fd93f87320054204ea2f486efdebab9542ed0;hb=a2d9acdd7c96244e5374d3d4fbc8d2ae63e30f9e;hpb=c83e74facf762222fe4578f175408cc50d360518 diff --git a/MooMenu.java b/MooMenu.java index 141fd93..ee3c0d4 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -3,6 +3,7 @@ import javax.swing.*; import javax.swing.filechooser.*; import java.awt.event.*; import java.io.*; +import java.awt.*; /** * Moosiques GUI representing a menubar, menus and menuitems @@ -12,6 +13,8 @@ import java.io.*; public class MooMenu extends JMenuBar implements ActionListener { private JMenu file, edit, playback, music, help; + private JFileChooser chooser; + private File directory; /** * Creates the menu bar. @@ -20,37 +23,37 @@ public class MooMenu extends JMenuBar implements ActionListener { file = createMenu("File", KeyEvent.VK_F); add(file); - addItem(file, "New", KeyEvent.VK_N); - addItem(file, "Open...", KeyEvent.VK_O); - addItem(file, "Save", KeyEvent.VK_S); + 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, "Exit", KeyEvent.VK_Q); + addItem(file, "Exit", KeyEvent.VK_Q, ActionEvent.CTRL_MASK); edit = createMenu("Edit", KeyEvent.VK_E); add(edit); - addItem(edit, "Copy", KeyEvent.VK_C); - addItem(edit, "Cut", KeyEvent.VK_X); - addItem(edit, "Paste", KeyEvent.VK_V); - addItem(edit, "Select all", KeyEvent.VK_E); - addItem(edit, "Invert selection", KeyEvent.VK_I); - addItem(edit, "Preferences...", KeyEvent.VK_P); + 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); + addItem(edit, "Select all", KeyEvent.VK_E, ActionEvent.CTRL_MASK); + addItem(edit, "Invert selection", KeyEvent.VK_I, ActionEvent.CTRL_MASK); + addItem(edit, "Preferences...", KeyEvent.VK_P, ActionEvent.CTRL_MASK); playback = createMenu("Playback", KeyEvent.VK_P); add(playback); - addItem(playback, "Play", KeyEvent.VK_SPACE); - addItem(playback, "Pause"); - addItem(playback, "Stop"); + addItem(playback, "Play", "F5"); + addItem(playback, "Pause", "F7"); + addItem(playback, "Stop", "F6"); addItem(playback, "Jump..."); music = createMenu("Music", KeyEvent.VK_M); add(music); - addItem(music, "Add track...", KeyEvent.VK_A); - addItem(music, "Delete track...", KeyEvent.VK_D); - addItem(music, "Copy track...", KeyEvent.VK_Y); - addItem(music, "Move track...", KeyEvent.VK_M); + addItem(music, "Add track...", KeyEvent.VK_A, ActionEvent.CTRL_MASK); + addItem(music, "Delete track...", KeyEvent.VK_D, ActionEvent.CTRL_MASK); + addItem(music, "Copy track...", KeyEvent.VK_Y, ActionEvent.CTRL_MASK); + addItem(music, "Move track...", KeyEvent.VK_M, ActionEvent.CTRL_MASK); addItem(music, "Insert measure..."); addItem(music, "Delete measure..."); addItem(music, "Set time signature..."); @@ -61,29 +64,17 @@ public class MooMenu extends JMenuBar implements ActionListener { help = createMenu("Help", KeyEvent.VK_L); add(help); - addItem(help, "Contents"); + addItem(help, "Contents", "F1"); addItem(help, "Getting started"); addItem(help, "About"); } - /** - * creates a menu for the menubar - * @param name the name of the menu - * @param mnemonic the shortcut to activate the menu - * @return menu the menu to be added to the menubar - */ private JMenu createMenu(String name, int mnemonic) { JMenu menu = new JMenu(name); menu.setMnemonic(mnemonic); return menu; } - /** - * Creates a menu item. - * @param menu the menu to which the item is being added to - * @param name the name of this menuitem - * @return item the item to add to the menu - */ private JMenuItem addItem(JMenu menu, String name) { JMenuItem item = new JMenuItem(name); item.addActionListener(this); @@ -91,26 +82,22 @@ public class MooMenu extends JMenuBar implements ActionListener { return item; } - /** - * Creates a menu item with a keyboard accelerator. - * @param menu the menu to which the item is being added to - * @param name the name of this menuitem - * @param key the shortcut to activate the command - * @return item the item to add to the menu - */ - private JMenuItem addItem(JMenu menu, String name, int key) { + private JMenuItem addItem(JMenu menu, String name, String key) { JMenuItem item = new JMenuItem(name); - item.setAccelerator(KeyStroke.getKeyStroke(key, ActionEvent.CTRL_MASK)); + item.setAccelerator(KeyStroke.getKeyStroke(key)); + item.addActionListener(this); + menu.add(item); + return item; + } + + private JMenuItem addItem(JMenu menu, String name, int key, int mask) { + JMenuItem item = new JMenuItem(name); + item.setAccelerator(KeyStroke.getKeyStroke(key, mask)); item.addActionListener(this); menu.add(item); return item; } - /** - * checks if the fileformat is compatible with our program - * @param f the file to check - * @return true or false - */ private boolean isMidiFile(File f) { if(f != null) { String extension = f.getName().substring(f.getName().lastIndexOf('.') + 1).toLowerCase().trim(); @@ -126,20 +113,38 @@ public class MooMenu extends JMenuBar implements ActionListener { if(command == "New") { Moosique.clearSequence(); } else if (command == "Open...") { - JFileChooser chooser = new JFileChooser(); + // 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.showOpenDialog(this); - if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(chooser.getSelectedFile())) { + + // Stores the current directory and loads the selected file. + File file = chooser.getSelectedFile(); + if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { + directory = chooser.getSelectedFile().getParentFile(); Moosique.load(chooser.getSelectedFile().getAbsolutePath()); } } else if (command == "Save") { Moosique.save(); } else if (command == "Save as...") { - JFileChooser chooser = new JFileChooser(); + // 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); - if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(chooser.getSelectedFile())) { - Moosique.saveAs(chooser.getSelectedFile().getAbsolutePath()); + + // 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()); } } else if (command == "Exit") { Moosique.quit(); @@ -162,18 +167,27 @@ public class MooMenu extends JMenuBar implements ActionListener { } else if (command == "Stop") { Moosique.stop(); } else if (command == "Jump...") { - + MooDialog what = new MooDialog(MooDialog.JUMP); + // Moosique.setPosition(???); Räkna ut från msr, beats, ticks, time sig. } else if (command == "Add track...") { + MooDialog what = new MooDialog(MooDialog.ADD_TRACK); Moosique.getSequence().createTrack(); } else if (command == "Delete track...") { + + MooDialog what = 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); + } else if (command == "Move track...") { + MooDialog what = new MooDialog(MooDialog.MOVE_TRACK); + } else if (command == "Insert measure...") { } else if (command == "Delete measure...") { @@ -216,4 +230,6 @@ public class MooMenu extends JMenuBar implements ActionListener { return "MIDI files"; } } -} \ No newline at end of file + + +}