Added object names for transport buttons (for theming purposes), fixed alignment issues on track labels

data/themes/default/style.css

@@ -327,6 +327,16 @@ QToolButton, toolButton {
 	color: black;
 }
 
+toolButton#playButton {
+	border-top-left-radius: 10px 6px;
+	border-bottom-left-radius: 10px 6px;
+}
+
+toolButton#stopButton {
+	border-top-right-radius: 10px 6px;
+	border-bottom-right-radius: 10px 6px;	
+}
+
 QToolButton:hover, toolButton:hover {
 	background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 );
 	border: 1px solid rgba(0,0,0,128);
@@ -363,6 +373,7 @@ trackLabelButton:hover {
 	color: white;
 	border: 1px solid rgba(0,0,0,64);
 	padding: 1px 0px;
+	margin: 0px;
 }
 
 trackLabelButton:pressed {

src/gui/AutomationEditor.cpp

@@ -5,7 +5,7 @@
  * Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * Copyright (c) 2008-2013 Paul Giblock <pgib/at/users.sourceforge.net>
  * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -156,10 +156,14 @@ AutomationEditor::AutomationEditor() :
 				tr( "Play/pause current pattern (Space)" ),
 					this, SLOT( play() ), m_toolBar );
 
+
 	m_stopButton = new toolButton( embed::getIconPixmap( "stop" ),
 				tr( "Stop playing of current pattern (Space)" ),
 					this, SLOT( stop() ), m_toolBar );
 
+	m_playButton->setObjectName( "playButton" );
+	m_stopButton->setObjectName( "stopButton" );
+
 	m_playButton->setWhatsThis(
 		tr( "Click here if you want to play the current pattern. "
 			"This is useful while editing it.  The pattern is "
@@ -277,7 +281,7 @@ AutomationEditor::AutomationEditor() :
 
 	connect( &m_tensionModel, SIGNAL( dataChanged() ),
 			this, SLOT( tensionChanged() ) );
-	
+
 	tool_button_group = new QButtonGroup( this );
 	tool_button_group->addButton( m_discreteButton );
 	tool_button_group->addButton( m_linearButton );
@@ -524,7 +528,7 @@ void AutomationEditor::updateAfterPatternChange()
 	}
 
 	if( m_pattern->progressionType() ==
-				AutomationPattern::DiscreteProgression && 
+				AutomationPattern::DiscreteProgression &&
 				!m_discreteButton->isChecked() )
 	{
 		m_discreteButton->setChecked( true );
@@ -763,20 +767,20 @@ void AutomationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 )
 
 	float yscale = deltay / ( deltax );
 
-	if( _x0 < _x1) 
+	if( _x0 < _x1)
 	{
 		xstep = quantization();
 	}
-	else 
+	else
 	{
 		xstep = -( quantization() );
 	}
 
 	if( _y0 < _y1 )
 	{
-		ystep = 1; 
+		ystep = 1;
 	}
-	else 
+	else
 	{
 		ystep = -1;
 	}
@@ -878,7 +882,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me )
 				{
 					// then set new value
 					MidiTime value_pos( pos_ticks );
-		
+
 					MidiTime new_time =
 						m_pattern->putValue( value_pos,
 									level );
@@ -1577,7 +1581,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 								is_selected );
 			}
 			delete [] values;
-			
+
 			// Draw cross
 			int y = yCoordOfLevel( it.value() );
 			p.drawLine( x - 1, y, x + 1, y );
@@ -1803,7 +1807,7 @@ void AutomationEditor::wheelEvent( QWheelEvent * _we )
 		m_timeLine->setPixelsPerTact( m_ppt );
 		update();
 	}
