[Bluemusic-commits] SF.net SVN: bluemusic:[4208] blue/trunk

[<kun...@us...>]

Revision: 4208
          http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4208&view=rev
Author:   kunstmusik
Date:     2010-05-04 18:41:11 +0000 (Tue, 04 May 2010)

Log Message:
-----------
added "Reset (12TET)" to scale selection panel via popup menu

Modified Paths:
--------------
    blue/trunk/ChangeLog
    blue/trunk/blue-ui-core/src/blue/soundObject/editor/pianoRoll/ScaleSelectionPanel.java

Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog	2010-05-04 15:24:34 UTC (rev 4207)
+++ blue/trunk/ChangeLog	2010-05-04 18:41:11 UTC (rev 4208)
@@ -28,6 +28,10 @@
             use the index of the selected item rather than the value set for
             that item, and will also generate a a k-rate signal
 
+    [updated] - Scale selectin panels now have a popup menu (triggered by right
+            mouse button) that has a "Reset (12TET)" option to reset the scale
+            to the default 12TET tuning
+
     [fix] - blueLive: when using API, no longer tries to update render time
 
 

Modified: blue/trunk/blue-ui-core/src/blue/soundObject/editor/pianoRoll/ScaleSelectionPanel.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/soundObject/editor/pianoRoll/ScaleSelectionPanel.java	2010-05-04 15:24:34 UTC (rev 4207)
+++ blue/trunk/blue-ui-core/src/blue/soundObject/editor/pianoRoll/ScaleSelectionPanel.java	2010-05-04 18:41:11 UTC (rev 4208)
@@ -32,7 +32,13 @@
 import blue.BlueSystem;
 import blue.soundObject.pianoRoll.Scale;
 import blue.ui.utilities.FileChooserManager;
+import java.awt.Component;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.Vector;
+import javax.swing.AbstractAction;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -48,6 +54,8 @@
 
     ChangeEvent c = null;
 
+    JPopupMenu popup = new JPopupMenu();
+
     public ScaleSelectionPanel() {
         this.setLayout(new BorderLayout());
 
@@ -83,6 +91,26 @@
         this.add(fileNameField, BorderLayout.CENTER);
         this.add(fileButton, BorderLayout.EAST);
 
+        popup.add(new AbstractAction("Reset (12TET)") {
+
+            public void actionPerformed(ActionEvent e) {
+                setScale(Scale.get12TET());
+                fireChangeEvent();
+            }
+        });
+
+        fileNameField.addMouseListener(new MouseAdapter() {
+
+            public void mousePressed(MouseEvent evt) {
+                if (SwingUtilities.isRightMouseButton(evt) && !SwingUtilities.
+                        isLeftMouseButton(evt)) {
+
+                    Component c = evt.getComponent();
+
+                    popup.show(c, evt.getX(), evt.getY());
+                }
+            }
+        });
     }
 
     private void initScaleFileSelector() {
@@ -146,7 +174,7 @@
         if (c == null) {
             c = new ChangeEvent(this);
         }
-        
+
         for (ChangeListener cl : changeListeners) {
             cl.stateChanged(c);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.