bajs

diff --git a/MooMenu.java b/MooMenu.java
index 86f95008ff25853821e90ebf5285b466109be6dd..65d7b4f48ecdefd8812e4adb54f2bd678a41312f 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -1,41 +1,66 @@
 import javax.swing.*;
 import java.awt.event.*;
+import javax.swing.JComponent.*;
+import javax.swing.filechooser.FileFilter;
 
-public class MooMenu extends JMenuBar implements ActionListener
-{
+public class MooMenu extends JMenuBar implements ActionListener{
        
-       // empty constructor that anropar the createMooMenu in the mainmethod
-       public MooMenu()
-       {
-               
-               add(createFileMenu());
-               add(createEditMenu());
-               add(createPlayBackMenu());
-               add(createTrackMenu());
-               add(createHelpMenu());
-       }
-
-/*     
-       Ett något smidigare sätt, kanske.. / EP
+       //      Ett något smidigare sätt, kanske.. / EP
        
        public MooMenu() {
                file = makeMenu("File", KeyEvent.VK_F);
-               add(file)
-               // Samma sak med de andra menyerna
-               
-               file.add(makeAccItem(file, "New", KeyEvent.VK_N);
-               // Samma sak med de andra menyalternativen
+               add(file);
+                               
+               file.add(makeAccItem(file, "New", KeyEvent.VK_N));
+               file.add(makeAccItem(file, "Open...", KeyEvent.VK_O));
+               file.add(makeAccItem(file, "Save", KeyEvent.VK_S));
+               file.add(makeItem(file, "Save as..."));
+               file.add(makeAccItem(file, "Exit", KeyEvent.VK_Q));
+               
+               edit = makeMenu("Edit", KeyEvent.VK_E);
+               add(edit);
+               
+               edit.add(makeAccItem(edit, "Copy", KeyEvent.VK_C));
+               edit.add(makeAccItem(edit, "Cut", KeyEvent.VK_X));
+               edit.add(makeAccItem(edit, "Paste", KeyEvent.VK_V));
+               edit.add(makeAccItem(edit, "Select all", KeyEvent.VK_E));
+               edit.add(makeAccItem(edit, "Invert selection", KeyEvent.VK_I));
+               
+               playback = makeMenu("Playback", KeyEvent.VK_P);
+               add(playback);
+               
+               playback.add(makeAccItem(playback, "Play", KeyEvent.VK_SPACE));
+               playback.add(makeAccItem(playback, "Pause", KeyEvent.VK_SPACE));
+               playback.add(makeItem(playback, "Stop"));
+               playback.add(makeItem(playback, "Jump..."));
+               
+               track = makeMenu("Track", KeyEvent.VK_T);
+               add(track);
+               
+               track.add(makeAccItem(track, "Add", KeyEvent.VK_A));
+               track.add(makeAccItem(track, "Delete", KeyEvent.VK_D));
+               track.add(makeAccItem(track, "Copy track", KeyEvent.VK_Y));
+               track.add(makeAccItem(track, "Move", KeyEvent.VK_M));
+               
+               help = makeMenu("Help", KeyEvent.VK_P);
+               add(help);
+               
+               help.add(makeItem(help, "Contents"));
+               help.add(makeItem(help, "Getting started"));
+               help.add(makeItem(help, "About"));
        }
 
        private JMenu makeMenu(String name, int mnemonic) {
                JMenu menu = new JMenu(name);
                menu.setMnemonic(mnemonic);
+               return menu;
        }
 
        private JMenuItem makeItem(JMenu menu, String name) {
                JMenuItem item = new JMenuItem(name);
                item.addActionListener(this);
                menu.add(item);
+               return item;
        }
 
        private JMenuItem makeAccItem(JMenu menu, String name, int key) {
@@ -43,234 +68,88 @@ public class MooMenu extends JMenuBar implements ActionListener
                item.setAccelerator(KeyStroke.getKeyStroke(key, ActionEvent.CTRL_MASK));
                item.addActionListener(this);
                menu.add(item);
+               return item;
        }
        
        public void actionPerformed(ActionEvent e) {
                String command = e.getActionCommand();
-               ...
-               if(command == "Play") {
-                       
-               } else if (command == "Stop") {
-                       
-               } // Osv.
-       }
-*/
-
-       // creates the filemenu
-       private JMenu createFileMenu()
-       {
-               file = new JMenu("File");
-               file.setMnemonic(KeyEvent.VK_F);
-               
-               neww = new JMenuItem("New");
-               neww.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK));
-               file.add(neww);
-               open = new JMenuItem("Open...");
-               open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
-               file.add(open);
-               save = new JMenuItem("Save");
-               save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
-               file.add(save);
-               saveas = new JMenuItem("Save as...");
-               file.add(saveas);
-               exit = new JMenuItem("Exit");
-               exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
-               file.add(exit);
-               return file;
-       }
-       
-       // creates the editmenu
-       private JMenu createEditMenu()
-       {
-               edit = new JMenu("Edit");
-               edit.setMnemonic(KeyEvent.VK_E);
                
-               copy = new JMenuItem("Copy");
-               copy.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.CTRL_MASK));
-               edit.add(copy);
-               cut = new JMenuItem("Cut");
-               cut.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.CTRL_MASK));
-               edit.add(cut);
-               paste = new JMenuItem("Paste");
-               paste.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, ActionEvent.CTRL_MASK));
-               edit.add(paste);
-               selectall = new JMenuItem("Select All");
-               selectall.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, ActionEvent.CTRL_MASK));
-               edit.add(selectall);
-               invertselection = new JMenuItem("Invert selection");
-               invertselection.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.CTRL_MASK));
-               edit.add(invertselection);
-               return edit;
-       }
-       
-       // creates the playbackmenu
-       private JMenu createPlayBackMenu()
-       {
-               playback = new JMenu("Playback");
-               playback.setMnemonic(KeyEvent.VK_P);
-               
-               play = new JMenuItem("Play");
-               play.addActionListener(this);
-               playback.add(play);
-               pause= new JMenuItem("Pause / Resume");
-               playback.add(pause);
-               stop = new JMenuItem("Stop");
-               playback.add(stop);
-               jump = new JMenuItem("Jump...");
-               playback.add(jump);
-
-               return playback;
-       }
-
-       // creates the trackmenu
-       private JMenu createTrackMenu()
-       {
-               track = new JMenu("Track");
-               track.setMnemonic(KeyEvent.VK_T);
-               
-               add = new JMenuItem("Add...");
-               track.add(add);
-               delete= new JMenuItem("Delete...");
-               track.add(delete);
-               copy1 = new JMenuItem("Copy...");
-               track.add(copy1);
-               move= new JMenuItem("Move...");
-               track.add(move);
-               return track;
-       }
-
-       // creates the aboutmenu
-       private JMenu createHelpMenu()
-       {
-               help = new JMenu("Help");
-               help.setMnemonic(KeyEvent.VK_H);
+               if(command == "New") {
+                       
+               } else if (command == "Open...") {
                
-               contents = new JMenuItem("Contents");
-               help.add(contents);
-               gettingstarted = new JMenuItem("Getting started");
-               help.add(gettingstarted);
-               about = new JMenuItem("About");
-               help.add(about);
-
-               return help;
-       }
-       
-       public void actionPerformed(ActionEvent e)      
-       {
-               Object ob = e.getSource();
+                       JFileChooser chooser = new JFileChooser();
+                       // här måste jag lägga till en filefilter
+                       // som bestämmer vilka filtyper som får öppnas
+                       
+                       int returnVal = chooser.showOpenDialog(this);
+                       if(returnVal == JFileChooser.APPROVE_OPTION) {
+                               System.out.println("You chose to open this file: " +
+                       chooser.getSelectedFile().getName());
+                       }
                
-               if(ob == neww)
-               {
+               } else if (command == "Save") {
                
-               }
-               else if(ob == open)
-               {
+               } else if (command == "Save as...") {
                
-               }
-               else if(ob == save)
-               {
+                       JFileChooser chooser = new JFileChooser();
+                       // här måste jag lägga till en filefilter
+                       // som bestämmer vilka filtyper som får sparas
+                       
+                       int returnVal = chooser.showSaveDialog(this);
+                       if(returnVal == JFileChooser.APPROVE_OPTION) {
+                               System.out.println("You chose to open this file: " +
+                       chooser.getSelectedFile().getName());
+                       }
                
-               }
-               else if(ob == saveas)
-               {
+               } else if (command == "Exit") {
                
-               }
-               else if(ob == exit)
-               {
+               } else if (command == "Copy") {
                
-               }
-               else if(ob == copy)
-               {
+               } else if (command == "Cut") {
                
-               }
-               else if(ob == cut)
-               {
+               } else if (command == "Paste") {
                
-               }
-               else if(ob == paste)
-               {
+               } else if (command == "Select all") {
                
-               }
-               else if(ob == selectall)
-               {
+               } else if (command == "Invert selection") {
                
-               }
-               else if(ob == invertselection)
-               {
+               } else if (command == "Play") {
+                       JOptionPane.showMessageDialog(null, "playing");
                
-               }
-               else if(ob == play)
-               {
-                       Moosique.play();
-                       JOptionPane.showMessageDialog(null,"Playing...");
-               }
-               else if(ob == pause)
-               {
+               } else if (command == "Pause") {
                
-               }
-               else if(ob == stop)
-               {
+               } else if (command == "Stop") {
                
-               }
-               else if(ob == jump)
-               {
+               } else if (command == "Jump...") {
                
-               }
-               else if(ob == add)
-               {
+               } else if (command == "Add") {
                
-               }
-               else if(ob == delete)
-               {
+               } else if (command == "Delete") {
                
-               }
-               else if(ob == copy1)
-               {
+               } else if (command == "Copy track") {
                
-               }
-               else if(ob == move)
-               {
+               } else if (command == "Move") {
                
-               }
-               else if(ob == contents)
-               {
+               } else if (command == "Contents") {
+                       // contents to be filled in
+                       JOptionPane.showMessageDialog(this, "här kommer contents komma");
                
-               }
-               else if(ob == gettingstarted)
-               {
+               } else if (command == "Getting started") {
+                       // getting started to be filled in
+                       JOptionPane.showMessageDialog(null, "här kommer getting started komma");
                
-               }
-               else if(ob == about)
-               {
+               } else if (command == "About") {
+                       // about to be filled in
+                       JOptionPane.showMessageDialog(null, "här kommer about att komma");
                
                }
-               
        }
-       
+
+
        private JMenu file;
        private JMenu edit;
        private JMenu playback;
        private JMenu track;
        private JMenu help;
-       private JMenuItem neww;
-       private JMenuItem open;
-       private JMenuItem save;
-       private JMenuItem saveas; 
-       private JMenuItem exit;
-       private JMenuItem copy;
-       private JMenuItem cut;
-       private JMenuItem paste;
-       private JMenuItem selectall;
-       private JMenuItem invertselection;
-       private JMenuItem play;
-       private JMenuItem pause;
-       private JMenuItem stop;
-       private JMenuItem jump;
-       private JMenuItem add;
-       private JMenuItem delete;
-       private JMenuItem copy1;
-       private JMenuItem move;
-       private JMenuItem contents;
-       private JMenuItem gettingstarted;
-       private JMenuItem about;
 }

