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

More tweaks on song editor style

Browse Source
This commit is contained in:
Vesa
2014-02-22 02:34:26 +02:00
parent 3f3cde8332
commit 9f64e6f428
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/track.cpp
View File

@@ -899,8 +899,8 @@ void trackContentWidget::updateBackground()
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 ) );
grad.setColorAt( 0.33, QColor( 20, 20, 20 ) );
grad.setColorAt( 1.0, QColor( 15, 15, 15 ) );
pmp.fillRect( 0, 0, w, h, grad );
QLinearGradient grad2( 0,0, 0, h );
@@ -920,7 +920,7 @@ void trackContentWidget::updateBackground()
pmp.drawLine( QLineF( x, 0.0, x, h ) );
}
pmp.setPen( QPen( QColor( 140, 140, 140, 128 ), 1 ) );
pmp.setPen( QPen( QColor( 140, 140, 140, 64 ), 1 ) );
for( float x = 1.0; x < w * 2; x += ppt )
{
pmp.drawLine( QLineF( x, 0.0, x, h ) );

23
src/gui/AutomationPatternView.cpp
View File

@@ -214,8 +214,8 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
QLinearGradient lingrad( 0, 0, 0, height() );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 110, 110, 110 );
lingrad.setColorAt( 1, QColor(16, 16, 16) );
QColor( 0x99, 0xAF, 0xFF );
lingrad.setColorAt( 1, c.darker( 300 ) );
lingrad.setColorAt( 0, c );
p.setBrush( lingrad );
@@ -228,7 +228,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
pixelsPerTact();
const int x_base = TCO_BORDER_WIDTH;
p.setPen( QColor( 0, 0, 0 ) );
p.setPen( c.darker( 300 ) );
for( tact_t t = 1; t < m_pat->length().getTact(); ++t )
{
@@ -253,10 +253,17 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
QLinearGradient lin2grad( 0, min, 0, max );
const QColor cl = QColor( 0x99, 0xAF, 0xFF );
lin2grad.setColorAt( 1, cl );
lin2grad.setColorAt( 0.8, cl );
lin2grad.setColorAt( 0, cl.darker( 140 ) );
if( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
{
lin2grad.setColorAt( 1, QColor( 200,200,200 ) );
lin2grad.setColorAt( 0, QColor( 100,100,100 ) );
}
else
{
lin2grad.setColorAt( 1, QColor( 255,255,255 ) );
lin2grad.setColorAt( 0, cl );
}
// TODO: skip this part for patterns or parts of the pattern that will
// not be on the screen
for( AutomationPattern::timeMap::const_iterator it =
@@ -296,7 +303,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
}
else
{
p.setPen( QColor( 255, 255, 255 ) );
p.setPen( QColor( 0, 0, 0 ) );
}
p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );

17
src/tracks/SampleTrack.cpp
View File

@@ -329,18 +329,13 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
{
QPainter p( this );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 74, 253, 133 );
QLinearGradient grad( 0, 0, 0, height() );
if( isSelected() )
{
grad.setColorAt( 1, QColor( 16, 16, 16 ) );
grad.setColorAt( 0, QColor( 0, 0, 224 ) );
}
else
{
grad.setColorAt( 1, QColor( 16, 16, 16 ) );
grad.setColorAt( 0, QColor( 110, 110, 110 ) );
}
grad.setColorAt( 1, c.darker( 300 ) );
grad.setColorAt( 0, c );
p.fillRect( _pe->rect(), grad );
p.setPen( QColor( 0, 0, 0 ) );
@@ -351,7 +346,7 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
}
else
{
p.setPen( QColor( 74, 253, 133 ) );
p.setPen( c.lighter( 300 ) );
}
QRect r = QRect( 1, 1,
qMax( static_cast<int>( m_tco->sampleLength() *

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( 100, 140, 150 ) )
m_color( _color > 0 ? _color : qRgb( 105, 150, 145 ) )
{
tact_t t = engine::getBBTrackContainer()->lengthOfBB(
bbTrack::numOfBBTrack( getTrack() ) );

12
src/tracks/pattern.cpp
View File

@@ -832,16 +832,16 @@ void patternView::paintEvent( QPaintEvent * )
QLinearGradient lingrad( 0, 0, 0, height() );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 110, 110, 110 );
QColor( 119, 199, 216 );
if( m_pat->m_patternType == pattern::BeatPattern )
{
lingrad.setColorAt( 0, QColor( 16, 16, 16 ) );
lingrad.setColorAt( 1, c );
lingrad.setColorAt( 1, QColor( 80, 80, 80 ) );
}
else
{
lingrad.setColorAt( 1, QColor( 16, 16, 16 ) );
lingrad.setColorAt( 1, c.darker( 300 ) );
lingrad.setColorAt( 0, c );
}
@@ -857,7 +857,7 @@ void patternView::paintEvent( QPaintEvent * )
pixelsPerTact();
const int x_base = TCO_BORDER_WIDTH;
p.setPen( QColor( 0, 0, 0 ) );
p.setPen( c.darker( 300 ) );
for( tact_t t = 1; t < m_pat->length().getTact(); ++t )
{
@@ -902,7 +902,7 @@ void patternView::paintEvent( QPaintEvent * )
}
else
{
p.setPen( QColor( 0x77, 0xC7, 0xD8 ) );
p.setPen( QColor( 255, 255, 255 ) );
}
for( NoteVector::Iterator it =
@@ -997,7 +997,7 @@ void patternView::paintEvent( QPaintEvent * )
}
else
{
p.setPen( QColor( 0x77, 0xc7, 0xd8 ).lighter( 140 ) );
p.setPen( QColor( 0, 0, 0 ) );
}
if( m_pat->name() != m_pat->instrumentTrack()->name() )