hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Updates to song editor style. Also couple of fixes to SID layout.

Browse Source
This commit is contained in:
Vesa
2014-02-21 21:11:36 +02:00
parent 418a5e6a75
commit 9896d94b09
7 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default/style.css
View File

@@ -584,10 +584,10 @@ opl2instrumentView knob {
}
sidInstrumentView knob {
color: rgb(175,175,175);
color: rgb(113,95,80);
qproperty-outerColor: rgb( 255,255,255 );
qproperty-innerRadius: 2;
qproperty-outerRadius: 8;
qproperty-outerRadius: 7;
qproperty-lineWidth: 2;
}

16
plugins/sid/sid_instrument.cpp
View File

@@ -498,19 +498,19 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
m_cutKnob->move( 7 + 2*28, 64 );
pixmapButton * hp_btn = new pixmapButton( this, NULL );
hp_btn->move( 139, 77 );
hp_btn->move( 140, 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( 163, 77 );
bp_btn->move( 164, 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( 184, 77 );
lp_btn->move( 185, 77 );
lp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "lpred" ) );
lp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "lp" ) );
toolTip::add( lp_btn, tr( "Low-Pass filter ") );
@@ -522,7 +522,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
m_offButton = new pixmapButton( this, NULL );
m_offButton->setCheckable( true );
m_offButton->move( 206, 77 );
m_offButton->move( 207, 77 );
m_offButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "3offred" ) );
m_offButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "3off" ) );
toolTip::add( m_offButton, tr( "Voice3 Off ") );
@@ -585,7 +585,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
"%1 one octave up or down." ).arg( i+1 ) );
pixmapButton * pulse_btn = new pixmapButton( this, NULL );
pulse_btn->move( 189, 101 + i*50 );
pulse_btn->move( 187, 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( 170, 101 + i*50 );
triangle_btn->move( 168, 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( 209, 101 + i*50 );
saw_btn->move( 207, 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( 228, 101 + i*50 );
noise_btn->move( 226, 101 + i*50 );
noise_btn->setActiveGraphic(
PLUGIN_NAME::getIconPixmap( "noisered" ) );
noise_btn->setInactiveGraphic(

45
src/core/track.cpp
View File

@@ -897,37 +897,34 @@ void trackContentWidget::updateBackground()
m_background = QPixmap( w * 2, height() );
QPainter pmp( &m_background );
QLinearGradient grad( 0, 1, 0, h-2 );
pmp.fillRect( 0, 0, 1, h, QColor( 96, 96, 96 ) );
pmp.fillRect( 1, 0, w+1, h, QColor( 128, 128, 128 ) );
grad.setColorAt( 0.0, QColor( 64, 64, 64 ) );
grad.setColorAt( 0.3, QColor( 128, 128, 128 ) );
grad.setColorAt( 0.5, QColor( 128, 128, 128 ) );
grad.setColorAt( 0.95, QColor( 160, 160, 160 ) );
pmp.fillRect( 0, 1, w, h-2, grad );
QLinearGradient grad( 0,0, 0, h );
grad.setColorAt( 0.0, QColor( 50, 50, 50 ) );
grad.setColorAt( 0.33, QColor( 15, 15, 15 ) );
grad.setColorAt( 1.0, QColor( 12, 12, 12 ) );
pmp.fillRect( 0, 0, w, h, grad );
QLinearGradient grad2( 0,1, 0, h-2 );
pmp.fillRect( w+1, 0, w , h, QColor( 96, 96, 96 ) );
grad2.setColorAt( 0.0, QColor( 48, 48, 48 ) );
grad2.setColorAt( 0.3, QColor( 96, 96, 96 ) );
grad2.setColorAt( 0.5, QColor( 96, 96, 96 ) );
grad2.setColorAt( 0.95, QColor( 120, 120, 120 ) );
pmp.fillRect( w, 1, w , h-2, grad2 );
QLinearGradient grad2( 0,0, 0, h );
grad2.setColorAt( 0.0, QColor( 50, 50, 50 ) );
grad2.setColorAt( 0.33, QColor( 30, 30, 30 ) );
grad2.setColorAt( 1.0, QColor( 27, 27, 27 ) );
pmp.fillRect( w, 0, w , h, grad2 );
// draw vertical lines
pmp.setPen( QPen( QColor( 0, 0, 0, 112 ), 1 ) );
for( float x = 0.5; x < w * 2; x += ppt )
// draw lines
pmp.setPen( QPen( QColor( 0, 0, 0, 160 ), 1 ) );
// horizontal line
pmp.drawLine( 0, 0, w*2, 0 );
// vertical lines
for( float x = 0; x < w * 2; x += ppt )
{
pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
pmp.drawLine( QLineF( x, 0.0, x, h ) );
}
pmp.drawLine( 0, 1, w*2, 1 );
pmp.setPen( QPen( QColor( 255, 255, 255, 32 ), 1 ) );
for( float x = 1.5; x < w * 2; x += ppt )
pmp.setPen( QPen( QColor( 140, 140, 140, 128 ), 1 ) );
for( float x = 1.0; x < w * 2; x += ppt )
{
pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
pmp.drawLine( QLineF( x, 0.0, x, h ) );
}
pmp.drawLine( 0, h-2, w*2, h-2 );
pmp.end();

16
src/gui/AutomationPatternView.cpp
View File

@@ -214,10 +214,10 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
QLinearGradient lingrad( 0, 0, 0, height() );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 96, 96, 96 );
lingrad.setColorAt( 0, QColor(16, 16, 16) );
lingrad.setColorAt( 0.5, c );
QColor( 110, 110, 110 );
lingrad.setColorAt( 1, QColor(16, 16, 16) );
lingrad.setColorAt( 0, c );
p.setBrush( lingrad );
p.setPen( QColor( 0, 0, 0 ) );
p.drawRect( QRect( 0, 0, width() - 1, height() - 1 ) );
@@ -251,11 +251,11 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
p.scale( 1.0f, -h );
QLinearGradient lin2grad( 0, min, 0, max );
const QColor cl = QColor( 0xCF, 0xDA, 0xFF );
const QColor cd = QColor( 0x99, 0xAF, 0xFF );
const QColor cl = QColor( 0x99, 0xAF, 0xFF );
lin2grad.setColorAt( 1, cl );
lin2grad.setColorAt( 0, cd );
lin2grad.setColorAt( 0.8, cl );
lin2grad.setColorAt( 0, cl.darker( 140 ) );
// TODO: skip this part for patterns or parts of the pattern that will
// not be on the screen
@@ -292,11 +292,11 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
p.setFont( pointSize<8>( p.font() ) );
if( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
{
p.setPen( QColor( 192, 192, 192 ) );
p.setPen( QColor( 50, 50, 50 ) );
}
else
{
p.setPen( QColor( 0, 180, 60 ) );
p.setPen( QColor( 255, 255, 255 ) );
}
p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );

11
src/tracks/SampleTrack.cpp
View File

@@ -332,15 +332,14 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
QLinearGradient grad( 0, 0, 0, height() );
if( isSelected() )
{
grad.setColorAt( 0, QColor( 0, 0, 128 ) );
grad.setColorAt( 0.5, QColor( 0, 0, 224 ) );
grad.setColorAt( 1, QColor( 0, 0, 128 ) );
grad.setColorAt( 1, QColor( 16, 16, 16 ) );
grad.setColorAt( 0, QColor( 0, 0, 224 ) );
}
else
{
grad.setColorAt( 0, QColor( 16, 16, 16 ) );
grad.setColorAt( 0.5, QColor( 96, 96, 96 ) );
grad.setColorAt( 0, QColor( 16, 16, 16 ) );
grad.setColorAt( 1, QColor( 16, 16, 16 ) );
grad.setColorAt( 0, QColor( 110, 110, 110 ) );
}
p.fillRect( _pe->rect(), grad );

2
src/tracks/bb_track.cpp
View File

@@ -48,7 +48,7 @@ bbTrack::infoMap bbTrack::s_infoMap;
bbTCO::bbTCO( track * _track, unsigned int _color ) :
trackContentObject( _track ),
m_color( _color > 0 ? _color : qRgb( 64, 128, 255 ) )
m_color( _color > 0 ? _color : qRgb( 100, 140, 150 ) )
{
tact_t t = engine::getBBTrackContainer()->lengthOfBB(
bbTrack::numOfBBTrack( getTrack() ) );

21
src/tracks/pattern.cpp
View File

@@ -832,10 +832,19 @@ void patternView::paintEvent( QPaintEvent * )
QLinearGradient lingrad( 0, 0, 0, height() );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 96, 96, 96 );
lingrad.setColorAt( 0, QColor( 16, 16, 16 ) );
lingrad.setColorAt( 0.5, c );
lingrad.setColorAt( 1, QColor( 16, 16, 16 ) );
QColor( 110, 110, 110 );
if( m_pat->m_patternType == pattern::BeatPattern )
{
lingrad.setColorAt( 0, QColor( 16, 16, 16 ) );
lingrad.setColorAt( 1, c );
}
else
{
lingrad.setColorAt( 1, QColor( 16, 16, 16 ) );
lingrad.setColorAt( 0, c );
}
p.setBrush( lingrad );
p.setPen( QColor( 0, 0, 0 ) );
//p.drawRect( 0, 0, width() - 1, height() - 1 );
@@ -984,11 +993,11 @@ void patternView::paintEvent( QPaintEvent * )
p.setFont( pointSize<8>( p.font() ) );
if( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
{
p.setPen( QColor( 192, 192, 192 ) );
p.setPen( QColor( 50, 50, 502 ) );
}
else
{
p.setPen( QColor( 32, 240, 101 ) );
p.setPen( QColor( 0x77, 0xc7, 0xd8 ).lighter( 140 ) );
}
if( m_pat->name() != m_pat->instrumentTrack()->name() )