diff --git a/MooToolbar.java b/MooToolbar.java
index 39cf00b9e5f5a1c89fe6266e9302967fbcca4d4e..772a963179d34f41e44d44b492823cf46143e492 100644 (file)
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -1,44 +1,31 @@
 import javax.swing.*;
 
-public class MooToolbar extends JToolBar
-{
-       public MooToolbar()
-       {
-       
-               add(createRewindButton());
-               add(createPlayPauseButton());
-               add(createStopButton());
-               add(createFastForwardButton());
-               
-       }
+public class MooToolbar extends JToolBar       {
 
-       private JButton createRewindButton()
-       {
-               JButton rewind = new JButton(new ImageIcon("images/rewind.gif"));
-               rewind.setToolTipText("rewind");
-               return rewind;
-       }
+       public MooToolbar()     {
        
-       private JButton createPlayPauseButton()
-       {
-               JButton playpause = new JButton(new ImageIcon("images/play.gif"));
-               playpause.setToolTipText("play/pause");
-               return playpause;
-       }
-        
-       private JButton createStopButton()
-       {
-               JButton stop = new JButton(new ImageIcon("images/stop.gif"));
-               stop.setToolTipText("stop");
-               return stop;
-       }
-       
-       private JButton createFastForwardButton()
-       {
-               JButton fastforward = new JButton(new
-               ImageIcon("images/forward.gif"));
-               fastforward.setToolTipText("fast forward");
-               return fastforward;
-       }
+               rewind = createButton("images/rewind.gif", "rewind");
+               add(rewind);
 
+               playpause = createButton("images/play.gif", "play");
+               add(playpause);
+               
+               stop = createButton("images/stop.gif", "stop");
+               add(stop);
+               
+               fastforward = createButton("images/forward.gif", "fast forward");
+               add(fastforward);
+               
+               }
+               
+               private JButton createButton(String imageLocation, String toolTip) {
+                       JButton button = new JButton (new ImageIcon(imageLocation));
+                       button.setToolTipText(toolTip);
+                       return button;
+               }
+               
+               private JButton rewind;
+               private JButton playpause;
+               private JButton stop;
+               private JButton fastforward;
 }