bluemusic-commits Mailing List for blue (Page 2)
Brought to you by:
kunstmusik
Menu
▾
▴
bluemusic-commits — blue mailing list for SVN commits (w/diffs)
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
(16) |
Mar
(46) |
Apr
(11) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <kun...@us...> - 2010-03-23 04:36:42
|
Revision: 4183
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4183&view=rev
Author: kunstmusik
Date: 2010-03-23 04:36:35 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
implemented blue live tool bar functionality
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.form
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.java
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-23 04:36:08 UTC (rev 4182)
+++ blue/trunk/ChangeLog 2010-03-23 04:36:35 UTC (rev 4183)
@@ -12,6 +12,26 @@
[CHANGE LOG]
+>Notes for 2.1.0<
+[released 2010.xx.xx]
+
+Steven Yi-----------------------------------------------------------------------
+
+blue
+
+ [updated] - moved blueLive buttons for starting/stopping and all notes off
+ to and application toolbar
+
+ [updated] - moved blueLive MIDI input to Input Settings Top Component
+
+ [fix] - blueLive: when using API, no longer tries to update render time
+
+
+================================================================================
+= 2.0.x
+================================================================================
+
+
>Notes for 2.0.9<
[released 2010.03.21]
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java 2010-03-23 04:36:08 UTC (rev 4182)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java 2010-03-23 04:36:35 UTC (rev 4183)
@@ -17,12 +17,27 @@
* Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
* USA
*/
-
package blue.ui.core.blueLive;
+import blue.BlueData;
+import blue.event.PlayModeListener;
+import blue.gui.ExceptionDialog;
+import blue.projects.BlueProject;
+import blue.projects.BlueProjectManager;
+import blue.settings.GeneralSettings;
+import blue.soundObject.SoundObjectException;
+import blue.ui.core.render.APIRunner;
+import blue.ui.core.render.CSDRunner;
+import blue.ui.core.render.CommandlineRunner;
+import blue.utility.APIUtilities;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import javax.swing.JButton;
import javax.swing.JToggleButton;
import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
/**
*
@@ -30,6 +45,20 @@
*/
public class BlueLiveToolBar extends JToolBar {
+ BlueData data = null;
+
+ APIRunner apiRunner;
+
+ CommandlineRunner commandlineRunner = new CommandlineRunner(this);
+
+ CSDRunner csdRunner = null;
+
+ JToggleButton runButton = new JToggleButton("blueLive");
+
+ JButton refreshButton = new JButton("Recompile");
+
+ JButton allNotesOffButton = new JButton("All Notes Off");
+
private static BlueLiveToolBar instance = null;
public static BlueLiveToolBar getInstance() {
@@ -42,13 +71,118 @@
private BlueLiveToolBar() {
setFloatable(false);
- JButton runButton = new JButton("blueLive");
- JButton refreshButton = new JButton("Recompile");
- JButton allNotesOffButton = new JButton("All Notes Off");
+ PlayModeListener playModeListener = new PlayModeListener() {
+ public void playModeChanged(int playMode) {
+ if (playMode == PlayModeListener.PLAY_MODE_STOP) {
+ if (runButton.isSelected()) {
+ runButton.setSelected(false);
+ }
+ }
+
+ }
+ };
+
+ try {
+ apiRunner = new APIRunner();
+ apiRunner.addPlayModeListener(playModeListener);
+ } catch (Throwable t) {
+ apiRunner = null;
+ }
+
+ runButton.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ runButtonActionPerformed();
+ }
+
+ });
+
+ allNotesOffButton.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ allNotesOffButtonActionPerformed(e);
+ }
+ });
+
this.add(runButton);
this.add(refreshButton);
this.add(allNotesOffButton);
+
+ BlueProjectManager.getInstance().addPropertyChangeListener(new PropertyChangeListener() {
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (BlueProjectManager.CURRENT_PROJECT.equals(evt.getPropertyName())) {
+ reinitialize();
+ }
+ }
+ });
+
+ reinitialize();
}
+ private void reinitialize() {
+ this.data = null;
+
+ BlueProject project = BlueProjectManager.getInstance().getCurrentProject();
+ BlueData currentData = null;
+
+ if (project != null) {
+ this.data = project.getData();
+ }
+ }
+
+
+ protected void runButtonActionPerformed() {
+ if (data == null) {
+ return;
+ }
+
+ if (csdRunner != null && csdRunner.isRunning()) {
+ csdRunner.stop();
+
+ csdRunner = null;
+
+ if (runButton.isSelected()) {
+ runButton.setSelected(false);
+ }
+
+ return;
+ }
+
+ if (!runButton.isSelected()) {
+ runButton.setSelected(true);
+ }
+
+ if (apiRunner != null
+ && APIUtilities.isCsoundAPIAvailable()
+ && GeneralSettings.getInstance().isUsingCsoundAPI()) {
+ csdRunner = apiRunner;
+ } else {
+ csdRunner = commandlineRunner;
+ }
+
+ csdRunner.setData(data);
+
+ try {
+ csdRunner.renderForBlueLive();
+ } catch (SoundObjectException soe) {
+ ExceptionDialog.showExceptionDialog(SwingUtilities.getRoot(this),
+ soe);
+ }
+ }
+
+ private void allNotesOffButtonActionPerformed(java.awt.event.ActionEvent evt) {
+ sendEvents("i \"blueAllNotesOff\" 0 1");
+ }
+
+ public void sendEvents(String scoText) {
+ if (csdRunner != null && csdRunner.isRunning()) {
+ csdRunner.passToStdin(scoText);
+ }
+ }
+
+ public boolean isRunning() {
+ return csdRunner != null && csdRunner.isRunning();
+ }
}
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.form
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.form 2010-03-23 04:36:08 UTC (rev 4182)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.form 2010-03-23 04:36:35 UTC (rev 4183)
@@ -27,23 +27,19 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="midiInputComboBox" alignment="0" pref="251" max="32767" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="commandLineText" pref="138" max="32767" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Component id="midiInputComboBox" pref="266" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
+ <Component id="rescanButton1" pref="84" max="32767" attributes="1"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="midiOpenButton" min="-2" max="-2" attributes="1"/>
+ </Group>
+ <Group type="102" attributes="0">
+ <Component id="commandLineText" pref="314" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Component id="completeOverride" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="runButton" linkSize="1" alignment="0" pref="69" max="32767" attributes="1"/>
- <Component id="rescanButton1" linkSize="1" alignment="0" max="32767" attributes="1"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="midiOpenButton" alignment="0" max="32767" attributes="1"/>
- <Component id="allNotesOffButton" alignment="0" max="32767" attributes="1"/>
- </Group>
</Group>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
@@ -58,9 +54,8 @@
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="enableAdvancedFlags" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="completeOverride" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="commandLineText" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="runButton" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="completeOverride" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
@@ -69,8 +64,7 @@
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
- <Component id="allNotesOffButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="midiOpenButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rescanButton1" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -105,16 +99,6 @@
</Component>
<Component class="javax.swing.JTextField" name="commandLineText">
</Component>
- <Component class="javax.swing.JToggleButton" name="runButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="blue/ui/core/blueLive/Bundle.properties" key="BlueLiveTopComponent.runButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="runButtonActionPerformed"/>
- </Events>
- </Component>
<Component class="javax.swing.JCheckBox" name="enableAdvancedFlags">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -437,15 +421,5 @@
</Container>
</SubComponents>
</Container>
- <Component class="javax.swing.JButton" name="allNotesOffButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="blue/ui/core/blueLive/Bundle.properties" key="BlueLiveTopComponent.allNotesOffButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="allNotesOffButtonActionPerformed"/>
- </Events>
- </Component>
</SubComponents>
</Form>
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.java 2010-03-23 04:36:08 UTC (rev 4182)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveTopComponent.java 2010-03-23 04:36:35 UTC (rev 4183)
@@ -103,12 +103,6 @@
LiveObjectsTableModel model;
- APIRunner apiRunner;
-
- CommandlineRunner commandlineRunner = new CommandlineRunner(this);
-
- CSDRunner csdRunner = null;
-
AddMenu addPopup = null;
BufferMenu bufferPopup = new BufferMenu();
@@ -121,6 +115,8 @@
ArrayList<Class> plugins = BluePluginManager.getInstance().getLiveSoundObjectClasses();
+ BlueLiveToolBar blueLiveToolBar;
+
public BlueLiveTopComponent() {
initComponents();
setName(NbBundle.getMessage(BlueLiveTopComponent.class,
@@ -129,26 +125,8 @@
"HINT_BlueLiveTopComponent"));
// setIcon(ImageUtilities.loadImage(ICON_PATH, true));
- PlayModeListener playModeListener = new PlayModeListener() {
+ blueLiveToolBar = BlueLiveToolBar.getInstance();
- public void playModeChanged(int playMode) {
- if (playMode == PlayModeListener.PLAY_MODE_STOP) {
- if (runButton.isSelected()) {
- runButton.setSelected(false);
- }
- }
-
- }
- };
-
- try {
- apiRunner = new APIRunner();
- apiRunner.addPlayModeListener(playModeListener);
- } catch (Throwable t) {
- apiRunner = null;
- }
-
-
setupNoteTemplatePopup();
model = new LiveObjectsTableModel();
@@ -316,7 +294,6 @@
completeOverride = new javax.swing.JCheckBox();
commandLineText = new javax.swing.JTextField();
- runButton = new javax.swing.JToggleButton();
enableAdvancedFlags = new javax.swing.JCheckBox();
midiOpenButton = new javax.swing.JToggleButton();
midiInputLabel = new javax.swing.JLabel();
@@ -342,7 +319,6 @@
quarterNoteSpinner = new javax.swing.JSpinner();
jLabel5 = new javax.swing.JLabel();
instrIdText = new javax.swing.JTextField();
- allNotesOffButton = new javax.swing.JButton();
org.openide.awt.Mnemonics.setLocalizedText(completeOverride, org.openide.util.NbBundle.getMessage(BlueLiveTopComponent.class, "BlueLiveTopComponent.completeOverride.text")); // NOI18N
completeOverride.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -353,13 +329,6 @@
}
});
- org.openide.awt.Mnemonics.setLocalizedText(runButton, org.openide.util.NbBundle.getMessage(BlueLiveTopComponent.class, "BlueLiveTopComponent.runButton.text")); // NOI18N
- runButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- runButtonActionPerformed(evt);
- }
- });
-
org.openide.awt.Mnemonics.setLocalizedText(enableAdvancedFlags, org.openide.util.NbBundle.getMessage(BlueLiveTopComponent.class, "BlueLiveTopComponent.enableAdvancedFlags.text")); // NOI18N
enableAdvancedFlags.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
enableAdvancedFlags.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -543,13 +512,6 @@
jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(BlueLiveTopComponent.class, "BlueLiveTopComponent.scoPadPanel.TabConstraints.tabTitle"), scoPadPanel); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(allNotesOffButton, org.openide.util.NbBundle.getMessage(BlueLiveTopComponent.class, "BlueLiveTopComponent.allNotesOffButton.text")); // NOI18N
- allNotesOffButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- allNotesOffButtonActionPerformed(evt);
- }
- });
-
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -564,24 +526,18 @@
.add(enableAdvancedFlags))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(midiInputComboBox, 0, 251, Short.MAX_VALUE)
.add(layout.createSequentialGroup()
- .add(commandLineText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 138, Short.MAX_VALUE)
+ .add(midiInputComboBox, 0, 266, Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(completeOverride)))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(runButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE)
- .add(rescanButton1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(midiOpenButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(allNotesOffButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .add(rescanButton1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 84, Short.MAX_VALUE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(midiOpenButton))
+ .add(layout.createSequentialGroup()
+ .add(commandLineText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(completeOverride)))))
.addContainerGap())
);
-
- layout.linkSize(new java.awt.Component[] {rescanButton1, runButton}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
-
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
@@ -590,16 +546,14 @@
.add(layout.createSequentialGroup()
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(enableAdvancedFlags)
- .add(completeOverride)
.add(commandLineText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(runButton))
+ .add(completeOverride))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(midiInputLabel)
.add(midiInputComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
.add(layout.createSequentialGroup()
- .add(allNotesOffButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(29, 29, 29)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(midiOpenButton)
.add(rescanButton1))))
@@ -617,46 +571,6 @@
data.getLiveData().setCommandLineOverride(completeOverride.isSelected());
}//GEN-LAST:event_completeOverrideActionPerformed
- private void runButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_runButtonActionPerformed
- if (data == null) {
- return;
- }
-
- if (csdRunner != null && csdRunner.isRunning()) {
- csdRunner.stop();
-
- csdRunner = null;
-
- if (runButton.isSelected()) {
- runButton.setSelected(false);
- }
-
- return;
- }
-
- if (!runButton.isSelected()) {
- runButton.setSelected(true);
- }
-
- if (apiRunner != null &&
- APIUtilities.isCsoundAPIAvailable() &&
- GeneralSettings.getInstance().isUsingCsoundAPI()) {
- csdRunner = apiRunner;
- } else {
- csdRunner = commandlineRunner;
- }
-
- csdRunner.setData(data);
-
- try {
- csdRunner.renderForBlueLive();
- } catch (SoundObjectException soe) {
- ExceptionDialog.showExceptionDialog(SwingUtilities.getRoot(this),
- soe);
- }
-
- }//GEN-LAST:event_runButtonActionPerformed
-
private void enableAdvancedFlagsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_enableAdvancedFlagsActionPerformed
if (data == null) {
return;
@@ -810,12 +724,8 @@
}
}//GEN-LAST:event_noteTemplateTextMousePressed
- private void allNotesOffButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allNotesOffButtonActionPerformed
- sendEvents("i \"blueAllNotesOff\" 0 1");
-}//GEN-LAST:event_allNotesOffButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addButton;
- private javax.swing.JButton allNotesOffButton;
private javax.swing.JTextField commandLineText;
private javax.swing.JCheckBox completeOverride;
private javax.swing.JCheckBox enableAdvancedFlags;
@@ -840,7 +750,6 @@
private javax.swing.JSpinner quarterNoteSpinner;
private javax.swing.JButton removeButton;
private javax.swing.JButton rescanButton1;
- private javax.swing.JToggleButton runButton;
private javax.swing.JPanel scoPadPanel;
private javax.swing.JSpinner startSpinner;
// End of variables declaration//GEN-END:variables
@@ -915,13 +824,6 @@
return PREFERRED_ID;
}
- // APPLICATION CODE
- protected void sendEvents(String scoText) {
- if (csdRunner != null && csdRunner.isRunning()) {
- csdRunner.passToStdin(scoText);
- }
- }
-
private void setupNoteTemplatePopup() {
noteTemplatePopup = new JPopupMenu();
@@ -961,7 +863,7 @@
}
protected void triggerLiveObject(int index) {
- if (data == null || csdRunner == null || !csdRunner.isRunning() || index < 0) {
+ if (data == null || index < 0) {
return;
}
@@ -988,7 +890,7 @@
}
if (scoreText != null && scoreText.length() > 0) {
- sendEvents(scoreText);
+ blueLiveToolBar.sendEvents(scoreText);
}
}
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties 2010-03-23 04:36:08 UTC (rev 4182)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties 2010-03-23 04:36:35 UTC (rev 4183)
@@ -3,7 +3,6 @@
CTL_BlueLiveTopComponent=Blue Live
HINT_BlueLiveTopComponent=This is a BlueLive window
BlueLiveTopComponent.completeOverride.text=Complete Override
-BlueLiveTopComponent.allNotesOffButton.text=All Notes Off
BlueLiveTopComponent.instrIdText.text=1
BlueLiveTopComponent.jLabel5.text=Instrument ID
BlueLiveTopComponent.jLabel2.text=Quarter Note
@@ -21,4 +20,3 @@
BlueLiveTopComponent.midiInputLabel.text=MIDI Input Device
BlueLiveTopComponent.midiOpenButton.text=Enable
BlueLiveTopComponent.enableAdvancedFlags.text=Advanced Flags
-BlueLiveTopComponent.runButton.text=Run
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-23 04:36:14
|
Revision: 4182
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4182&view=rev
Author: kunstmusik
Date: 2010-03-23 04:36:08 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
fixed issue with rendering for blue live and not setting render time
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java 2010-03-23 04:35:46 UTC (rev 4181)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java 2010-03-23 04:36:08 UTC (rev 4182)
@@ -100,9 +100,9 @@
}
// if (csound == null) {
- Csound csound = new Csound();
- blueCallbackWrapper = new BlueCallbackWrapper(csound);
- blueCallbackWrapper.SetMessageCallback();
+ Csound csound = new Csound();
+ blueCallbackWrapper = new BlueCallbackWrapper(csound);
+ blueCallbackWrapper.SetMessageCallback();
// }
@@ -221,15 +221,12 @@
System.arraycopy(args, 0, args2, 0, args.length);
args2[args.length] = temp.getAbsolutePath();
- play(null, result, tempoMapper, args2, BlueSystem.
- getCurrentProjectDirectory(), startTime);
+ play(null, result, tempoMapper, args2, BlueSystem.getCurrentProjectDirectory(), startTime);
} catch (SoundObjectException soe) {
throw soe;
} catch (Exception ex) {
- StatusBar.updateStatus("[" + BlueSystem.getString("message.error") + "] " + BlueSystem.
- getString("message.generateScore.error"));
- System.err.println("[" + BlueSystem.getString("message.error") + "] " + ex.
- getLocalizedMessage());
+ StatusBar.updateStatus("[" + BlueSystem.getString("message.error") + "] " + BlueSystem.getString("message.generateScore.error"));
+ System.err.println("[" + BlueSystem.getString("message.error") + "] " + ex.getLocalizedMessage());
}
}
@@ -273,8 +270,7 @@
System.arraycopy(args, 0, args2, 0, args.length);
args2[args.length] = temp.getAbsolutePath();
- play(this.data, result, null, args2, BlueSystem.
- getCurrentProjectDirectory(), -1.0f);
+ play(this.data, result, null, args2, BlueSystem.getCurrentProjectDirectory(), -1.0f);
// play(command, BlueSystem.getCurrentProjectDirectory(), -1);
}
@@ -349,16 +345,17 @@
if (data.isLoopRendering() && !shouldStop) {
- new Thread() {
- public void run() {
- try {
- render();
- } catch (SoundObjectException e) {
- Exceptions.printStackTrace(e);
- notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
- }
+ new Thread() {
+
+ public void run() {
+ try {
+ render();
+ } catch (SoundObjectException e) {
+ Exceptions.printStackTrace(e);
+ notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
}
- }.start();
+ }
+ }.start();
} else {
notifyPlayModeListeners(playMode);
}
@@ -409,19 +406,25 @@
}
public void run() {
- int updateRate = (int) (csound.GetKr() /
- PlaybackSettings.getInstance().getPlaybackFPS());
+ int updateRate = (int) (csound.GetKr()
+ / PlaybackSettings.getInstance().getPlaybackFPS());
int counter = 0;
- RenderTimeManager manager = RenderTimeManager.getInstance();
- manager.initiateRender(startTime);
+ RenderTimeManager manager = null;
+ final boolean renderUpdatesTime = startTime >= 0.0F;
+
+ if (renderUpdatesTime) {
+ manager = RenderTimeManager.getInstance();
+ manager.initiateRender(startTime);
+ }
+
Parameter param;
float scoreTime = (float) csound.GetScoreTime();
float currentTime = 0.0f;
- if (startTime >= 0.0f) {
+ if (renderUpdatesTime) {
if (mapper != null) {
float renderStartSeconds = mapper.beatsToSeconds(startTime);
currentTime = mapper.secondsToBeats(
@@ -439,14 +442,15 @@
scoreTime = (float) csound.GetScoreTime();
- if (counter > updateRate) {
+
+ if (renderUpdatesTime && counter > updateRate) {
manager.updateTimePointer(scoreTime);
counter = 0;
}
currentTime = 0.0f;
- if (startTime >= 0.0f) {
+ if (renderUpdatesTime) {
if (mapper != null) {
float renderStartSeconds = mapper.beatsToSeconds(
startTime);
@@ -483,7 +487,9 @@
csound.Reset();
- RenderTimeManager.getInstance().endRender();
+ if (renderUpdatesTime) {
+ RenderTimeManager.getInstance().endRender();
+ }
playModeListener.playModeChanged(PlayModeListener.PLAY_MODE_STOP);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-23 04:35:52
|
Revision: 4181
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4181&view=rev
Author: kunstmusik
Date: 2010-03-23 04:35:46 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
added type info for generic
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/AudioFileDependencyDialog.java
Modified: blue/trunk/blue-ui-core/src/blue/AudioFileDependencyDialog.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/AudioFileDependencyDialog.java 2010-03-23 04:35:25 UTC (rev 4180)
+++ blue/trunk/blue-ui-core/src/blue/AudioFileDependencyDialog.java 2010-03-23 04:35:46 UTC (rev 4181)
@@ -116,11 +116,11 @@
ArrayList filesList = null;
- ArrayList returnList = null;
+ ArrayList<String> returnList = null;
public void setFilesList(ArrayList filesList) {
this.filesList = filesList;
- this.returnList = new ArrayList();
+ this.returnList = new ArrayList<String>();
for (int i = 0; i < filesList.size(); i++) {
returnList.add("");
@@ -154,7 +154,7 @@
return;
}
- returnList.set(rowIndex, aValue);
+ returnList.set(rowIndex, (String)aValue);
fireTableCellUpdated(rowIndex, columnIndex);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-23 04:35:31
|
Revision: 4180
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4180&view=rev
Author: kunstmusik
Date: 2010-03-23 04:35:25 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
made work with jtogglebutton
Modified Paths:
--------------
blue/trunk/blue-plaf/src/blue/plaf/BlueButtonBorder.java
Modified: blue/trunk/blue-plaf/src/blue/plaf/BlueButtonBorder.java
===================================================================
--- blue/trunk/blue-plaf/src/blue/plaf/BlueButtonBorder.java 2010-03-23 04:35:14 UTC (rev 4179)
+++ blue/trunk/blue-plaf/src/blue/plaf/BlueButtonBorder.java 2010-03-23 04:35:25 UTC (rev 4180)
@@ -19,7 +19,6 @@
*
* This file uses code from MetouiaButtonBorder.java by Taoufik Romdhane.
*/
-
package blue.plaf;
import java.awt.Component;
@@ -28,6 +27,7 @@
import javax.swing.ButtonModel;
import javax.swing.JButton;
+import javax.swing.JToggleButton;
import javax.swing.border.AbstractBorder;
import javax.swing.plaf.UIResource;
@@ -60,6 +60,38 @@
* The height.
*/
public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
+
+ if (c instanceof JToggleButton) {
+ JToggleButton button = (JToggleButton) c;
+ ButtonModel model = button.getModel();
+
+ // Optimizations are welcome here!
+ if (model.isEnabled()) {
+ if (model.isPressed() && model.isArmed()) {
+ BlueBorderUtilities.drawPressed3DBorder(g, x, y, w, h);
+ } else {
+// if (button.isDefaultButton()) {
+// BlueBorderUtilities.drawDefaultButtonBorder(g, x, y, w, h);
+// } else {
+ if (button.isRolloverEnabled()) {
+ if (model.isRollover()) {
+ BlueBorderUtilities.drawSimple3DBorder(g, x, y, w,
+ h);
+ }
+ } else {
+ BlueBorderUtilities.drawSimple3DBorder(g, x, y, w, h);
+ }
+// }
+ }
+ } else {
+ if (!button.isRolloverEnabled()) {
+ BlueBorderUtilities.drawDisabledBorder(g, x, y, w - 1, h - 1);
+ }
+ }
+
+ return;
+ }
+
JButton button = (JButton) c;
ButtonModel model = ((JButton) c).getModel();
@@ -98,4 +130,4 @@
public Insets getBorderInsets(Component c) {
return insets;
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-23 04:35:20
|
Revision: 4179
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4179&view=rev
Author: kunstmusik
Date: 2010-03-23 04:35:14 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
added type info for generic
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/automation/AutomationManager.java
Modified: blue/trunk/blue-ui-core/src/blue/automation/AutomationManager.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/automation/AutomationManager.java 2010-03-22 00:07:12 UTC (rev 4178)
+++ blue/trunk/blue-ui-core/src/blue/automation/AutomationManager.java 2010-03-23 04:35:14 UTC (rev 4179)
@@ -643,7 +643,7 @@
EffectsChain pre = channel.getPreEffects();
pre.removeAutomatableCollectionListener(this);
- ArrayList removedParamIds = new ArrayList();
+ ArrayList<String> removedParamIds = new ArrayList<String>();
for (int i = 0; i < pre.size(); i++) {
ParameterList parameterList = ((Automatable) pre.getElementAt(i))
@@ -687,7 +687,7 @@
// dirty = true;
}
- private void removeParameters(ArrayList paramIds) {
+ private void removeParameters(ArrayList<String> paramIds) {
if (paramIds == null || paramIds.size() == 0) {
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-22 00:07:18
|
Revision: 4178
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4178&view=rev
Author: kunstmusik
Date: 2010-03-22 00:07:12 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
added blue live toolbar
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/ui/core/MainToolbarAction.java
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties
blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml
Added Paths:
-----------
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java
blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolbarAction.java
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/MainToolbarAction.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/MainToolbarAction.java 2010-03-21 21:40:42 UTC (rev 4177)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/MainToolbarAction.java 2010-03-22 00:07:12 UTC (rev 4178)
@@ -21,18 +21,11 @@
import blue.MainToolBar;
import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import org.openide.util.actions.Presenter;
-public final class MainToolbarAction implements Presenter.Toolbar, ActionListener {
+public final class MainToolbarAction implements Presenter.Toolbar {
@Override
- public void actionPerformed(ActionEvent e) {
- // TODO implement action body
- }
-
- @Override
public Component getToolbarPresenter() {
return MainToolBar.getInstance();
}
Added: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java (rev 0)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolBar.java 2010-03-22 00:07:12 UTC (rev 4178)
@@ -0,0 +1,54 @@
+/*
+ * blue - object composition environment for csound Copyright (c) 2000-2009
+ * Steven Yi (ste...@gm...)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.LIB. If not, write to the Free
+ * Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+package blue.ui.core.blueLive;
+
+import javax.swing.JButton;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar;
+
+/**
+ *
+ * @author syi
+ */
+public class BlueLiveToolBar extends JToolBar {
+
+ private static BlueLiveToolBar instance = null;
+
+ public static BlueLiveToolBar getInstance() {
+ if (instance == null) {
+ instance = new BlueLiveToolBar();
+ }
+ return instance;
+ }
+
+ private BlueLiveToolBar() {
+ setFloatable(false);
+
+ JButton runButton = new JButton("blueLive");
+ JButton refreshButton = new JButton("Recompile");
+ JButton allNotesOffButton = new JButton("All Notes Off");
+
+ this.add(runButton);
+ this.add(refreshButton);
+ this.add(allNotesOffButton);
+ }
+
+}
Added: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolbarAction.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolbarAction.java (rev 0)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/BlueLiveToolbarAction.java 2010-03-22 00:07:12 UTC (rev 4178)
@@ -0,0 +1,33 @@
+/*
+ * blue - object composition environment for csound Copyright (c) 2000-2009
+ * Steven Yi (ste...@gm...)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.LIB. If not, write to the Free
+ * Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+package blue.ui.core.blueLive;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import org.openide.util.actions.Presenter;
+
+public final class BlueLiveToolbarAction implements Presenter.Toolbar {
+
+ @Override
+ public Component getToolbarPresenter() {
+ return BlueLiveToolBar.getInstance();
+ }
+}
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties 2010-03-21 21:40:42 UTC (rev 4177)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/blueLive/Bundle.properties 2010-03-22 00:07:12 UTC (rev 4178)
@@ -1,4 +1,5 @@
CTL_BlueLiveAction=Blue Live
+CTL_BlueLiveToolbarAction=blueLive Toolbar Action
CTL_BlueLiveTopComponent=Blue Live
HINT_BlueLiveTopComponent=This is a BlueLive window
BlueLiveTopComponent.completeOverride.text=Complete Override
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml 2010-03-21 21:40:42 UTC (rev 4177)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml 2010-03-22 00:07:12 UTC (rev 4178)
@@ -13,6 +13,11 @@
<attr name="iconBase" stringvalue="blue/resources/images/BlueIcon.gif"/>
<attr name="noIconInMenu" stringvalue="false"/>
</file>
+ <file name="blue-ui-core-blueLive-BlueLiveToolbarAction.instance">
+ <attr name="delegate" newvalue="blue.ui.core.blueLive.BlueLiveToolbarAction"/>
+ <attr name="displayName" bundlevalue="blue.ui.core.blueLive.Bundle#CTL_BlueLiveToolbarAction"/>
+ <attr name="noIconInMenu" boolvalue="false"/>
+ </file>
<file name="blue-ui-core-tools-CodeRepositoryEditorAction.instance">
<attr name="SystemFileSystem.localizingBundle" stringvalue="blue.ui.core.Bundle"/>
<attr name="delegate" newvalue="blue.ui.core.tools.CodeRepositoryEditorAction"/>
@@ -517,6 +522,10 @@
<attr name="originalFile" stringvalue="Actions/Edit/blue-ui-core-MainToolbarAction.instance"/>
<attr name="position" intvalue="0"/>
</file>
+ <file name="blue-ui-core-BlueLiveToolbarAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/blue-ui-core-blueLive-BlueLiveToolbarAction.instance"/>
+ <attr name="position" intvalue="10"/>
+ </file>
</folder>
</folder>
<folder name="Windows2">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 21:40:48
|
Revision: 4177
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4177&view=rev
Author: kunstmusik
Date: 2010-03-21 21:40:42 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
tagging blue release 2.0.9
Added Paths:
-----------
blue/tags/BLUE_RELEASE_2.0.9/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 21:35:02
|
Revision: 4176
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4176&view=rev
Author: kunstmusik
Date: 2010-03-21 21:34:56 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
modified to get manual packaged with OSX build
Modified Paths:
--------------
blue/trunk/build.xml
Modified: blue/trunk/build.xml
===================================================================
--- blue/trunk/build.xml 2010-03-21 21:29:44 UTC (rev 4175)
+++ blue/trunk/build.xml 2010-03-21 21:34:56 UTC (rev 4176)
@@ -38,7 +38,7 @@
overwrite="true" />
</target>
- <target name="build-mac" depends="suite.build-mac">
+ <target name="build-mac" depends="suite.build-mac,blue-manual">
<property name="nbdist-contents.dir" value="${dist.dir}/${app.name}.app/Contents"/>
<property name="nbdist-resources.dir" value="${nbdist-contents.dir}/Resources"/>
<property name="zipName" value="${dist.dir}/${app.name}_OSX_${blueVersion}.zip"/>
@@ -127,6 +127,10 @@
<os family="windows"/>
</condition>
+ <condition property="fopCommand" value="/opt/local/bin/fop">
+ <os family="mac" />
+ </condition>
+
<condition property="fopCommand" value="fop">
<os family="unix" />
</condition>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 21:29:51
|
Revision: 4175
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4175&view=rev
Author: kunstmusik
Date: 2010-03-21 21:29:44 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
fixed python noteprocessor's code editor to use frame
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-ui-core/src/blue/ui/core/score/noteProcessorChain/CodeEditor.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-21 21:28:00 UTC (rev 4174)
+++ blue/trunk/ChangeLog 2010-03-21 21:29:44 UTC (rev 4175)
@@ -38,7 +38,9 @@
to use the new uniqueId system by selecting the preset and
immediately choosing update for the preset. (Bug 2017191)
+ [fix] - Python NoteProcessor caused exception when showing it's code editor
+
>Notes for 2.0.8<
[released 2010.03.14]
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/score/noteProcessorChain/CodeEditor.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/score/noteProcessorChain/CodeEditor.java 2010-03-21 21:28:00 UTC (rev 4174)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/score/noteProcessorChain/CodeEditor.java 2010-03-21 21:29:44 UTC (rev 4175)
@@ -21,7 +21,6 @@
import java.awt.BorderLayout;
import java.awt.Container;
-import java.awt.Dialog;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -31,13 +30,14 @@
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
-import javax.swing.SwingUtilities;
import blue.gui.BlueEditorPane;
import blue.noteProcessor.Code;
import blue.utility.GUI;
import com.l2fprod.common.swing.BaseDialog;
+import java.awt.Frame;
+import org.openide.windows.WindowManager;
/**
* @author steven
@@ -88,8 +88,7 @@
protected void editCode() {
if (codeDialog == null) {
- codeDialog = new CodeEditDialog((Dialog) SwingUtilities
- .getRoot(this));
+ codeDialog = new CodeEditDialog(WindowManager.getDefault().getMainWindow());
codeDialog.setSize(400, 400);
GUI.centerOnScreen(codeDialog);
}
@@ -127,7 +126,7 @@
BlueEditorPane editor = new BlueEditorPane();
- public CodeEditDialog(Dialog parent) {
+ public CodeEditDialog(Frame parent) {
super(parent, "Edit Code", true);
this.getBanner().setVisible(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 21:28:06
|
Revision: 4174
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4174&view=rev
Author: kunstmusik
Date: 2010-03-21 21:28:00 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
removed duplicate classes
Removed Paths:
-------------
blue/trunk/blue-ui-core/src/blue/score/noteProcessorChain/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:28:50
|
Revision: 4173
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4173&view=rev
Author: kunstmusik
Date: 2010-03-21 20:28:43 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
updated build-mac target to include manual
Modified Paths:
--------------
blue/trunk/build.xml
Modified: blue/trunk/build.xml
===================================================================
--- blue/trunk/build.xml 2010-03-21 20:17:41 UTC (rev 4172)
+++ blue/trunk/build.xml 2010-03-21 20:28:43 UTC (rev 4173)
@@ -57,6 +57,10 @@
<fileset dir="examples" excludes="**/.svn"/>
</copy>
+ <copy todir="${dist.dir}/${app.name}.app/manual">
+ <fileset dir="${blue.manual.dir}" excludes="**/.svn"/>
+ </copy>
+
<delete file="${zipName}" failonerror="false"/>
<exec executable="zip">
<arg value="-yJr"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:17:47
|
Revision: 4172
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4172&view=rev
Author: kunstmusik
Date: 2010-03-21 20:17:41 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
fix for blue manual version number changing
Modified Paths:
--------------
blue/trunk/build.xml
Modified: blue/trunk/build.xml
===================================================================
--- blue/trunk/build.xml 2010-03-21 20:14:57 UTC (rev 4171)
+++ blue/trunk/build.xml 2010-03-21 20:17:41 UTC (rev 4172)
@@ -99,7 +99,7 @@
</target>
<target name="blue-manual-html" depends="blue-manual-init" description="Create manual from Docbook">
- <copy file="manual/docbook/index.xml.in" tofile="manual/docbook/index.xml" />
+ <copy file="manual/docbook/index.xml.in" tofile="manual/docbook/index.xml" overwrite="true"/>
<replace file="manual/docbook/index.xml" token="[[version]]" value="${blueVersion}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:15:03
|
Revision: 4171
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4171&view=rev
Author: kunstmusik
Date: 2010-03-21 20:14:57 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
updated for new release
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-core/src/blue/blueConstants.properties
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-21 20:13:19 UTC (rev 4170)
+++ blue/trunk/ChangeLog 2010-03-21 20:14:57 UTC (rev 4171)
@@ -13,7 +13,7 @@
[CHANGE LOG]
>Notes for 2.0.9<
-[released 2010.xx.xx]
+[released 2010.03.21]
Steven Yi-----------------------------------------------------------------------
Modified: blue/trunk/blue-core/src/blue/blueConstants.properties
===================================================================
--- blue/trunk/blue-core/src/blue/blueConstants.properties 2010-03-21 20:13:19 UTC (rev 4170)
+++ blue/trunk/blue-core/src/blue/blueConstants.properties 2010-03-21 20:14:57 UTC (rev 4171)
@@ -1,2 +1,2 @@
-blueReleaseDate=2010.03.14
-blueVersion=2.0.8
+blueReleaseDate=2010.03.21
+blueVersion=2.0.9
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:13:25
|
Revision: 4170
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4170&view=rev
Author: kunstmusik
Date: 2010-03-21 20:13:19 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
RFE 2936569 - Added links to blue manual and csound manual from help menu
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-application/nbproject/project.xml
blue/trunk/blue-application/src/blue/application/Bundle.properties
blue/trunk/blue-application/src/blue/application/layer.xml
Added Paths:
-----------
blue/trunk/blue-application/src/blue/application/BlueManualAction.java
blue/trunk/blue-application/src/blue/application/CsoundManualAction.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-21 20:11:28 UTC (rev 4169)
+++ blue/trunk/ChangeLog 2010-03-21 20:13:19 UTC (rev 4170)
@@ -27,6 +27,9 @@
[new] - Made TrackerObject work with fractional instruments (RFE 2826952)
+ [new] - Added links to blue manual and csound manual from help menu
+ (RFE 2936569)
+
[fix] - Fixed issue with BSB Dropdown Lists when item list changes (items
added/removed) and preset is selected. Preset value is now stored
by uniqueId of dropdown item to prevent issues with storing by
Modified: blue/trunk/blue-application/nbproject/project.xml
===================================================================
--- blue/trunk/blue-application/nbproject/project.xml 2010-03-21 20:11:28 UTC (rev 4169)
+++ blue/trunk/blue-application/nbproject/project.xml 2010-03-21 20:13:19 UTC (rev 4170)
@@ -7,6 +7,14 @@
<suite-component/>
<module-dependencies>
<dependency>
+ <code-name-base>blue.settings</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>com.kunstmusik.blue</code-name-base>
<build-prerequisite/>
<compile-dependency/>
Added: blue/trunk/blue-application/src/blue/application/BlueManualAction.java
===================================================================
--- blue/trunk/blue-application/src/blue/application/BlueManualAction.java (rev 0)
+++ blue/trunk/blue-application/src/blue/application/BlueManualAction.java 2010-03-21 20:13:19 UTC (rev 4170)
@@ -0,0 +1,54 @@
+/*
+ * blue - object composition environment for csound Copyright (c) 2000-2009
+ * Steven Yi (ste...@gm...)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.LIB. If not, write to the Free
+ * Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+package blue.application;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.openide.awt.HtmlBrowser.URLDisplayer;
+import org.openide.util.Exceptions;
+
+public final class BlueManualAction implements ActionListener {
+
+ public void actionPerformed(ActionEvent e) {
+ try {
+ URLDisplayer.getDefault().showURL(new URL(getPath()));
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
+ protected String getPath() {
+ String val = System.getProperty("netbeans.dirs");
+ String[] vals = val.split(File.pathSeparator);
+
+ for (String path : vals) {
+ File f = new File(path + File.separator + "pythonLib");
+ if (f.isDirectory()) {
+ path = path.substring(0, path.lastIndexOf(File.separator));
+ return "file://" + path + File.separator + "/manual/html/index.html";
+ }
+ }
+
+ return null;
+ }
+}
Modified: blue/trunk/blue-application/src/blue/application/Bundle.properties
===================================================================
--- blue/trunk/blue-application/src/blue/application/Bundle.properties 2010-03-21 20:11:28 UTC (rev 4169)
+++ blue/trunk/blue-application/src/blue/application/Bundle.properties 2010-03-21 20:13:19 UTC (rev 4170)
@@ -2,6 +2,8 @@
Actions/Edit/blue-application-MakeDonationAction.instance=Make a &Donation
Actions/Edit/blue-application-ReportBugAction.instance=Report a &Bug
Actions/Edit/blue-application-RequestFeatureAction.instance=Request a &Feature
+CTL_BlueManualAction=&Blue Manual
+CTL_CsoundManualAction=&Csound Manual
CTL_SaveLibrariesAction=Save &Libraries
CTL_MakeDonationAction=Make a &Donation
CTL_ReportBugAction=Report a &Bug
Added: blue/trunk/blue-application/src/blue/application/CsoundManualAction.java
===================================================================
--- blue/trunk/blue-application/src/blue/application/CsoundManualAction.java (rev 0)
+++ blue/trunk/blue-application/src/blue/application/CsoundManualAction.java 2010-03-21 20:13:19 UTC (rev 4170)
@@ -0,0 +1,42 @@
+/*
+ * blue - object composition environment for csound Copyright (c) 2000-2009
+ * Steven Yi (ste...@gm...)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.LIB. If not, write to the Free
+ * Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+package blue.application;
+
+import blue.settings.GeneralSettings;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.openide.awt.HtmlBrowser.URLDisplayer;
+import org.openide.util.Exceptions;
+
+public final class CsoundManualAction implements ActionListener {
+
+ public void actionPerformed(ActionEvent e) {
+ String url = GeneralSettings.getInstance().getCsoundDocRoot()
+ + "index.html";
+
+ try {
+ URLDisplayer.getDefault().showURL(new URL(url));
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+}
Modified: blue/trunk/blue-application/src/blue/application/layer.xml
===================================================================
--- blue/trunk/blue-application/src/blue/application/layer.xml 2010-03-21 20:11:28 UTC (rev 4169)
+++ blue/trunk/blue-application/src/blue/application/layer.xml 2010-03-21 20:13:19 UTC (rev 4170)
@@ -4,6 +4,18 @@
<folder name="Actions">
<file name="GoTo_hidden"/>
<folder name="Application">
+ <file name="blue-application-BlueManualAction.instance">
+ <attr name="delegate" newvalue="blue.application.BlueManualAction"/>
+ <attr name="displayName" bundlevalue="blue.application.Bundle#CTL_BlueManualAction"/>
+ <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+ <attr name="noIconInMenu" boolvalue="false"/>
+ </file>
+ <file name="blue-application-CsoundManualAction.instance">
+ <attr name="delegate" newvalue="blue.application.CsoundManualAction"/>
+ <attr name="displayName" bundlevalue="blue.application.Bundle#CTL_CsoundManualAction"/>
+ <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+ <attr name="noIconInMenu" boolvalue="false"/>
+ </file>
<file name="blue-application-SaveLibrariesAction.instance">
<attr name="SystemFileSystem.localizingBundle" stringvalue="blue.application.Bundle"/>
<attr name="delegate" newvalue="blue.application.SaveLibrariesAction"/>
@@ -67,6 +79,10 @@
</folder>
<file name="GoTo_hidden"/>
<folder name="Help">
+ <file name="blue-application-CsoundManualAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Application/blue-application-CsoundManualAction.instance"/>
+ <attr name="position" intvalue="1077"/>
+ </file>
<file name="blue-application-MakeDonationAction-separatorBefore.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="462"/>
@@ -83,6 +99,14 @@
<attr name="originalFile" stringvalue="Actions/Help/blue-application-RequestFeatureAction.instance"/>
<attr name="position" intvalue="400"/>
</file>
+ <file name="blue-application-BlueManualAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Application/blue-application-BlueManualAction.instance"/>
+ <attr name="position" intvalue="1075"/>
+ </file>
+ <file name="blue-application-BlueManualAction-separatorAfter.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1080"/>
+ </file>
</folder>
<folder name="View">
<file name="Separator1.instance_hidden"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:11:34
|
Revision: 4169
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4169&view=rev
Author: kunstmusik
Date: 2010-03-21 20:11:28 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
cleand up class
Modified Paths:
--------------
blue/trunk/blue-core/src/blue/BlueSystem.java
Modified: blue/trunk/blue-core/src/blue/BlueSystem.java
===================================================================
--- blue/trunk/blue-core/src/blue/BlueSystem.java 2010-03-21 20:11:07 UTC (rev 4168)
+++ blue/trunk/blue-core/src/blue/BlueSystem.java 2010-03-21 20:11:28 UTC (rev 4169)
@@ -14,7 +14,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.ArrayList;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -22,13 +21,10 @@
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
-import blue.soundObject.SoundObject;
import blue.udo.UDOLibrary;
import blue.utility.EnvironmentVars;
import blue.utility.FileUtilities;
import electric.xml.Document;
-import electric.xml.Element;
-import electric.xml.Elements;
import electric.xml.ParseException;
public class BlueSystem {
@@ -38,14 +34,6 @@
private static String userConfigurationDirectory;
- private static Class[] soundObjects;
-
- private static Class[] liveSoundObjects;
-
- private static Class[] noteProcessors;
-
- private static Class[] instruments;
-
private static ResourceBundle systemMessages;
private static File currentProjectDirectory;
@@ -76,17 +64,17 @@
setLocale();
System.out.println("\n> loading classes from registry");
- try {
+// try {
// Document doc = new Document(new File(getConfDir() + File.separator
// + "registry.xml"));
- System.out.println("> using registry file: " + getConfDir()
- + File.separator + "registry.xml");
+// System.out.println("> using registry file: " + getConfDir()
+// + File.separator + "registry.xml");
// initializePlugins(doc);
- } catch (Exception e) {
- System.err.println("[ERROR] - in loading from registry");
- }
+// } catch (Exception e) {
+// System.err.println("[ERROR] - in loading from registry");
+// }
// isInitialized = true;
}
@@ -104,34 +92,7 @@
}
}
- private static void initializePlugins(Document doc) {
- setupSoundObjects(doc);
- noteProcessors = loadClassesFromRegistry(doc, "noteProcessor");
- instruments = loadClassesFromRegistry(doc, "instrument");
-// pluginLoader = new PluginClassLoader();
-//
-// pluginLoader.loadPlugins();
-
-// soundObjects = mergeClassArrays(soundObjects, pluginLoader
-// .getSoundObjectClasses());
-//
-// noteProcessors = mergeClassArrays(noteProcessors, pluginLoader
-// .getNoteProcessorClasses());
-//
-// instruments = mergeClassArrays(instruments, pluginLoader
-// .getInstrumentClasses());
- }
-
- private static Class[] mergeClassArrays(Class[] a, Class[] b) {
- Class[] merged = new Class[a.length + b.length];
-
- System.arraycopy(a, 0, merged, 0, a.length);
- System.arraycopy(b, 0, merged, a.length, b.length);
-
- return merged;
- }
-
/**
* Initialize Program Root Directory
*/
@@ -182,87 +143,7 @@
}
}
- public static void setupSoundObjects(Document doc) {
- ArrayList classes = new ArrayList();
- ArrayList liveClasses = new ArrayList();
- try {
- Element root = doc.getRoot();
- Element sObjectsRoot = root.getElement("soundObjects");
- Elements temp = sObjectsRoot.getElements("soundObject");
- String className;
-
- while (temp.hasMoreElements()) {
- Element elem = temp.next();
- className = elem.getText().getString();
- try {
- Class tempClass = Class.forName(className);
- classes.add(tempClass);
- System.out.println(">> found soundObject type: "
- + className);
-
- if (elem.getAttributeValue("live").equals("true")) {
- liveClasses.add(tempClass);
-
- System.out
- .println(" -class added to live soundObjects\n");
- }
-
- } catch (Exception e) {
- System.out.println(">> failed to load soundObject type: "
- + className);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- soundObjects = new Class[classes.size()];
-
- for (int i = 0; i < soundObjects.length; i++) {
- soundObjects[i] = (Class) classes.get(i);
- }
-
- liveSoundObjects = new Class[liveClasses.size()];
-
- for (int i = 0; i < liveSoundObjects.length; i++) {
- liveSoundObjects[i] = (Class) liveClasses.get(i);
- }
- }
-
- public static Class[] loadClassesFromRegistry(Document doc, String nodeType) {
- ArrayList classes = new ArrayList();
-
- try {
- Element root = doc.getRoot();
- Element sObjectsRoot = root.getElement(nodeType + "s");
- Elements temp = sObjectsRoot.getElements(nodeType);
- String className;
-
- while (temp.hasMoreElements()) {
- className = temp.next().getText().getString();
- try {
- classes.add(Class.forName(className));
- System.out.println(">> found " + nodeType + " type: "
- + className);
- } catch (Exception e) {
- System.out.println(">> failed to load " + nodeType
- + " type: " + className);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- Class[] classArray = new Class[classes.size()];
-
- for (int i = 0; i < classArray.length; i++) {
- classArray[i] = (Class) classes.get(i);
- }
-
- return classArray;
- }
-
/** ************************************************************** */
public static String getShortClassName(String fullClassName) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 20:11:15
|
Revision: 4168
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4168&view=rev
Author: kunstmusik
Date: 2010-03-21 20:11:07 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
added info for Generics
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/gui/FileTree.java
Modified: blue/trunk/blue-ui-core/src/blue/gui/FileTree.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/gui/FileTree.java 2010-03-21 16:21:44 UTC (rev 4167)
+++ blue/trunk/blue-ui-core/src/blue/gui/FileTree.java 2010-03-21 20:11:07 UTC (rev 4168)
@@ -228,7 +228,7 @@
// populate the selected dir and all its parents
flcRenderer.setSelectedDir(dir);
- Vector parentList = new Vector();
+ Vector<File> parentList = new Vector<File>();
File tempDir = dir;
parentList.add(dir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 16:21:51
|
Revision: 4167
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4167&view=rev
Author: kunstmusik
Date: 2010-03-21 16:21:44 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
RFE 2826952 - Made Tracker work with fractional instrument numbers
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-core/src/blue/soundObject/tracker/Track.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-21 15:43:38 UTC (rev 4166)
+++ blue/trunk/ChangeLog 2010-03-21 16:21:44 UTC (rev 4167)
@@ -25,6 +25,8 @@
[new] - Readded "Script" menu with option to reinitialize Jython interpreter
to address issue in Bug 2789770
+ [new] - Made TrackerObject work with fractional instruments (RFE 2826952)
+
[fix] - Fixed issue with BSB Dropdown Lists when item list changes (items
added/removed) and preset is selected. Preset value is now stored
by uniqueId of dropdown item to prevent issues with storing by
Modified: blue/trunk/blue-core/src/blue/soundObject/tracker/Track.java
===================================================================
--- blue/trunk/blue-core/src/blue/soundObject/tracker/Track.java 2010-03-21 15:43:38 UTC (rev 4166)
+++ blue/trunk/blue-core/src/blue/soundObject/tracker/Track.java 2010-03-21 16:21:44 UTC (rev 4167)
@@ -238,7 +238,7 @@
String instrId = getInstrumentId();
try {
- Integer.parseInt(instrId);
+ Float.parseFloat(instrId);
} catch (NumberFormatException nfe) {
instrId = "\"" + instrId + "\"";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 15:43:44
|
Revision: 4166
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4166&view=rev
Author: kunstmusik
Date: 2010-03-21 15:43:38 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Bug 2017191 - Fixed issue with BSB Dropdown Lists when item list changes (items added/removed) and preset is selected. Preset value is now stored by uniqueId of dropdown item to prevent issues with storing by item index. Older presets that stored by index still work. New presets saved will save by uniqueId. One can update an older preset to use the new uniqueId system by selecting the preset and immediately choosing update for the preset.
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdown.java
blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItem.java
blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItemList.java
blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/BSBDropdownView.java
blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/DropdownItemEditorDialog.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/ChangeLog 2010-03-21 15:43:38 UTC (rev 4166)
@@ -25,7 +25,15 @@
[new] - Readded "Script" menu with option to reinitialize Jython interpreter
to address issue in Bug 2789770
+ [fix] - Fixed issue with BSB Dropdown Lists when item list changes (items
+ added/removed) and preset is selected. Preset value is now stored
+ by uniqueId of dropdown item to prevent issues with storing by
+ item index. Older presets that stored by index still work. New
+ presets saved will save by uniqueId. One can update an older preset
+ to use the new uniqueId system by selecting the preset and
+ immediately choosing update for the preset. (Bug 2017191)
+
>Notes for 2.0.8<
[released 2010.03.14]
Modified: blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdown.java
===================================================================
--- blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdown.java 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdown.java 2010-03-21 15:43:38 UTC (rev 4166)
@@ -17,11 +17,11 @@
* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307 USA
*/
-
package blue.orchestra.blueSynthBuilder;
//import blue.orchestra.editor.blueSynthBuilder.BSBDropdownView;
//import blue.orchestra.editor.blueSynthBuilder.BSBObjectView;
+import blue.orchestra.blueSynthBuilder.BSBDropdownItem;
import blue.utility.XMLUtilities;
import electric.xml.Element;
import electric.xml.Elements;
@@ -51,11 +51,9 @@
String nodeName = node.getName();
if (nodeName.equals("bsbDropdownItemList")) {
- dropDown
- .setDropdownItems(BSBDropdownItemList.loadFromXML(node));
+ dropDown.setDropdownItems(BSBDropdownItemList.loadFromXML(node));
} else if (nodeName.equals("selectedIndex")) {
- dropDown.setSelectedIndex(Integer
- .parseInt(node.getTextString()));
+ dropDown.setSelectedIndex(Integer.parseInt(node.getTextString()));
} else if (nodeName.equals("randomizable")) {
dropDown.randomizable = XMLUtilities.readBoolean(node);
}
@@ -91,8 +89,7 @@
* @see blue.orchestra.blueSynthBuilder.BSBObject#setupForCompilation(blue.orchestra.blueSynthBuilder.BSBCompilationUnit)
*/
public void setupForCompilation(BSBCompilationUnit compilationUnit) {
- BSBDropdownItem item = (BSBDropdownItem) dropdownItems
- .get(selectedIndex);
+ BSBDropdownItem item = (BSBDropdownItem) dropdownItems.get(selectedIndex);
String replaceVal = item.getValue();
compilationUnit.addReplacementValue(objectName, replaceVal);
@@ -128,7 +125,11 @@
* The selectedIndex to set.
*/
public void setSelectedIndex(int selectedIndex) {
- this.selectedIndex = selectedIndex;
+ int tempIndex = selectedIndex;
+ if (tempIndex >= dropdownItems.size()) {
+ tempIndex = dropdownItems.size() - 1;
+ }
+ this.selectedIndex = tempIndex;
}
/*
@@ -137,7 +138,8 @@
* @see blue.orchestra.blueSynthBuilder.BSBObject#getPresetValue()
*/
public String getPresetValue() {
- return Integer.toString(getSelectedIndex());
+ BSBDropdownItem item = (BSBDropdownItem) dropdownItems.get(selectedIndex);
+ return "id:" + item.getUniqueId();
}
/*
@@ -146,11 +148,32 @@
* @see blue.orchestra.blueSynthBuilder.BSBObject#setPresetValue(java.lang.String)
*/
public void setPresetValue(String val) {
- setSelectedIndex(Integer.parseInt(val));
+ if (val.startsWith("id:")) {
+ String uniqueId = val.substring(3);
+ int index = getIndexOfItemByUniqueId(uniqueId);
+
+ if (index >= 0) {
+ setSelectedIndex(index);
+ }
+ } else {
+ setSelectedIndex(Integer.parseInt(val));
+ }
}
+ protected int getIndexOfItemByUniqueId(String uniqueId) {
+ if (uniqueId == null) {
+ return -1;
+ }
+ for (int i = 0; i < dropdownItems.size(); i++) {
+ BSBDropdownItem item = dropdownItems.get(i);
+ if (uniqueId.equals(item.getUniqueId())) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
/* RANDOMIZABLE METHODS */
-
public boolean isRandomizable() {
return randomizable;
}
@@ -176,4 +199,4 @@
this.randomizable = randomizable;
fireBSBObjectChanged();
}
-}
\ No newline at end of file
+}
Modified: blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItem.java
===================================================================
--- blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItem.java 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItem.java 2010-03-21 15:43:38 UTC (rev 4166)
@@ -24,6 +24,7 @@
import electric.xml.Element;
import electric.xml.Elements;
+import java.rmi.dgc.VMID;
/**
* @author Steven Yi
@@ -34,9 +35,20 @@
String value = "value";
+ private String uniqueId;
+
+ public BSBDropdownItem() {
+ this.uniqueId = Integer.toString(new VMID().hashCode());
+ }
+
public static BSBDropdownItem loadFromXML(Element data) {
BSBDropdownItem item = new BSBDropdownItem();
+ String uniqueId = data.getAttributeValue("uniqueId");
+ if (uniqueId != null && uniqueId.length() > 0) {
+ item.uniqueId = uniqueId;
+ }
+
Elements nodes = data.getElements();
while (nodes.hasMoreElements()) {
@@ -56,12 +68,18 @@
public Element saveAsXML() {
Element retVal = new Element("bsbDropdownItem");
+ retVal.setAttribute("uniqueId", uniqueId);
+
retVal.addElement("name").setText(this.getName());
retVal.addElement("value").setText(this.getValue());
return retVal;
}
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
/**
* @return Returns the name.
*/
Modified: blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItemList.java
===================================================================
--- blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItemList.java 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/blue-core/src/blue/orchestra/blueSynthBuilder/BSBDropdownItemList.java 2010-03-21 15:43:38 UTC (rev 4166)
@@ -28,7 +28,7 @@
/**
* @author steven
*/
-public class BSBDropdownItemList extends ArrayList {
+public class BSBDropdownItemList extends ArrayList<BSBDropdownItem> {
public static BSBDropdownItemList loadFromXML(Element data) {
BSBDropdownItemList list = new BSBDropdownItemList();
Modified: blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/BSBDropdownView.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/BSBDropdownView.java 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/BSBDropdownView.java 2010-03-21 15:43:38 UTC (rev 4166)
@@ -187,7 +187,7 @@
int size = dropdown.getDropdownItems().size();
int selectedIndex = dropdown.getSelectedIndex();
- if (selectedIndex > size) {
+ if (selectedIndex >= size) {
dropdown.setSelectedIndex(size - 1);
}
Modified: blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/DropdownItemEditorDialog.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/DropdownItemEditorDialog.java 2010-03-21 15:42:53 UTC (rev 4165)
+++ blue/trunk/blue-ui-core/src/blue/orchestra/editor/blueSynthBuilder/DropdownItemEditorDialog.java 2010-03-21 15:43:38 UTC (rev 4166)
@@ -220,7 +220,7 @@
public void pushUpItem(int index) {
if (index > 0) {
- Object a = items.remove(index - 1);
+ BSBDropdownItem a = items.remove(index - 1);
items.add(index, a);
this.fireTableRowsUpdated(index - 1, index);
}
@@ -228,7 +228,7 @@
public void pushDownItem(int index) {
if (index < items.size() - 1) {
- Object a = items.remove(index + 1);
+ BSBDropdownItem a = items.remove(index + 1);
items.add(index, a);
this.fireTableRowsUpdated(index, index + 1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 15:43:00
|
Revision: 4165
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4165&view=rev
Author: kunstmusik
Date: 2010-03-21 15:42:53 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
removed unnecessary cast
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/components/lines/LineUtils.java
Modified: blue/trunk/blue-ui-core/src/blue/components/lines/LineUtils.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/components/lines/LineUtils.java 2010-03-21 15:42:34 UTC (rev 4164)
+++ blue/trunk/blue-ui-core/src/blue/components/lines/LineUtils.java 2010-03-21 15:42:53 UTC (rev 4165)
@@ -172,7 +172,7 @@
if (resolution > 0.0f) {
// TODO - check if IEEERemainder is what is desired here
- double newVal = (double) (retVal - MathUtils.remainder(retVal,
+ double newVal = (retVal - MathUtils.remainder(retVal,
resolution));
double nextVal = newVal + resolution;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 15:42:42
|
Revision: 4164
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4164&view=rev
Author: kunstmusik
Date: 2010-03-21 15:42:34 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
added info for Generics
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/gui/DialogUtil.java
blue/trunk/blue-ui-core/src/blue/gui/FileTree.java
Modified: blue/trunk/blue-ui-core/src/blue/gui/DialogUtil.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/gui/DialogUtil.java 2010-03-21 03:01:14 UTC (rev 4163)
+++ blue/trunk/blue-ui-core/src/blue/gui/DialogUtil.java 2010-03-21 15:42:34 UTC (rev 4164)
@@ -35,7 +35,7 @@
private static int counter = 0;
- private static ArrayList dialogs = new ArrayList();
+ private static ArrayList<JDialog> dialogs = new ArrayList<JDialog>();
private static JMenuBar menuBar = null;
@@ -52,8 +52,8 @@
if (dialogs == null) {
return;
}
- for (Iterator iter = dialogs.iterator(); iter.hasNext();) {
- JDialog dialog = (JDialog) iter.next();
+ for (Iterator<JDialog> iter = dialogs.iterator(); iter.hasNext();) {
+ JDialog dialog = iter.next();
setupActions(dialog, menuBar);
}
Modified: blue/trunk/blue-ui-core/src/blue/gui/FileTree.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/gui/FileTree.java 2010-03-21 03:01:14 UTC (rev 4163)
+++ blue/trunk/blue-ui-core/src/blue/gui/FileTree.java 2010-03-21 15:42:34 UTC (rev 4164)
@@ -83,7 +83,7 @@
public class FileTree extends JComponent {
private static final Comparator c = new AlphabeticalFileComparator();
- private ArrayList listeners = new ArrayList();
+ private ArrayList<FileTreeListener> listeners = new ArrayList<FileTreeListener>();
JList directoryList = new JList();
@@ -212,7 +212,7 @@
protected void fireFileSelected(File f) {
for (int i = 0; i < listeners.size(); i++) {
- FileTreeListener ftl = (FileTreeListener) listeners.get(i);
+ FileTreeListener ftl = listeners.get(i);
ftl.fileSelected(f);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-21 03:01:21
|
Revision: 4163
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4163&view=rev
Author: kunstmusik
Date: 2010-03-21 03:01:14 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Readded "Script" menu with option to reinitialize Jython interpreter to address issue in Bug 2789770
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-ui-core/src/blue/ui/core/Bundle.properties
blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml
Added Paths:
-----------
blue/trunk/blue-ui-core/src/blue/ui/core/script/
blue/trunk/blue-ui-core/src/blue/ui/core/script/Bundle.properties
blue/trunk/blue-ui-core/src/blue/ui/core/script/ReinitializeJythonAction.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-20 23:48:39 UTC (rev 4162)
+++ blue/trunk/ChangeLog 2010-03-21 03:01:14 UTC (rev 4163)
@@ -22,7 +22,10 @@
[new] - Added "Save Copy" button to Frozen SoundObject's editor to allow
saving a copy of the the frozen soundfile (RFE 2970189)
+ [new] - Readded "Script" menu with option to reinitialize Jython interpreter
+ to address issue in Bug 2789770
+
>Notes for 2.0.8<
[released 2010.03.14]
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/Bundle.properties
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/Bundle.properties 2010-03-20 23:48:39 UTC (rev 4162)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/Bundle.properties 2010-03-21 03:01:14 UTC (rev 4163)
@@ -32,3 +32,4 @@
CTL_MainToolbarAction=Main Tool Bar
OpenIDE-Module-Name=blue-ui-core
Menu/Project=&Project
+Menu/Script=&Script
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml 2010-03-20 23:48:39 UTC (rev 4162)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/layer.xml 2010-03-21 03:01:14 UTC (rev 4163)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
+ <attr name="Menu\Script\position" intvalue="1100"/>
<attr name="Windows2\Components\output.settings\position" intvalue="600"/>
<attr name="Windows2\Components\properties.settings\position" intvalue="700"/>
<folder name="Actions">
@@ -81,6 +82,14 @@
<attr name="delegate" newvalue="blue.ui.core.project.UseCsoundApiAction"/>
</file>
</folder>
+ <folder name="Script">
+ <file name="blue-ui-core-script-ReinitializeJythonAction.instance">
+ <attr name="delegate" newvalue="blue.ui.core.script.ReinitializeJythonAction"/>
+ <attr name="displayName" bundlevalue="blue.ui.core.script.Bundle#CTL_ReinitializeJythonAction"/>
+ <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+ <attr name="noIconInMenu" boolvalue="false"/>
+ </file>
+ </folder>
<folder name="Tools">
<file name="blue-ui-core-mixer-EffectsLibraryAction.instance">
<attr name="SystemFileSystem.localizingBundle" stringvalue="blue.ui.core.Bundle"/>
@@ -279,6 +288,7 @@
<attr name="position" intvalue="400"/>
</file>
</folder>
+
<folder name="Tools">
<attr name="blue-projects-actions-OpenProjectAction.shadow/blue-ui-core-tools-OpenSoundFontViewerAction.shadow" boolvalue="true"/>
<attr name="blue-ui-core-tools-OpenSoundFontViewerAction.shadow/blue-projects-actions-CloseProjectAction-separatorBefore.instance" boolvalue="true"/>
@@ -306,6 +316,16 @@
<attr name="position" intvalue="-50"/>
</file>
</folder>
+
+ <folder name="Script">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="blue.ui.core.Bundle"/>
+
+ <file name="blue-ui-core-script-ReinitializeJythonAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Script/blue-ui-core-script-ReinitializeJythonAction.instance"/>
+ <attr name="position" intvalue="110"/>
+ </file>
+ </folder>
+
<folder name="Window">
<file name="Output_hidden"/>
<file name="SoundObjectEditorAction.shadow">
Added: blue/trunk/blue-ui-core/src/blue/ui/core/script/Bundle.properties
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/script/Bundle.properties (rev 0)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/script/Bundle.properties 2010-03-21 03:01:14 UTC (rev 4163)
@@ -0,0 +1 @@
+CTL_ReinitializeJythonAction=Reinitialize &Jython Interpreter
Added: blue/trunk/blue-ui-core/src/blue/ui/core/script/ReinitializeJythonAction.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/script/ReinitializeJythonAction.java (rev 0)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/script/ReinitializeJythonAction.java 2010-03-21 03:01:14 UTC (rev 4163)
@@ -0,0 +1,31 @@
+/*
+ * blue - object composition environment for csound Copyright (c) 2000-2009
+ * Steven Yi (ste...@gm...)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.LIB. If not, write to the Free
+ * Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+package blue.ui.core.script;
+
+import blue.scripting.PythonProxy;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public final class ReinitializeJythonAction implements ActionListener {
+
+ public void actionPerformed(ActionEvent e) {
+ PythonProxy.reinitialize();
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-20 23:48:45
|
Revision: 4162
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4162&view=rev
Author: kunstmusik
Date: 2010-03-20 23:48:39 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
Added "Save Copy" button to Frozen SoundObject's editor to allow saving a copy of the the frozen soundfile (RFE 2970189)
Modified Paths:
--------------
blue/trunk/ChangeLog
blue/trunk/blue-ui-core/src/blue/soundObject/editor/FrozenSoundObjectEditor.java
Modified: blue/trunk/ChangeLog
===================================================================
--- blue/trunk/ChangeLog 2010-03-20 23:48:28 UTC (rev 4161)
+++ blue/trunk/ChangeLog 2010-03-20 23:48:39 UTC (rev 4162)
@@ -12,6 +12,17 @@
[CHANGE LOG]
+>Notes for 2.0.9<
+[released 2010.xx.xx]
+
+Steven Yi-----------------------------------------------------------------------
+
+blue
+
+ [new] - Added "Save Copy" button to Frozen SoundObject's editor to allow
+ saving a copy of the the frozen soundfile (RFE 2970189)
+
+
>Notes for 2.0.8<
[released 2010.03.14]
Modified: blue/trunk/blue-ui-core/src/blue/soundObject/editor/FrozenSoundObjectEditor.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/soundObject/editor/FrozenSoundObjectEditor.java 2010-03-20 23:48:28 UTC (rev 4161)
+++ blue/trunk/blue-ui-core/src/blue/soundObject/editor/FrozenSoundObjectEditor.java 2010-03-20 23:48:39 UTC (rev 4162)
@@ -17,10 +17,11 @@
* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307 USA
*/
-
package blue.soundObject.editor;
import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
import javax.swing.JLabel;
@@ -28,6 +29,19 @@
import blue.gui.LabelledItemPanel;
import blue.soundObject.FrozenSoundObject;
import blue.soundObject.SoundObject;
+import blue.ui.utilities.FileChooserManager;
+import blue.utility.FileUtilities;
+import java.awt.FlowLayout;
+import java.awt.event.ActionListener;
+import java.io.File;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.Exceptions;
+import org.openide.windows.WindowManager;
/**
* @author steven
@@ -35,17 +49,29 @@
*/
public class FrozenSoundObjectEditor extends SoundObjectEditor {
- FrozenSoundObject fso;
+ private FrozenSoundObject fso;
- JLabel frozenObjectName = new JLabel();
+ private JLabel frozenObjectName = new JLabel();
- JLabel frozenObjectType = new JLabel();
+ private JLabel frozenObjectType = new JLabel();
- JLabel frozenWaveFileName = new JLabel();
+ private JLabel frozenWaveFileName = new JLabel();
- JLabel frozenSoundObjectDuration = new JLabel();
+ private JLabel frozenSoundObjectDuration = new JLabel();
public FrozenSoundObjectEditor() {
+ JButton button = new JButton("Save Copy");
+ JPanel panel = new JPanel();
+ panel.setLayout(new FlowLayout(FlowLayout.LEFT));
+ panel.add(frozenWaveFileName);
+ panel.add(button);
+ button.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ saveCopy();
+ }
+ });
+
LabelledItemPanel itemPanel = new LabelledItemPanel();
this.setLayout(new BorderLayout());
@@ -54,17 +80,24 @@
itemPanel.addItem(BlueSystem.getString("frozenSoundObject.type") + " ",
frozenObjectType);
itemPanel.addItem(BlueSystem.getString("frozenSoundObject.waveName")
- + " ", frozenWaveFileName);
+ + " ", panel);
itemPanel.addItem(BlueSystem.getString("frozenSoundObject.duration")
+ " ", frozenSoundObjectDuration);
- this.add(itemPanel, BorderLayout.CENTER);
+ JScrollPane jsp = new JScrollPane(itemPanel);
+ jsp.setBorder(null);
+
+ this.add(jsp, BorderLayout.CENTER);
+
+ final FileChooserManager fcm = FileChooserManager.getDefault();
+ fcm.setMultiSelectionEnabled(this, false);
+ fcm.setDialogTitle(this, "Save Copy of Frozen Soundfile");
}
public void editSoundObject(SoundObject sObj) {
if (sObj == null
|| !sObj.getClass().getName().equals(
- "blue.soundObject.FrozenSoundObject")) {
+ "blue.soundObject.FrozenSoundObject")) {
fso = null;
return;
}
@@ -72,14 +105,75 @@
frozenObjectName.setText(fso.getFrozenSoundObject().getName());
- frozenObjectType.setText(fso.getFrozenSoundObject().getClass()
- .getName());
+ frozenObjectType.setText(fso.getFrozenSoundObject().getClass().getName());
frozenWaveFileName.setText(fso.getFrozenWaveFileName());
- frozenSoundObjectDuration.setText(Float.toString(fso
- .getFrozenSoundObject().getSubjectiveDuration()));
+ frozenSoundObjectDuration.setText(Float.toString(fso.
+ getFrozenSoundObject().getSubjectiveDuration()));
}
-}
\ No newline at end of file
+ protected void saveCopy() {
+ File f = BlueSystem.findFile(fso.getFrozenWaveFileName());
+
+ if (f == null) {
+ NotifyDescriptor descriptor = new NotifyDescriptor.Message(
+ "Could not locate frozen file:\n\n" + fso.
+ getFrozenWaveFileName(),
+ NotifyDescriptor.ERROR_MESSAGE);
+
+ DialogDisplayer.getDefault().notify(descriptor);
+ return;
+ }
+
+ final FileChooserManager fcm = FileChooserManager.getDefault();
+
+ fcm.setCurrentDirectory(this, BlueSystem.getCurrentProjectDirectory());
+ int retVal = fcm.showSaveDialog(this, WindowManager.getDefault().
+ getMainWindow());
+
+ if (retVal == JFileChooser.APPROVE_OPTION) {
+ File dest = fcm.getSelectedFile(this);
+
+ if (dest.exists()) {
+
+ if (dest.isDirectory()) {
+ NotifyDescriptor descriptor = new NotifyDescriptor.Message(
+ "Destination is a directory.",
+ NotifyDescriptor.ERROR_MESSAGE);
+
+ DialogDisplayer.getDefault().notify(descriptor);
+ return;
+ }
+
+ if (dest.getName().startsWith("freeze")) {
+ NotifyDescriptor descriptor = new NotifyDescriptor.Message(
+ "Can not overwrite freeze files.",
+ NotifyDescriptor.ERROR_MESSAGE);
+
+ DialogDisplayer.getDefault().notify(descriptor);
+ return;
+ }
+
+
+ NotifyDescriptor descriptor = new NotifyDescriptor.Confirmation("Overwrite file " + dest.
+ getName() + "?",
+ NotifyDescriptor.OK_CANCEL_OPTION);
+ Object conf = DialogDisplayer.getDefault().notify(descriptor);
+
+ if (!NotifyDescriptor.OK_OPTION.equals(conf)) {
+ return;
+ }
+ }
+
+ try {
+ FileUtilities.copyFile(f, dest);
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-20 23:48:35
|
Revision: 4161
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4161&view=rev
Author: kunstmusik
Date: 2010-03-20 23:48:28 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
added ability to set current directory in addition to setting current file
Modified Paths:
--------------
blue/trunk/blue-ui-utilities/src/blue/ui/utilities/FileChooserManager.java
Modified: blue/trunk/blue-ui-utilities/src/blue/ui/utilities/FileChooserManager.java
===================================================================
--- blue/trunk/blue-ui-utilities/src/blue/ui/utilities/FileChooserManager.java 2010-03-19 04:23:10 UTC (rev 4160)
+++ blue/trunk/blue-ui-utilities/src/blue/ui/utilities/FileChooserManager.java 2010-03-20 23:48:28 UTC (rev 4161)
@@ -41,9 +41,16 @@
public void setSelectedFile(Object fileChooserId, File f) {
DialogInfoSet temp = getDialogInfoSet(fileChooserId);
+ temp.currentDirectory = null;
temp.selectedFile = f;
}
+ public void setCurrentDirectory(Object fileChooserId, File f) {
+ DialogInfoSet temp = getDialogInfoSet(fileChooserId);
+ temp.selectedFile = null;
+ temp.currentDirectory = f;
+ }
+
public void setDialogTitle(Object fileChooserId, String title) {
DialogInfoSet temp = getDialogInfoSet(fileChooserId);
temp.dialogTitle = title;
@@ -64,7 +71,14 @@
FileFilter f = temp.filters.get(i);
swingFileChooser.addChoosableFileFilter(f);
}
- swingFileChooser.setSelectedFile(temp.selectedFile);
+
+ if(temp.selectedFile != null) {
+ swingFileChooser.setSelectedFile(temp.selectedFile);
+ }
+ if(temp.currentDirectory != null) {
+ swingFileChooser.setCurrentDirectory(temp.currentDirectory);
+ }
+
swingFileChooser.setDialogTitle(temp.dialogTitle);
swingFileChooser.setMultiSelectionEnabled(temp.isMultiSelect);
@@ -93,7 +107,14 @@
FileFilter f = temp.filters.get(i);
swingFileChooser.addChoosableFileFilter(f);
}
- swingFileChooser.setSelectedFile(temp.selectedFile);
+
+ if(temp.selectedFile != null) {
+ swingFileChooser.setSelectedFile(temp.selectedFile);
+ }
+ if(temp.currentDirectory != null) {
+ swingFileChooser.setCurrentDirectory(temp.currentDirectory);
+ }
+
swingFileChooser.setDialogTitle(temp.dialogTitle);
swingFileChooser.setMultiSelectionEnabled(temp.isMultiSelect);
@@ -172,6 +193,8 @@
File selectedFile;
+ File currentDirectory;
+
File[] selectedFiles;
String dialogTitle = "Select File";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-19 04:23:17
|
Revision: 4160
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4160&view=rev
Author: kunstmusik
Date: 2010-03-19 04:23:10 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
renamed "IDE Log" to "blue Application Log"
Added Paths:
-----------
blue/trunk/branding/core/core.jar/org/netbeans/core/actions/
blue/trunk/branding/core/core.jar/org/netbeans/core/actions/Bundle.properties
Added: blue/trunk/branding/core/core.jar/org/netbeans/core/actions/Bundle.properties
===================================================================
--- blue/trunk/branding/core/core.jar/org/netbeans/core/actions/Bundle.properties (rev 0)
+++ blue/trunk/branding/core/core.jar/org/netbeans/core/actions/Bundle.properties 2010-03-19 04:23:10 UTC (rev 4160)
@@ -0,0 +1,2 @@
+MSG_LogTab_name=blue Application &Log
+MSG_ShortLogTab_name=blue Application Log
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kun...@us...> - 2010-03-16 23:58:11
|
Revision: 4159
http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4159&view=rev
Author: kunstmusik
Date: 2010-03-16 23:58:04 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
updated to render with new blue website link
Modified Paths:
--------------
blue/trunk/blue-ui-core/src/blue/ui/core/render/CSDRender.java
Modified: blue/trunk/blue-ui-core/src/blue/ui/core/render/CSDRender.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/render/CSDRender.java 2010-03-15 02:02:23 UTC (rev 4158)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/render/CSDRender.java 2010-03-16 23:58:04 UTC (rev 4159)
@@ -502,7 +502,7 @@
score.append("; ").append(notes).append("\n");
score.append(";\n");
score.append("; Generated by blue ").append(BlueConstants.getVersion()).
- append(" (http://csounds.com/stevenyi/blue/index.html)\n");
+ append(" (http://blue.kunstmusik.com)\n");
score.append(";\n\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|