improved UI

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@972 0778d3d1-df1d-0410-868b-ea421aaaa00d

src/core/timeline.cpp

@@ -241,8 +241,8 @@ void timeLine::paintEvent( QPaintEvent * )
 	const QPixmap & lpoint = loopPointsEnabled() ?
 						*s_loopPointPixmap :
 						*s_loopPointDisabledPixmap;
-	p.drawPixmap( markerX( loopBegin() ), 7, lpoint );
-	p.drawPixmap( markerX( loopEnd() ), 7, lpoint );
+	p.drawPixmap( markerX( loopBegin() ), 4, lpoint );
+	p.drawPixmap( markerX( loopEnd() ), 4, lpoint );
 
 
 	tact tact_num = m_begin.getTact();

src/core/track.cpp

@@ -1037,15 +1037,15 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) :
 
 
 	m_muteBtn = new pixmapButton( this, tr( "Mute" ) );
-	m_muteBtn->setActiveGraphic( *s_muteOnEnabled );
-	m_muteBtn->setInactiveGraphic( *s_muteOffEnabled );
+	m_muteBtn->setActiveGraphic( *s_muteOffEnabled );
+	m_muteBtn->setInactiveGraphic( *s_muteOnEnabled );
 	m_muteBtn->setCheckable( TRUE );
 	m_muteBtn->move( 44, 4 );
 	m_muteBtn->show();
 	connect( m_muteBtn, SIGNAL( toggled( bool ) ), this,
 						SLOT( setMuted( bool ) ) );
-	connect( m_muteBtn, SIGNAL( clickedRight() ), this,
-					SLOT( muteBtnRightClicked() ) );
+	connect( m_muteBtn, SIGNAL( ctrlClick() ), this,
+					SLOT( toggleSolo() ) );
 	m_muteBtn->setWhatsThis(
 		tr( "With this switch you can either mute this track or mute "
 			"all other tracks.\nBy clicking left, this track is "
@@ -1128,9 +1128,9 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
 					setObjectName( "automationDisabled" );
 					setStyle( NULL );
 					m_muteBtn->setActiveGraphic(
-							*s_muteOnDisabled );
+							*s_muteOffEnabled );
 					m_muteBtn->setInactiveGraphic(
-							*s_muteOffDisabled );
+							*s_muteOnEnabled );
 				}
 			}
 			else
@@ -1141,9 +1141,9 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
 					setObjectName( "automationEnabled" );
 					setStyle( NULL );
 					m_muteBtn->setActiveGraphic(
-							*s_muteOnEnabled );
-					m_muteBtn->setInactiveGraphic(
 							*s_muteOffEnabled );
+					m_muteBtn->setInactiveGraphic(
+							*s_muteOnEnabled );
 				}
 			}
 		}
@@ -1191,7 +1191,7 @@ void trackOperationsWidget::setMuted( bool _muted )
 
 
 
-void trackOperationsWidget::muteBtnRightClicked( void )
+void trackOperationsWidget::toggleSolo( void )
 {
 	const bool m = muted();	// next function might modify our mute-state,
 				// so save it now

src/gui/fx_mixer_view.cpp

@@ -123,7 +123,7 @@ fxMixerView::fxMixerView() :
 	setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
 
 	setWindowTitle( tr( "FX-Mixer" ) );
-//	setWindowIcon( embed::getIconPixmap( "fxmixer" ) );
+	setWindowIcon( embed::getIconPixmap( "fx_mixer" ) );
 
 	m_fxLineBanks = new QStackedLayout;
 	m_fxLineBanks->setSpacing( 0 );

src/gui/main_window.cpp

@@ -317,7 +317,7 @@ void mainWindow::finalize( void )
 				) );
 
 	toolButton * fx_mixer_window = new toolButton(
-					embed::getIconPixmap( "effect_board" ),
+					embed::getIconPixmap( "fx_mixer" ),
 					tr( "Show/hide FX Mixer" ) + " (F11)",
 					this, SLOT( toggleFxMixerWin() ), m_toolBar );
 	fx_mixer_window->setShortcut( Qt::Key_F11 );

src/gui/widgets/pixmap_button.cpp

@@ -4,7 +4,7 @@
  * pixmap_button.cpp - implementation of pixmap-button (often used as "themed"
  *                     checkboxes/radiobuttons etc)
  *
- * Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,6 +30,7 @@
 #include <QtGui/QPainter>
 
 #include "pixmap_button.h"
+#include "main_window.h"
 #include "embed.h"
 
 
@@ -76,9 +77,10 @@ void pixmapButton::paintEvent( QPaintEvent * )
 
 void pixmapButton::mousePressEvent( QMouseEvent * _me )
 {
-	if( _me->button() == Qt::RightButton )
+	if( _me->button() == Qt::LeftButton &&
+				engine::getMainWindow()->isCtrlPressed() )
 	{
-		emit( clickedRight() );
+		emit( ctrlClick() );
 		_me->accept();
 	}
 	else

src/gui/widgets/project_notes.cpp

@@ -76,7 +76,8 @@ projectNotes::projectNotes( void ) :
 		engine::getMainWindow()->workspace()->addSubWindow( this );
 		parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
 		parentWidget()->move( 700, 10 );
-		parentWidget()->resize( 300, 200 );
+		parentWidget()->resize( 400, 300 );
+		parentWidget()->hide();
 	}
 	else
 	{

src/gui/widgets/tab_widget.cpp

@@ -149,23 +149,25 @@ void tabWidget::paintEvent( QPaintEvent * _pe )
 	setFont( pointSize<7>( font() ) );
 	QPainter p( this );
 
-	p.fillRect( 0, 0, width() - 1, height() - 1, QColor( 96, 96, 96 ) );
+	QColor bg_color = QApplication::palette().color( QPalette::Active,
+							QPalette::Background );
+	p.fillRect( 0, 0, width() - 1, height() - 1, bg_color.dark( 132 ) );
 
 	const int c = 0;
 	bool big_tab_captions = ( m_caption == "" );
 	int add = big_tab_captions ? 1 : 0;
 
-	p.setPen( QColor( 64, 64, 64 ) );
+	p.setPen( bg_color.dark( 200 ) );
 	p.drawRect( 0, 0, width() - 1 + c, height() - 1 + c );
 
-	p.setPen( QColor( 160, 160, 160 ) );
+	p.setPen( bg_color.light( 125 ) );
 	p.drawLine( width() - 1, 0, width() - 1, height() - 1 );
 	p.drawLine( 0, height() - 1, width() - 1, height() - 1 );
 
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawRect( 1, 1, width() - 3 + c, height() - 3 + c );
 
-	p.fillRect( 2, 2, width() - 4, 9 + add, QColor( 30, 45, 60 ) );
+	p.fillRect( 2, 2, width() - 4, 9 + add, bg_color.dark( 300 ) );
 	p.drawLine( 2, 11 + add, width() - 3, 11 + add );
 
 	if( !big_tab_captions )