X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;fp=MooMenu.java;h=a7fe8341e78a6c0208aa7ad52f65699b15c20073;hp=25cab5c99062b20270fbd13bf1f29d4d6724f6ed;hb=d1996d82793d7049115f5280ba8651b818e52e3c;hpb=1d2d2bfd14ba0addab97692527d4414d3a87e13d diff --git a/MooMenu.java b/MooMenu.java index 25cab5c..a7fe834 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -1,9 +1,10 @@ import javax.sound.midi.*; import javax.swing.*; import javax.swing.filechooser.*; +import java.awt.*; import java.awt.event.*; import java.io.*; -import java.awt.*; +import java.util.*; /** * Moosiques GUI representing a menubar, menus and menuitems @@ -12,36 +13,49 @@ import java.awt.*; */ public class MooMenu extends JMenuBar implements ActionListener { - private JMenu file, edit, keyboard, playback, music, help; + private JMenu file, reopen, edit, keyboard, playback, music, help; private JFileChooser chooser; private File directory; - private String[] openedFiles; + private ArrayList recentFiles; /** * Creates the menu bar. */ public MooMenu() { + // Fetches last work directory, and recent files. + // directory = Moosique.getRecentDirectory(); + ArrayList recentFiles = new ArrayList(); // ... = Moosique.getRecentFiles(); + + // Creates the sub-menus and their items. file = createMenu("File", KeyEvent.VK_F); add(file); - 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...", KeyEvent.VK_A); + addItem(file, "New", KeyEvent.VK_N, true); + addItem(file, "Open...", KeyEvent.VK_O, true); + reopen = createMenu("Reopen", KeyEvent.VK_R); + Iterator it = recentFiles.iterator(); + while (it.hasNext()) { + JMenuItem recentFile = new JMenuItem((String)it.next()); + recentFile.addActionListener(this); + reopen.add(recentFile); + } + file.add(reopen); + addItem(file, "Save", KeyEvent.VK_S, true); + addItem(file, "Save as...", KeyEvent.VK_A, false); file.addSeparator(); - addItem(file, "Exit", KeyEvent.VK_Q, ActionEvent.CTRL_MASK); + addItem(file, "Exit", KeyEvent.VK_Q, true); edit = createMenu("Edit", KeyEvent.VK_E); add(edit); - 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, "Copy", KeyEvent.VK_C, true); + addItem(edit, "Cut", KeyEvent.VK_X, true); + addItem(edit, "Paste", KeyEvent.VK_V, true); edit.addSeparator(); - addItem(edit, "Select all", KeyEvent.VK_E, ActionEvent.CTRL_MASK); - addItem(edit, "Invert selection", KeyEvent.VK_I, ActionEvent.CTRL_MASK); + addItem(edit, "Select all", KeyEvent.VK_E, true); + addItem(edit, "Invert selection", KeyEvent.VK_I, true); edit.addSeparator(); - addItem(edit, "Preferences...", KeyEvent.VK_P, ActionEvent.CTRL_MASK); + addItem(edit, "Preferences...", KeyEvent.VK_P, true); playback = createMenu("Playback", KeyEvent.VK_P); add(playback); @@ -50,34 +64,34 @@ public class MooMenu extends JMenuBar implements ActionListener { addItem(playback, "Pause", "F7", KeyEvent.VK_A); addItem(playback, "Stop", "F6", KeyEvent.VK_S); playback.addSeparator(); - addItem(playback, "Set position...", KeyEvent.VK_E); + addItem(playback, "Set position...", KeyEvent.VK_E, false); 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); + for (int i = 9; i >= 0; i--) addItem(keyboard, "Octave " + i, i + 48, false); music = createMenu("Music", KeyEvent.VK_M); add(music); - 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, "Add track...", KeyEvent.VK_A, true); + addItem(music, "Delete track...", KeyEvent.VK_D, true); + addItem(music, "Copy track...", KeyEvent.VK_Y, true); + addItem(music, "Move track...", KeyEvent.VK_M, true); music.addSeparator(); - addItem(music, "Insert measure...", KeyEvent.VK_I); - addItem(music, "Delete measure...", KeyEvent.VK_E); + addItem(music, "Insert measure...", KeyEvent.VK_I, false); + addItem(music, "Delete measure...", KeyEvent.VK_E, false); music.addSeparator(); - 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); + addItem(music, "Set time signature...", KeyEvent.VK_S, false); + addItem(music, "Set tempo...", KeyEvent.VK_M, false); + addItem(music, "Scale velocity...", KeyEvent.VK_V, false); + addItem(music, "Transpose...", KeyEvent.VK_T, false); help = createMenu("Help", KeyEvent.VK_L); add(help); - + addItem(help, "User manual", "F1", KeyEvent.VK_M); help.addSeparator(); - addItem(help, "About", KeyEvent.VK_A); + addItem(help, "About", KeyEvent.VK_A, false); } /** * Creats a menu in the menubar. @@ -95,11 +109,15 @@ public class MooMenu extends JMenuBar implements ActionListener { * Creats a menuitem in the menu. * @param menu The menu where to add the menuitem. * @param name The name of the menuitem. + * @param mnemonic The keyboard mnemonic used to access this menuitem + * @param accelerate whether to create a keyboard accelerator for this item * @return item The menuitem created. */ - private JMenuItem addItem(JMenu menu, String name, int mnemonic) { + private JMenuItem addItem(JMenu menu, String name, int mnemonic, boolean accelerate) { JMenuItem item = new JMenuItem(name); item.addActionListener(this); + item.setMnemonic(mnemonic); + if (accelerate) item.setAccelerator(KeyStroke.getKeyStroke(mnemonic, ActionEvent.CTRL_MASK)); menu.add(item); return item; } @@ -109,34 +127,18 @@ public class MooMenu extends JMenuBar implements ActionListener { * @param menu The menu to where to add the menuitem. * @param name The name of the menuitem. * @param key The keystroke to access this menuitem. + * @param mnemonic The keyboard mnemonic used to access this menuitem * @return item The menuitem created. */ 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.setAccelerator(KeyStroke.getKeyStroke(key)); item.addActionListener(this); menu.add(item); return item; } - - /** - * Creats a menuitem in the menu. - * @param menu The menu to where to add the menuitem. - * @param name The name of the menuitem. - * @param key The keystroke to access this menuitem. - * @param mask The keyboard mask. - * @return item The menuitem created. - */ - 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; - } - + private boolean isMidiFile(File f) { if(f != null) { String extension = f.getName().substring(f.getName().lastIndexOf('.') + 1).toLowerCase().trim(); @@ -168,8 +170,19 @@ public class MooMenu extends JMenuBar implements ActionListener { File file = chooser.getSelectedFile(); if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) { directory = file.getParentFile(); - if (!Moosique.promptOnUnsavedChanges()) - Moosique.load(file); + if (!Moosique.promptOnUnsavedChanges()) { + if (Moosique.load(file)) { + // Adds an item for this file to the reopen menu. + String filename = file.getAbsolutePath(); + JMenuItem recentFile = new JMenuItem(filename); + for (int i = 0; i < reopen.getMenuComponentCount(); i++) { + if (filename.equals(((JMenuItem)reopen.getMenuComponent(i)).getText())) + reopen.remove(i); + } + reopen.insert(recentFile, 0); + if (reopen.getMenuComponentCount() > 5) reopen.remove(5); + } + } } } else if (command == "Save") { if (!Moosique.save()) showSaveAsDialog(); @@ -233,6 +246,9 @@ public class MooMenu extends JMenuBar implements ActionListener { "About Moosique", JOptionPane.INFORMATION_MESSAGE, new ImageIcon(Moosique.getGUI().logo)); + } else if (reopen.isMenuComponent((JMenuItem)e.getSource())) { + String recentFile = ((JMenuItem)e.getSource()).getText(); + if (!Moosique.promptOnUnsavedChanges()) Moosique.load(new File(recentFile)); } } @@ -270,6 +286,4 @@ public class MooMenu extends JMenuBar implements ActionListener { return "MIDI files"; } } - - }