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

Merge pull request #76 from diizy/stable-0.4

Browse Source 
Another UI branch merge...?
This commit is contained in:
Tobias Doerffel
2014-01-20 14:52:46 -08:00
parent 9854ebc128 fc61899c43
commit fbdf4eca40
12 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/song_editor.cpp
View File

@@ -286,13 +286,13 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
m_toolBar );
m_addSampleTrackButton = new toolButton( embed::getIconPixmap(
"add_sample_track", 24, 24 ),
"add_sample_track" ),
tr( "Add sample-track" ),
m_s, SLOT( addSampleTrack() ),
m_toolBar );
m_addAutomationTrackButton = new toolButton( embed::getIconPixmap(
"add_automation", 24, 24 ),
"add_automation" ),
tr( "Add automation-track" ),
m_s, SLOT( addAutomationTrack() ),
m_toolBar );

11
src/gui/widgets/knob.cpp
View File

@@ -328,18 +328,22 @@ void knob::drawKnob( QPainter * _p )
width() / 2 - m_knobPixmap->width() / 2 ), 0,
*m_knobPixmap );
p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
// p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
p.setRenderHint( QPainter::Antialiasing );
switch( m_knobNum )
{
case knobSmall_17:
{
p.drawLine( calculateLine( mid, radius ) );
p.setPen( QPen( QApplication::palette().color( QPalette::Active,
QPalette::WindowText ), 2 ) );
p.drawLine( calculateLine( mid, radius-2 ) );
break;
}
case knobBright_26:
{
p.setPen( QPen( QApplication::palette().color( QPalette::Active,
QPalette::WindowText ), 2 ) );
p.drawLine( calculateLine( mid, radius-5 ) );
break;
}
@@ -355,7 +359,8 @@ void knob::drawKnob( QPainter * _p )
}
case knobGreen_17:
{
p.setPen( QPen( QColor( 0, 200, 0 ), 2 ) );
p.setPen( QPen( QApplication::palette().color( QPalette::Active,
QPalette::BrightText), 2 ) );
p.drawLine( calculateLine( mid, radius ) );
break;
}