X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=f4090bdc5d70ef1fabffafbe71c45a8dba24357a;hp=ca973298bf464b4584d7897f17bdec980e32497e;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=83ec11f99e143607d057db2a68c262ca9672e524 diff --git a/MooMenu.java b/MooMenu.java index ca97329..f4090bd 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -37,6 +37,7 @@ public class MooMenu extends JMenuBar implements ActionListener { 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); + edit.addSeparator(); addItem(edit, "Preferences...", KeyEvent.VK_P, ActionEvent.CTRL_MASK); playback = createMenu("Playback", KeyEvent.VK_P); @@ -54,8 +55,10 @@ public class MooMenu extends JMenuBar implements ActionListener { 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); + music.addSeparator(); addItem(music, "Insert measure..."); addItem(music, "Delete measure..."); + music.addSeparator(); addItem(music, "Set time signature..."); addItem(music, "Set tempo..."); addItem(music, "Scale velocity..."); @@ -68,13 +71,24 @@ public class MooMenu extends JMenuBar implements ActionListener { addItem(help, "Getting started"); addItem(help, "About"); } - + /** + * Creats a menu in the menubar. + * @param name The name of the menu. + * @param mnemnic The shortcut-key to access the menu. + * @return menu The menu created. + */ private JMenu createMenu(String name, int mnemonic) { JMenu menu = new JMenu(name); menu.setMnemonic(mnemonic); return menu; } + /** + * Creats a menuitem in the menu. + * @param menu The menu where to add the menuitem. + * @param name The name of the menuitem. + * @return item The menuitem created. + */ private JMenuItem addItem(JMenu menu, String name) { JMenuItem item = new JMenuItem(name); item.addActionListener(this); @@ -82,6 +96,13 @@ public class MooMenu extends JMenuBar implements ActionListener { 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. + * @return item The menuitem created. + */ private JMenuItem addItem(JMenu menu, String name, String key) { JMenuItem item = new JMenuItem(name); item.setAccelerator(KeyStroke.getKeyStroke(key)); @@ -90,6 +111,14 @@ public class MooMenu extends JMenuBar implements ActionListener { 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)); @@ -105,7 +134,10 @@ public class MooMenu extends JMenuBar implements ActionListener { } return false; } - + /** + * Gets the users command of takes and properiate action + * @param e The action perfomed. + */ public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); Sequence seq; @@ -129,23 +161,9 @@ public class MooMenu extends JMenuBar implements ActionListener { 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") { @@ -167,33 +185,27 @@ public class MooMenu extends JMenuBar implements ActionListener { } else if (command == "Stop") { Moosique.stop(); } else if (command == "Jump...") { - + MooDialog newDialog = 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); - + 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...") { @@ -203,19 +215,35 @@ public class MooMenu extends JMenuBar implements ActionListener { } else if (command == "Transpose...") { } else if (command == "Contents") { - // contents to be filled in - JOptionPane.showMessageDialog(this, "här kommer contents komma"); - + MooDialog contents = new MooDialog(MooDialog.CONTENTS); } else if (command == "Getting started") { - // getting started to be filled in + JOptionPane.showMessageDialog(null, "här kommer getting started komma"); } else if (command == "About") { - // about to be filled in + JOptionPane.showMessageDialog(null, "här kommer about att komma"); } } + 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) { @@ -224,7 +252,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 */