no message

[moosique.git] / MooMenu.java

diff --git a/MooMenu.java b/MooMenu.java
index d2acd204a49cc932a30679b9e93eadb7a497570c..f8c67d7602a22b703201e8ec2b1305caf1925aa7 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -167,7 +167,8 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        File file = chooser.getSelectedFile();
                        if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
                                directory = chooser.getSelectedFile().getParentFile();
-                               Moosique.load(chooser.getSelectedFile().getAbsolutePath());
+                               if (!Moosique.promptOnUnsavedChanges())
+                                       Moosique.load(chooser.getSelectedFile().getAbsolutePath());
                        }
                } else if (command == "Save") {
                        if (!Moosique.save()) showSaveAsDialog();
@@ -202,9 +203,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK);
                        Moosique.getSequence().createTrack();
                } else if (command == "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]);
@@ -223,14 +222,16 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        MooDialog newDialog = new MooDialog(MooDialog.SET_TEMPO);
                
                } else if (command == "Scale velocity...") {
+                       MooDialog newDialog = new MooDialog(MooDialog.SCALE_VELOCITY);
                
                } else if (command == "Transpose...") {
+                       MooDialog newDialog = new MooDialog(MooDialog.TRANSPOSE);
                
                } else if (command == "User manual") {
                        MooDialog manual = new MooDialog(MooDialog.MANUAL);
                } else if (command == "About") {
                        JOptionPane.showMessageDialog(null,
-                               "Moosique\nversion 1.0\n\nby\n\nRoland Andersson\nMichael Andreen\nBjörn Lanneskog\nEinar Pehrson",
+                               "Moosique\nversion 1.0\n\n© 2003\nRoland Andersson\nMichael Andreen\nBjörn Lanneskog\nEinar Pehrson",
                                "About Moosique",
                                JOptionPane.INFORMATION_MESSAGE,
                                new ImageIcon(Moosique.getGUI().logo));