Updated the project report,

[moosique.git] / MooMenu.java

diff --git a/MooMenu.java b/MooMenu.java
index 8d1caeaa11ec4a2e5a5b8413841401b0b60c5f7d..ca973298bf464b4584d7897f17bdec980e32497e 100644 (file)
--- 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,34 +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;
+       }
+       
+       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;
        }
        
-       /**
-       * creates a JDialog popupmenu, containing diffrent choices
-       * @param title          the title of the dialog
-       * @return trackframe    the JDialog....ffaaaaaaaaaaaaaaaan!
-       */
-       //private JDialog makeDialog(String title){
-       //      
-       //}
-       /**
-        * 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();