X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=f4090bdc5d70ef1fabffafbe71c45a8dba24357a;hp=892e7658a93343943721748edf1af73a189d4303;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=03b1e0e873a70991ebeaf67d61ecac44f8b19102 diff --git a/MooMenu.java b/MooMenu.java index 892e765..f4090bd 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -23,39 +23,42 @@ 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); + edit.addSeparator(); + 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); + 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..."); @@ -64,16 +67,15 @@ 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 + * 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); @@ -82,10 +84,10 @@ public class MooMenu extends JMenuBar implements ActionListener { } /** - * 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 + * 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); @@ -95,35 +97,36 @@ public class MooMenu extends JMenuBar implements ActionListener { } /** - * 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 + * 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, 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; } /** - * creates a JFrame popupmenu, containing diffrent choices - * @param title the title of the JFrame - * @param labelone the first label of two - * @param labeltwo the second label of two - * @return trackframe the JFrame to popup....ffaaaaaaaaaaaaaaaan! - */ - - - - /** - * checks if the fileformat is compatible with our program - * @param f the file to check - * @return true or false + * 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.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(); @@ -131,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; @@ -139,6 +145,7 @@ public class MooMenu extends JMenuBar implements ActionListener { if(command == "New") { Moosique.clearSequence(); } else if (command == "Open...") { + // Shows a file chooser. If shown previously, starts in the current directory. if (directory != null) { chooser = new JFileChooser(directory); } else { @@ -146,24 +153,17 @@ public class MooMenu extends JMenuBar implements ActionListener { } 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(); + if (!Moosique.save()) showSaveAsDialog(); } else if (command == "Save as...") { - 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())) { - directory = chooser.getSelectedFile().getParentFile(); - Moosique.saveAs(chooser.getSelectedFile().getAbsolutePath()); - } + showSaveAsDialog(); } else if (command == "Exit") { Moosique.quit(); } else if (command == "Copy") { @@ -185,75 +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...") { - - JFrame frame = new JFrame("Add track"); - JPanel panel = new JPanel(); - //panel.setPreferredSize(new Dimension(250,400)); - panel.setLayout(new GridLayout(2,2)); - frame.setContentPane(panel); - - JLabel top = new JLabel("Name of track", JLabel.CENTER); - top.setFont(new Font("Times new Roman", Font.BOLD, 10)); - panel.add(top); - - JTextField field = new JTextField(5); - panel.add(field); - - JLabel bottom = new JLabel("Add it after",JLabel.CENTER); - bottom.setFont(new Font("Times new Roman", Font.BOLD, 10)); - panel.add(bottom); - - JComboBox tracklist = new JComboBox(); - panel.add(tracklist); - - - frame.pack(); - frame.show(); - + MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK); Moosique.getSequence().createTrack(); - } else if (command == "Delete track...") { - - JFrame frame = new JFrame("Delete track"); - JPanel panel = new JPanel(); - panel.setPreferredSize(new Dimension(250,400)); - frame.setContentPane(panel); - - frame.pack(); - frame.show(); + + 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...") { - - JFrame frame = new JFrame("Copy track"); - JPanel panel = new JPanel(); - panel.setPreferredSize(new Dimension(250,400)); - frame.setContentPane(panel); - - frame.pack(); - frame.show(); - + MooDialog newDialog = new MooDialog(MooDialog.COPY_TRACK); } else if (command == "Move track...") { - - JFrame frame = new JFrame("Move track"); - JPanel panel = new JPanel(); - panel.setPreferredSize(new Dimension(250,400)); - panel.setLayout(new GridLayout(2,2)); - frame.setContentPane(panel); - - frame.pack(); - frame.show(); - - + 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...") { @@ -263,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) { @@ -284,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 */