-	else if( _we->modifiers() & Qt::ShiftModifier 
+	else if( _we->modifiers() & Qt::ShiftModifier
 			|| _we->orientation() == Qt::Horizontal )
 	{
 		m_leftRightScroll->setValue( m_leftRightScroll->value() -
@@ -2069,7 +2073,7 @@ void AutomationEditor::selectAll()
 		const float level = it.value();
 		if( level < m_selectStartLevel )
 		{
-			// if we move start-level down, we have to add 
+			// if we move start-level down, we have to add
 			// the difference between old and new start-level
 			// to m_selectedLevels, otherwise the selection
 			// is just moved down...

src/gui/MainWindow.cpp

@@ -412,7 +412,7 @@ void MainWindow::finalize( void )
 
 
 	toolButton * bb_editor_window = new toolButton(
-					embed::getIconPixmap( "bb_track" ),
+					embed::getIconPixmap( "bb_track_btn" ),
 					tr( "Show/hide Beat+Bassline Editor" ) +
 									" (F6)",
 					this, SLOT( toggleBBEditorWin() ),

src/gui/bb_editor.cpp

@@ -2,7 +2,7 @@
  * bb_editor.cpp - basic main-window for editing of beats and basslines
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -85,6 +85,9 @@ bbEditor::bbEditor( bbTrackContainer* tc ) :
 			tr( "Stop playback of current beat/bassline (Space)" ),
 					this, SLOT( stop() ), m_toolBar );
 
+	m_playButton->setObjectName( "playButton" );
+	m_stopButton->setObjectName( "stopButton" );
+
 	toolButton * add_bb_track = new toolButton(
 					embed::getIconPixmap( "add_bb_track" ),
 						tr( "Add beat/bassline" ),

src/gui/piano_roll.cpp

@@ -331,6 +331,11 @@ pianoRoll::pianoRoll() :
 	m_stopButton = new toolButton( embed::getIconPixmap( "stop" ),
 				tr( "Stop playing of current pattern (Space)" ),
 					this, SLOT( stop() ), m_toolBar );
+					
+	m_playButton->setObjectName( "playButton" );
+	m_stopButton->setObjectName( "stopButton" );
+	m_recordButton->setObjectName( "recordButton" );
+	m_recordAccompanyButton->setObjectName( "recordAccompanyButton" );
 
 	m_playButton->setWhatsThis(
 		tr( "Click here to play the current pattern. "

src/gui/song_editor.cpp

@@ -113,7 +113,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 				this, SLOT( adjustUiAfterProjectLoad() ) );
 
 
-	// add some essential widgets to global tool-bar 
+	// add some essential widgets to global tool-bar
 	QWidget * tb = engine::mainWindow()->toolBar();
 
 	engine::mainWindow()->addSpacingToToolBar( 10 );
@@ -153,7 +153,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	engine::mainWindow()->addWidgetToToolBar( m_timeSigDisplay );
 
 	engine::mainWindow()->addSpacingToToolBar( 10 );
-	
+
 
 	QLabel * master_vol_lbl = new QLabel( tb );
 	master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) );
@@ -239,7 +239,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_toolBar->setFixedHeight( 32 );
 	m_toolBar->setAutoFillBackground( true );
 	QPalette pal;
-	pal.setBrush( m_toolBar->backgroundRole(), 
+	pal.setBrush( m_toolBar->backgroundRole(),
 				embed::getIconPixmap( "toolbar_bg" ) );
 	m_toolBar->setPalette( pal );
 
@@ -255,19 +255,23 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_playButton = new toolButton( embed::getIconPixmap( "play" ),
 					tr( "Play song (Space)" ),
 					this, SLOT( play() ), m_toolBar );
+	m_playButton->setObjectName( "playButton" );
 
 	m_recordButton = new toolButton( embed::getIconPixmap( "record" ),
 			tr( "Record samples from Audio-device" ),
 					this, SLOT( record() ), m_toolBar );
-	m_recordAccompanyButton = new toolButton( 
+	m_recordButton->setObjectName( "recordButton" );
+
+	m_recordAccompanyButton = new toolButton(
 			embed::getIconPixmap( "record_accompany" ),
 			tr( "Record samples from Audio-device while playing "
 							"song or BB track" ),
 				this, SLOT( recordAccompany() ), m_toolBar );
+	m_recordAccompanyButton->setObjectName( "recordAccompanyButton" );
 
 	// FIXME: disable record button while it is not implemented
 	m_recordButton->setDisabled( true );
-	
+
 	// disable record buttons if capturing is not supported
 	if( !engine::mixer()->audioDev()->supportsCapture() )
 	{
@@ -278,6 +282,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_stopButton = new toolButton( embed::getIconPixmap( "stop" ),
 					tr( "Stop song (Space)" ),
 					this, SLOT( stop() ), m_toolBar );
+	m_stopButton->setObjectName( "stopButton" );
 
 	m_addBBTrackButton = new toolButton( embed::getIconPixmap(
 						"add_bb_track" ),
@@ -566,7 +571,7 @@ void songEditor::wheelEvent( QWheelEvent * _we )
 					setPixelsPerTact( pixelsPerTact() );
 		// and make sure, all TCO's are resized and relocated
 		realignTracks();
-	} 
+	}
 	else if( engine::mainWindow()->isShiftPressed() == TRUE )
 	{
 		m_leftRightScroll->setValue( m_leftRightScroll->value() -
@@ -720,7 +725,7 @@ void songEditor::updatePosition( const MidiTime & _t )
 		trackOpWidth = TRACK_OP_WIDTH;
 	}
 
-	if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong 
+	if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong
 		  && m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) ||
 							m_scrollBack == true )
 	{

src/gui/widgets/track_label_button.cpp

@@ -58,7 +58,7 @@ trackLabelButton::trackLabelButton( trackView * _tv, QWidget * _parent ) :
 		setFixedSize( 160, 29 );
 	}
 
-	setIconSize( QSize( 32, 32 ) );
+	setIconSize( QSize( 24, 24 ) );
 	setText( " " );
 
 	connect( m_trackView->getTrack(), SIGNAL( dataChanged() ),