X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=f4090bdc5d70ef1fabffafbe71c45a8dba24357a;hp=f51af1a28de19f14c5234bae9dd3f879eb2d7cc0;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=83c3edf41adc9a5ae904331bc230fc1536fdeeb4

diff --git a/MooMenu.java b/MooMenu.java
index f51af1a..f4090bd 100644
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -55,10 +55,10 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		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);
-		edit.addSeparator();
+		music.addSeparator();
 		addItem(music, "Insert measure...");
 		addItem(music, "Delete measure...");
-		edit.addSeparator();
+		music.addSeparator();
 		addItem(music, "Set time signature...");
 		addItem(music, "Set tempo...");
 		addItem(music, "Scale velocity...");
@@ -136,7 +136,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 	}
 	/**
 	* Gets the users command of takes and properiate action
-	* @param e	the action perfomed
+	* @param e	The action perfomed.
 	*/
 	public void actionPerformed(ActionEvent e) {
 		String command = e.getActionCommand();
@@ -161,23 +161,9 @@ public class MooMenu extends JMenuBar implements ActionListener {
 				Moosique.load(chooser.getSelectedFile().getAbsolutePath());
 			}
 		} else if (command == "Save") {
-			Moosique.save();
+			if (!Moosique.save()) showSaveAsDialog();
 		} else if (command == "Save as...") {
-			// 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());
-			}
+			showSaveAsDialog();
 		} else if (command == "Exit") {
 			Moosique.quit();
 		} else if (command == "Copy") {
@@ -199,31 +185,27 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		} else if (command == "Stop") {
 			Moosique.stop();
 		} else if (command == "Jump...") {
-			MooDialog what = new MooDialog(MooDialog.JUMP);
+			MooDialog newDialog = 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);
+			MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK);
 			Moosique.getSequence().createTrack();
 		} else if (command == "Delete track...") {
 		
-			MooDialog what = new MooDialog(MooDialog.DELETE_TRACK);
+			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...") {
-		
-			MooDialog what = new MooDialog(MooDialog.COPY_TRACK);
-			
+			MooDialog newDialog = new MooDialog(MooDialog.COPY_TRACK);
 		} else if (command == "Move track...") {
-		
-			MooDialog what = new MooDialog(MooDialog.MOVE_TRACK);
-
+			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...") {
@@ -233,9 +215,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		} else if (command == "Transpose...") {
 		
 		} else if (command == "Contents") {
-	
-			JOptionPane.showMessageDialog(this, "här kommer contents komma");
-		
+			MooDialog contents = new MooDialog(MooDialog.CONTENTS);
 		} else if (command == "Getting started") {
 			
 			JOptionPane.showMessageDialog(null, "här kommer getting started komma");
@@ -246,6 +226,24 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		}
 	}
 
+	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) {
@@ -254,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
 		 */