X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooMenu.java;h=ee3c0d47c746a3e4afaaecb3752ff89429d31a4c;hb=a2d9acdd7c96244e5374d3d4fbc8d2ae63e30f9e;hp=eeb1b218ce4f8ac4c18ddc420e9b60bc8415bbcf;hpb=4b8e9a0a15b2dc3d94ea3cfc4297533b1e35d7d8;p=moosique.git diff --git a/MooMenu.java b/MooMenu.java index eeb1b21..ee3c0d4 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -1,7 +1,9 @@ +import javax.sound.midi.*; 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 @@ -10,135 +12,92 @@ import java.io.*; */ public class MooMenu extends JMenuBar implements ActionListener { -/* - -Musikrelaterade menyer i Midisoft Recording Session: - -Track Insert New... Har vi - Delete... Har vi - Move... Har vi - Copy... Har vi - Combine... Onödig - Rechannel... Kanske - Split by Pitch... Onödig - -Music Insert Measure... Lagt till - Delete Measure... Lagt till - Clef... Onödig - Time Signature... Lagt till - Key Signature... Onödig - Tempo... Lagt till - Scale Velocity... Lagt till - Transpose... Lagt till - Quantize... Onödig - -Kanske också: Reset Solo / Mute - -*/ - private JMenu file, edit, playback, track, help, music; + private JMenu file, edit, playback, music, help; + private JFileChooser chooser; + private File directory; /** - * contructs a menubar + * Creates the menu bar. */ public MooMenu() { - file = makeMenu("File", KeyEvent.VK_F); + file = createMenu("File", KeyEvent.VK_F); add(file); - file.add(makeItem(file, "New", KeyEvent.VK_N)); - file.add(makeItem(file, "Open...", KeyEvent.VK_O)); - file.add(makeItem(file, "Save", KeyEvent.VK_S)); - file.add(makeItem(file, "Save as...")); - file.add(makeItem(file, "Exit", KeyEvent.VK_Q)); + 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, ActionEvent.CTRL_MASK); - edit = makeMenu("Edit", KeyEvent.VK_E); + edit = createMenu("Edit", KeyEvent.VK_E); add(edit); - edit.add(makeItem(edit, "Copy", KeyEvent.VK_C)); - edit.add(makeItem(edit, "Cut", KeyEvent.VK_X)); - edit.add(makeItem(edit, "Paste", KeyEvent.VK_V)); - edit.add(makeItem(edit, "Select all", KeyEvent.VK_E)); - edit.add(makeItem(edit, "Invert selection", KeyEvent.VK_I)); - edit.add(makeItem(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 = makeMenu("Playback", KeyEvent.VK_P); + playback = createMenu("Playback", KeyEvent.VK_P); add(playback); - playback.add(makeItem(playback, "Play", KeyEvent.VK_SPACE)); - playback.add(makeItem(playback, "Pause", KeyEvent.VK_SPACE)); - playback.add(makeItem(playback, "Stop")); - playback.add(makeItem(playback, "Jump...")); - - track = makeMenu("Track", KeyEvent.VK_T); - add(track); + addItem(playback, "Play", "F5"); + addItem(playback, "Pause", "F7"); + addItem(playback, "Stop", "F6"); + addItem(playback, "Jump..."); - track.add(makeItem(track, "Add", KeyEvent.VK_A)); - track.add(makeItem(track, "Delete", KeyEvent.VK_D)); - track.add(makeItem(track, "Copy track", KeyEvent.VK_Y)); - track.add(makeItem(track, "Move", KeyEvent.VK_M)); - - music = makeMenu("Music", KeyEvent.VK_M); + music = createMenu("Music", KeyEvent.VK_M); add(music); - music.add(makeItem(track, "Insert measure...")); - music.add(makeItem(track, "Delete measure...")); - music.add(makeItem(track, "Time signature...")); - music.add(makeItem(track, "Tempo...")); - music.add(makeItem(track, "Scale velocity...")); - music.add(makeItem(track, "Transpose...")); - - help = makeMenu("Help", KeyEvent.VK_L); + 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..."); + addItem(music, "Set tempo..."); + addItem(music, "Scale velocity..."); + addItem(music, "Transpose..."); + + help = createMenu("Help", KeyEvent.VK_L); add(help); - help.add(makeItem(help, "Contents")); - help.add(makeItem(help, "Getting started")); - help.add(makeItem(help, "About")); + 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 makeMenu(String name, int mnemonic) { + private JMenu createMenu(String name, int mnemonic) { JMenu menu = new JMenu(name); menu.setMnemonic(mnemonic); return menu; } - /** - * creates a menuitem - * @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 makeItem(JMenu menu, String name) { + private JMenuItem addItem(JMenu menu, String name) { JMenuItem item = new JMenuItem(name); item.addActionListener(this); menu.add(item); return item; } - /** - * creates a menuitem - * @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 makeItem(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(); @@ -149,26 +108,44 @@ Kanske ocks public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); + Sequence seq; 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(); } else if (command == "Copy") { @@ -181,37 +158,45 @@ Kanske ocks } else if (command == "Invert selection") { - } else if (command == "Preferences") { + } else if (command == "Preferences...") { - } else if (command == "Play / Resume") { - //if (Moosique.getSequence().isRunning()) { - //Moosique.pause(); - //} else Moosique.play(); - + } else if (command == "Play") { + if (!Moosique.getSequencer().isRunning()) Moosique.play(); } else if (command == "Pause") { - // koda för resume också - Moosique.pause(); + if (Moosique.getSequencer().isRunning()) Moosique.pause(); } 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 == "Add") { - - } else if (command == "Delete") { - - } else if (command == "Copy track") { - - } else if (command == "Move") { - - } else if (command == "Insert Measure...") { - - } else if (command == "Delete Measure...") { + } else if (command == "Delete measure...") { - } else if (command == "Time Signature...") { + } else if (command == "Set time signature...") { - } else if (command == "Tempo...") { + } else if (command == "Set tempo...") { - } else if (command == "Scale Velocity...") { + } else if (command == "Scale velocity...") { } else if (command == "Transpose...") { @@ -228,7 +213,7 @@ Kanske ocks JOptionPane.showMessageDialog(null, "här kommer about att komma"); } } - + class MidiFileFilter extends javax.swing.filechooser.FileFilter { public boolean accept(File f) { if(f != null) { @@ -245,4 +230,6 @@ Kanske ocks return "MIDI files"; } } + + }