diff --git a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate index 074c45a..48bf935 100644 Binary files a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate and b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Source/GlobalEditor.cpp b/Source/GlobalEditor.cpp index 95ca368..58d2654 100644 --- a/Source/GlobalEditor.cpp +++ b/Source/GlobalEditor.cpp @@ -37,25 +37,25 @@ public: MidiMonitor(SysexComm *sysexComm) { midi = sysexComm; } - + void paint(Graphics &g) { if ( ! (midi->isInputActive() || midi->isOutputActive() ) ) return; - + /*g.setColour(DXLookNFeel::lightBackground); g.fillRoundedRectangle(0, 0, getWidth(), getHeight(), 3); */ g.setColour(Colours::white); // g.drawSingleLineText("DX7 ACT ", 0, 13); - + Image myStrip = ImageCache::getFromMemory(BinaryData::Light_14x14_png, BinaryData::Light_14x14_pngSize); - + if ( midi->isInputActive() ) { g.drawSingleLineText("DX7 IN", 17,14); g.drawImage(myStrip, 0, 3, 14, 14, 0, midi->inActivity ? 14 : 0, 14, 14); midi->inActivity = false; } - + if ( midi->isOutputActive() ) { g.drawSingleLineText("DX7 OUT", 17, 28); g.drawImage(myStrip, 0, 17, 14, 14, 0, midi->outActivity ? 14 : 0, 14, 14); @@ -258,7 +258,7 @@ GlobalEditor::GlobalEditor () lfoType->setImage(ImageCache::getFromMemory(BinaryData::LFO_36_26_png, BinaryData::LFO_36_26_pngSize)); programs = programSelector; - + //[/Constructor] } @@ -583,11 +583,11 @@ void GlobalEditor::bind(DexedAudioProcessor *parent) { algoDisplay->algo = &(parent->data[134]); pitchEnvDisplay->pvalues = &(parent->data[126]); processor = parent; - + midiMonitor = new MidiMonitor(&(processor->sysexComm)); addAndMakeVisible(midiMonitor); midiMonitor->setBounds(155, 21, 80, 80); - + repaint(); } diff --git a/Source/GlobalEditor.h b/Source/GlobalEditor.h index d54642f..d270aa6 100644 --- a/Source/GlobalEditor.h +++ b/Source/GlobalEditor.h @@ -63,7 +63,7 @@ public: void setMonoState(bool state); ProgramSelector *programs; - + ScopedPointer midiMonitor; //[/UserMethods] diff --git a/Source/ParamDialog.cpp b/Source/ParamDialog.cpp index 12bffd4..0c51929 100644 --- a/Source/ParamDialog.cpp +++ b/Source/ParamDialog.cpp @@ -127,49 +127,49 @@ void ParamDialog::paint (Graphics& g) g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("Pitch Bend Range"), - 20, 18, 276, 23, + 20, 16, 276, 23, Justification::centredLeft, true); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("Pitch Bend Step"), - 20, 58, 276, 23, + 20, 56, 276, 23, Justification::centredLeft, true); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("DX7 In"), - 27, 221, 131, 23, + 20, 224, 131, 23, Justification::centredLeft, true); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("DX7 Out"), - 27, 261, 131, 23, + 20, 264, 131, 23, Justification::centredLeft, true); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("DX7 Channel"), - 27, 306, 245, 23, + 20, 304, 245, 23, Justification::centredLeft, true); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("Engine Resolution"), - 22, 154, 276, 23, + 20, 156, 276, 23, Justification::centredLeft, true); g.setColour (Colours::black); g.fillRect (22, 138, 306, 1); g.setColour (Colours::black); - g.fillRect (22, 194, 306, 1); + g.fillRect (22, 195, 306, 1); g.setColour (Colours::white); g.setFont (Font (15.00f, Font::plain)); g.drawText (TRANS("Show Keyboard"), - 19, 101, 276, 23, + 20, 96, 276, 23, Justification::centredLeft, true); //[UserPaint] Add your own custom painting code here.. @@ -183,7 +183,7 @@ void ParamDialog::resized() sysexIn->setBounds (104, 224, 224, 24); sysexOut->setBounds (104, 264, 224, 24); sysexChl->setBounds (264, 304, 72, 24); - engineReso->setBounds (160, 152, 168, 24); + engineReso->setBounds (160, 156, 168, 24); showKeyboard->setBounds (264, 96, 56, 24); //[UserResized] Add your own custom resize handling here.. //[/UserResized] @@ -294,21 +294,21 @@ BEGIN_JUCER_METADATA snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330" fixedSize="1" initialWidth="350" initialHeight="350"> - - - - - - - - +