X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=ca973298bf464b4584d7897f17bdec980e32497e;hp=ab055a9a1959046e361f0f16b219b6596023070d;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hpb=ffc69c8cc2cc9cdfe3841c77c1e680dee2225c63 diff --git a/MooMenu.java b/MooMenu.java index ab055a9..ca97329 100644 --- a/MooMenu.java +++ b/MooMenu.java @@ -23,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..."); @@ -64,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); @@ -94,36 +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; } - /** - * 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! - */ - - + 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(); @@ -196,41 +170,13 @@ public class MooMenu extends JMenuBar implements ActionListener { } 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 what = 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 what = new MooDialog(MooDialog.DELETE_TRACK); /* Let the user select a track from a list. seq = Moosique.getSequence(); @@ -238,25 +184,11 @@ public class MooMenu extends JMenuBar implements ActionListener { */ } else if (command == "Copy track...") { - JFrame frame = new JFrame("Copy track"); - JPanel panel = new JPanel(); - panel.setPreferredSize(new Dimension(250,400)); - frame.setContentPane(panel); + MooDialog what = new MooDialog(MooDialog.COPY_TRACK); - frame.pack(); - frame.show(); - } 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 what = new MooDialog(MooDialog.MOVE_TRACK); } else if (command == "Insert measure...") {