diff --git a/data/themes/default/style.css b/data/themes/default/style.css index d8a64ee71..8e18dd9a4 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -583,6 +583,14 @@ opl2instrumentView knob { qproperty-lineWidth: 2; } +sidInstrumentView knob { + color: rgb(175,175,175); + qproperty-outerColor: rgb( 255,255,255 ); + qproperty-innerRadius: 2; + qproperty-outerRadius: 8; + qproperty-lineWidth: 2; +} + /* palette information - each colour definition must be on a single line, and the line must begin with "palette:", with no leading whitespace * colour codes MUST be of the form #RRGGBB */ diff --git a/plugins/sid/3off.png b/plugins/sid/3off.png index 13cd12aee..195979f91 100644 Binary files a/plugins/sid/3off.png and b/plugins/sid/3off.png differ diff --git a/plugins/sid/3offred.png b/plugins/sid/3offred.png index f19cdc135..e4deab2a6 100644 Binary files a/plugins/sid/3offred.png and b/plugins/sid/3offred.png differ diff --git a/plugins/sid/6581.png b/plugins/sid/6581.png index 3d27f1806..510918902 100644 Binary files a/plugins/sid/6581.png and b/plugins/sid/6581.png differ diff --git a/plugins/sid/6581red.png b/plugins/sid/6581red.png index 293c2b2af..ef00cbfac 100644 Binary files a/plugins/sid/6581red.png and b/plugins/sid/6581red.png differ diff --git a/plugins/sid/8580.png b/plugins/sid/8580.png index 26d7d96bb..d896eeb2e 100644 Binary files a/plugins/sid/8580.png and b/plugins/sid/8580.png differ diff --git a/plugins/sid/8580red.png b/plugins/sid/8580red.png index 72e89c51b..d6ebffcb6 100644 Binary files a/plugins/sid/8580red.png and b/plugins/sid/8580red.png differ diff --git a/plugins/sid/artwork.png b/plugins/sid/artwork.png index c1dbaaddd..a890c42e8 100644 Binary files a/plugins/sid/artwork.png and b/plugins/sid/artwork.png differ diff --git a/plugins/sid/bp.png b/plugins/sid/bp.png index bb0e730ae..a04f6c78a 100644 Binary files a/plugins/sid/bp.png and b/plugins/sid/bp.png differ diff --git a/plugins/sid/bpred.png b/plugins/sid/bpred.png index 69f0f38d4..f404baa31 100644 Binary files a/plugins/sid/bpred.png and b/plugins/sid/bpred.png differ diff --git a/plugins/sid/filter.png b/plugins/sid/filter.png index 0687c0582..ff5c760db 100644 Binary files a/plugins/sid/filter.png and b/plugins/sid/filter.png differ diff --git a/plugins/sid/filterred.png b/plugins/sid/filterred.png index 31c6f6e7e..7b8698cd2 100644 Binary files a/plugins/sid/filterred.png and b/plugins/sid/filterred.png differ diff --git a/plugins/sid/hp.png b/plugins/sid/hp.png index ebcbab443..f4e7efa45 100644 Binary files a/plugins/sid/hp.png and b/plugins/sid/hp.png differ diff --git a/plugins/sid/hpred.png b/plugins/sid/hpred.png index abc47aa7e..fc04bd657 100644 Binary files a/plugins/sid/hpred.png and b/plugins/sid/hpred.png differ diff --git a/plugins/sid/lp.png b/plugins/sid/lp.png index cec2f2748..e8b1bbc56 100644 Binary files a/plugins/sid/lp.png and b/plugins/sid/lp.png differ diff --git a/plugins/sid/lpred.png b/plugins/sid/lpred.png index 99f362271..009c34b07 100644 Binary files a/plugins/sid/lpred.png and b/plugins/sid/lpred.png differ diff --git a/plugins/sid/noise.png b/plugins/sid/noise.png index ccc8bad91..48a4e3c45 100644 Binary files a/plugins/sid/noise.png and b/plugins/sid/noise.png differ diff --git a/plugins/sid/noisered.png b/plugins/sid/noisered.png index 873a2b1ab..1de40d9d8 100644 Binary files a/plugins/sid/noisered.png and b/plugins/sid/noisered.png differ diff --git a/plugins/sid/pulse.png b/plugins/sid/pulse.png index 457bf0d9d..9e74bd03a 100644 Binary files a/plugins/sid/pulse.png and b/plugins/sid/pulse.png differ diff --git a/plugins/sid/pulsered.png b/plugins/sid/pulsered.png index 4249a2b67..3a5780adb 100644 Binary files a/plugins/sid/pulsered.png and b/plugins/sid/pulsered.png differ diff --git a/plugins/sid/ring.png b/plugins/sid/ring.png index d97c7eb40..4477bd511 100644 Binary files a/plugins/sid/ring.png and b/plugins/sid/ring.png differ diff --git a/plugins/sid/ringred.png b/plugins/sid/ringred.png index 9030d7813..ed04dbfe9 100644 Binary files a/plugins/sid/ringred.png and b/plugins/sid/ringred.png differ diff --git a/plugins/sid/saw.png b/plugins/sid/saw.png index 6d8b8efb1..a319f3607 100644 Binary files a/plugins/sid/saw.png and b/plugins/sid/saw.png differ diff --git a/plugins/sid/sawred.png b/plugins/sid/sawred.png index b13afde84..e2a53257d 100644 Binary files a/plugins/sid/sawred.png and b/plugins/sid/sawred.png differ diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index be1c8914c..72bf8b1e2 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -462,13 +462,13 @@ public: sidKnob( QWidget * _parent ) : knob( knobStyled, _parent ) { - setFixedSize( 26, 25 ); - setCenterPointX( 13.0 ); - setCenterPointY( 14.0 ); - setInnerRadius( 0 ); - setOuterRadius( 5 ); + setFixedSize( 16, 16 ); + setCenterPointX( 7.5 ); + setCenterPointY( 7.5 ); + setInnerRadius( 2 ); + setOuterRadius( 8 ); setTotalAngle( 270.0 ); - setLineWidth( 1 ); + setLineWidth( 2 ); } }; @@ -487,30 +487,30 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, m_volKnob = new sidKnob( this ); m_volKnob->setHintText( tr( "Volume:" ) + " ", "" ); - m_volKnob->move( 7, 60 ); + m_volKnob->move( 7, 64 ); m_resKnob = new sidKnob( this ); m_resKnob->setHintText( tr( "Resonance:" ) + " ", "" ); - m_resKnob->move( 7 + 29, 60 ); + m_resKnob->move( 7 + 28, 64 ); m_cutKnob = new sidKnob( this ); m_cutKnob->setHintText( tr( "Cutoff frequency:" ) + " ", "Hz" ); - m_cutKnob->move( 7 + 2*29, 60 ); + m_cutKnob->move( 7 + 2*28, 64 ); pixmapButton * hp_btn = new pixmapButton( this, NULL ); - hp_btn->move( 176, 53 ); + hp_btn->move( 139, 77 ); hp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "hpred" ) ); hp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "hp" ) ); toolTip::add( hp_btn, tr( "High-Pass filter ") ); pixmapButton * bp_btn = new pixmapButton( this, NULL ); - bp_btn->move( 176 + 14, 53 ); + bp_btn->move( 163, 77 ); bp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "bpred" ) ); bp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bp" ) ); toolTip::add( bp_btn, tr( "Band-Pass filter ") ); pixmapButton * lp_btn = new pixmapButton( this, NULL ); - lp_btn->move( 176 +2*14, 53 ); + lp_btn->move( 184, 77 ); lp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "lpred" ) ); lp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "lp" ) ); toolTip::add( lp_btn, tr( "Low-Pass filter ") ); @@ -522,19 +522,19 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, m_offButton = new pixmapButton( this, NULL ); m_offButton->setCheckable( true ); - m_offButton->move( 176 + 3*14, 53 ); + m_offButton->move( 206, 77 ); m_offButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "3offred" ) ); m_offButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "3off" ) ); toolTip::add( m_offButton, tr( "Voice3 Off ") ); pixmapButton * mos6581_btn = new pixmapButton( this, NULL ); - mos6581_btn->move( 190, 67 ); + mos6581_btn->move( 170, 59 ); mos6581_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "6581red" ) ); mos6581_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "6581" ) ); toolTip::add( mos6581_btn, tr( "MOS6581 SID ") ); pixmapButton * mos8580_btn = new pixmapButton( this, NULL ); - mos8580_btn->move( 218, 67 ); + mos8580_btn->move( 207, 59 ); mos8580_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "8580red" ) ); mos8580_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "8580" ) ); toolTip::add( mos8580_btn, tr( "MOS8580 SID ") ); @@ -547,32 +547,32 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, { knob *ak = new sidKnob( this ); ak->setHintText( tr("Attack:") + " ", "" ); - ak->move( 7, 110 + i*50 ); + ak->move( 7, 114 + i*50 ); ak->setWhatsThis( tr ( "Attack rate determines how rapidly the output " "of Voice %1 rises from zero to peak amplitude." ).arg( i+1 ) ); knob *dk = new sidKnob( this ); dk->setHintText( tr("Decay:") + " ", "" ); - dk->move( 7 + 29, 110 + i*50 ); + dk->move( 7 + 28, 114 + i*50 ); dk->setWhatsThis( tr ( "Decay rate determines how rapidly the output " "falls from the peak amplitude to the selected Sustain level." ) ); knob *sk = new sidKnob( this ); sk->setHintText( tr("Sustain:") + " ", "" ); - sk->move( 7 + 2*29, 110 + i*50 ); + sk->move( 7 + 2*28, 114 + i*50 ); sk->setWhatsThis( tr ( "Output of Voice %1 will remain at the selected " "Sustain amplitude as long as the note is held." ).arg( i+1 ) ); knob *rk = new sidKnob( this ); rk->setHintText( tr("Release:") + " ", "" ); - rk->move( 7 + 3*29, 110 + i*50 ); + rk->move( 7 + 3*28, 114 + i*50 ); rk->setWhatsThis( tr ( "The output of of Voice %1 will fall from " "Sustain amplitude to zero amplitude at the selected Release " "rate." ).arg( i+1 ) ); knob *pwk = new sidKnob( this ); pwk->setHintText( tr("Pulse Width:") + " ", "" ); - pwk->move( 7 + 4*29, 110 + i*50 ); + pwk->move( 7 + 4*28, 114 + i*50 ); pwk->setWhatsThis( tr ( "The Pulse Width resolution allows the width " "to be smoothly swept with no discernable stepping. The Pulse " "waveform on Oscillator %1 must be selected to have any audible" @@ -580,12 +580,12 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, knob *crsk = new sidKnob( this ); crsk->setHintText( tr("Coarse:") + " ", " semitones" ); - crsk->move( 160, 110 + i*50 ); + crsk->move( 147, 114 + i*50 ); crsk->setWhatsThis( tr ( "The Coarse detuning allows to detune Voice " "%1 one octave up or down." ).arg( i+1 ) ); pixmapButton * pulse_btn = new pixmapButton( this, NULL ); - pulse_btn->move( 191, 103 + i*50 ); + pulse_btn->move( 189, 101 + i*50 ); pulse_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "pulsered" ) ); pulse_btn->setInactiveGraphic( @@ -593,7 +593,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, toolTip::add( pulse_btn, tr( "Pulse Wave" ) ); pixmapButton * triangle_btn = new pixmapButton( this, NULL ); - triangle_btn->move( 191 + 14, 103 + i*50 ); + triangle_btn->move( 170, 101 + i*50 ); triangle_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "trianglered" ) ); triangle_btn->setInactiveGraphic( @@ -601,7 +601,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, toolTip::add( triangle_btn, tr( "Triangle Wave" ) ); pixmapButton * saw_btn = new pixmapButton( this, NULL ); - saw_btn->move( 191 + 2*14, 103 + i*50 ); + saw_btn->move( 209, 101 + i*50 ); saw_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sawred" ) ); saw_btn->setInactiveGraphic( @@ -609,7 +609,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, toolTip::add( saw_btn, tr( "SawTooth" ) ); pixmapButton * noise_btn = new pixmapButton( this, NULL ); - noise_btn->move( 191 + 3*14, 103 + i*50 ); + noise_btn->move( 228, 101 + i*50 ); noise_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "noisered" ) ); noise_btn->setInactiveGraphic( @@ -628,7 +628,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, pixmapButton * sync_btn = new pixmapButton( this, NULL ); sync_btn->setCheckable( true ); - sync_btn->move( 191, 117 + i*50 ); + sync_btn->move( 207, 134 + i*50 ); sync_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "syncred" ) ); sync_btn->setInactiveGraphic( @@ -641,7 +641,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, pixmapButton * ringMod_btn = new pixmapButton( this, NULL ); ringMod_btn->setCheckable( true ); - ringMod_btn->move( 191 + 2*14, 117 + i*50 ); + ringMod_btn->move( 170, 116 + i*50 ); ringMod_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "ringred" ) ); ringMod_btn->setInactiveGraphic( @@ -654,7 +654,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, pixmapButton * filter_btn = new pixmapButton( this, NULL ); filter_btn->setCheckable( true ); - filter_btn->move( 191, 131 + i*50 ); + filter_btn->move( 207, 116 + i*50 ); filter_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "filterred" ) ); filter_btn->setInactiveGraphic( @@ -667,7 +667,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, pixmapButton * test_btn = new pixmapButton( this, NULL ); test_btn->setCheckable( true ); - test_btn->move( 191 +2*14, 131 + i*50 ); + test_btn->move( 170, 134 + i*50 ); test_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "testred" ) ); test_btn->setInactiveGraphic( diff --git a/plugins/sid/sync.png b/plugins/sid/sync.png index d19c71dc9..cbca3e251 100644 Binary files a/plugins/sid/sync.png and b/plugins/sid/sync.png differ diff --git a/plugins/sid/syncred.png b/plugins/sid/syncred.png index 00125f871..22b3148f3 100644 Binary files a/plugins/sid/syncred.png and b/plugins/sid/syncred.png differ diff --git a/plugins/sid/test.png b/plugins/sid/test.png index 0e7306d97..19de1ad9e 100644 Binary files a/plugins/sid/test.png and b/plugins/sid/test.png differ diff --git a/plugins/sid/testred.png b/plugins/sid/testred.png index fbaf4d1cc..65db96ec6 100644 Binary files a/plugins/sid/testred.png and b/plugins/sid/testred.png differ diff --git a/plugins/sid/triangle.png b/plugins/sid/triangle.png index a03406f2d..c73221fef 100644 Binary files a/plugins/sid/triangle.png and b/plugins/sid/triangle.png differ diff --git a/plugins/sid/trianglered.png b/plugins/sid/trianglered.png index f2f35c83f..005f87395 100644 Binary files a/plugins/sid/trianglered.png and b/plugins/sid/trianglered.png differ diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index a545df3c0..d1080546e 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -1804,7 +1804,7 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me ) { // left click - play the note m_lastKey = key_num; - if( ! m_recording && ! engine::getSong()->isPlaying() ) + //if( ! m_recording && ! engine::getSong()->isPlaying() ) { int v = ( (float) x ) / ( (float) WHITE_KEY_WIDTH ) * MidiMaxVelocity; m_pattern->instrumentTrack()->pianoModel()->handleKeyPress( key_num, v ); @@ -1857,7 +1857,7 @@ void pianoRoll::testPlayNote( note * n ) { m_lastKey = n->key(); - if( ! n->isPlaying() && ! m_recording && ! engine::getSong()->isPlaying() ) + //if( ! n->isPlaying() && ! m_recording && ! engine::getSong()->isPlaying() ) { n->setIsPlaying( true ); m_pattern->instrumentTrack()->pianoModel()->handleKeyPress( n->key(), volumeToMidi( n->getVolume() ) );