improved artwork and maintoolbar

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

ChangeLog

@@ -1,3 +1,36 @@
+2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/gui/main_window.cpp:
+	* src/gui/song_editor.cpp:
+	* src/tracks/instrument_track.cpp:
+	* data/themes/default/edit_draw.png:
+	* data/themes/default/add_bb_track.png:
+	* data/themes/default/edit_arrow.png:
+	* data/themes/default/stop.png:
+	* data/themes/default/mute_off_disabled.png:
+	* data/themes/default/mute_on_disabled.png:
+	* data/themes/default/style.css:
+	* data/themes/default/play.png:
+	* data/themes/default/mute_on.png:
+	* data/themes/default/record.png:
+	* data/themes/default/automation.png:
+	* data/themes/default/help.png:
+	* data/themes/default/sample_track.png:
+	* data/themes/default/track_op_menu_disabled.png:
+	* data/themes/default/edit_select.png:
+	* data/themes/default/effect_board.png:
+	* data/themes/default/mute_off.png:
+	* data/themes/default/pause.png:
+	* data/themes/default/bb_track.png:
+	* data/themes/default/add_automation.png:
+	* data/themes/default/edit_erase.png:
+	* data/themes/default/record_accompany.png:
+	* data/themes/default/edit_move.png:
+	* data/themes/default/add_sample_track.png:
+	* data/themes/default/songeditor.png:
+	* data/themes/default/fx_mixer.png:
+	improved artwork and maintoolbar
+
 2008-06-28	Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* configure.in:

data/themes/default/style.css

@@ -93,13 +93,13 @@ QToolBar {
 QToolButton, toolButton {
 	padding: 2px 1px 1px 2px;
 	border-radius: 2px;
-	border: none;
+	border: 1px solid rgba(0,0,0,64);
 }
 
 QToolButton:hover {
-	background: rgba(255,255,255,96);
+	background: rgba(255,255,255,128);
 	border-radius: 3px;
-	border: 1px solid rgba(255,255,255,64);
+	border: 1px solid rgba(0,0,0,128);
 }
 
 QToolButton:pressed {

src/gui/main_window.cpp

@@ -220,6 +220,21 @@ void mainWindow::finalize( void )
 
 
 	// window-toolbar
+	toolButton * song_editor_window = new toolButton(
+					embed::getIconPixmap( "songeditor" ),
+					tr( "Show/hide Song-Editor" ) + " (F5)",
+					this, SLOT( toggleSongEditorWin() ),
+								m_toolBar );
+	song_editor_window->setShortcut( Qt::Key_F5 );
+	song_editor_window->setWhatsThis(
+		tr( "By pressing this button, you can show or hide the "
+			"Song-Editor. With the help of the Song-Editor you can "
+			"edit song-playlist and specify when which track "
+			"should be played. "
+			"You can also insert and move samples (e.g. "
+			"rap-samples) directly into the playlist." ) );
+
+
 	toolButton * bb_editor_window = new toolButton(
 					embed::getIconPixmap( "bb_track" ),
 					tr( "Show/hide Beat+Baseline Editor" ) +
@@ -249,29 +264,14 @@ void mainWindow::finalize( void )
 				"you can edit melody-patterns in an easy way."
 				) );
 
-	toolButton * song_editor_window = new toolButton(
-					embed::getIconPixmap( "songeditor" ),
-					tr( "Show/hide Song-Editor" ) + " (F8)",
-					this, SLOT( toggleSongEditorWin() ),
-								m_toolBar );
-	song_editor_window->setShortcut( Qt::Key_F8 );
-	song_editor_window->setWhatsThis(
-		tr( "By pressing this button, you can show or hide the "
-			"Song-Editor. With the help of the Song-Editor you can "
-			"edit song-playlist and specify when which track "
-			"should be played. "
-			"You can also insert and move samples (e.g. "
-			"rap-samples) directly into the playlist." ) );
-
-
 	toolButton * automation_editor_window = new toolButton(
 					embed::getIconPixmap( "automation" ),
 					tr( "Show/hide Automation Editor" ) +
-									" (F9)",
+									" (F8)",
 					this,
 					SLOT( toggleAutomationEditorWin() ),
 					m_toolBar );
-	automation_editor_window->setShortcut( Qt::Key_F9 );
+	automation_editor_window->setShortcut( Qt::Key_F8 );
 	automation_editor_window->setWhatsThis(
 			tr( "By pressing this button, you can show or hide the "
 				"Automation Editor. With the help of the "
@@ -281,9 +281,10 @@ void mainWindow::finalize( void )
 
 	toolButton * fx_mixer_window = new toolButton(
 					embed::getIconPixmap( "fx_mixer" ),
-					tr( "Show/hide FX Mixer" ) + " (F11)",
-					this, SLOT( toggleFxMixerWin() ), m_toolBar );
-	fx_mixer_window->setShortcut( Qt::Key_F11 );
+					tr( "Show/hide FX Mixer" ) + " (F9)",
+					this, SLOT( toggleFxMixerWin() ),
+					m_toolBar );
+	fx_mixer_window->setShortcut( Qt::Key_F9 );
 	fx_mixer_window->setWhatsThis( 
 		tr( "By pressing this button, you can show or hide the "
 			"FX Mixer. The FX Mixer is a very powerful tool "
@@ -302,9 +303,9 @@ void mainWindow::finalize( void )
 			"project notes window. In this window you can put "
 			"down your project notes.") );
 
-	m_toolBarLayout->addWidget( bb_editor_window, 1, 1 );
-	m_toolBarLayout->addWidget( piano_roll_window, 1, 2 );
-	m_toolBarLayout->addWidget( song_editor_window, 1, 3 );
+	m_toolBarLayout->addWidget( song_editor_window, 1, 1 );
+	m_toolBarLayout->addWidget( bb_editor_window, 1, 2 );
+	m_toolBarLayout->addWidget( piano_roll_window, 1, 3 );
 	m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
 	m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
 	m_toolBarLayout->addWidget( project_notes_window, 1, 6 );

src/gui/song_editor.cpp

@@ -250,7 +250,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_drawModeButton->setChecked( TRUE );
 
 	m_editModeButton = new toolButton( embed::getIconPixmap(
-								"edit_arrow" ),
+								"edit_select" ),
 					tr( "Edit mode (select and move)" ),
 							NULL, NULL, m_toolBar );
 	m_editModeButton->setCheckable( TRUE );

src/tracks/instrument_track.cpp

@@ -1485,7 +1485,7 @@ void instrumentTrackButton::paintEvent( QPaintEvent * _pe )
 					extra, height() / 2 + extra, in );
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawText( ( width() - QFontMetrics( p.font() ).width( n ) ) /
-				2 + extra, height() / 2 +
+				2 + extra, height() / 2 - 2 +
 				QFontMetrics( p.font() ).height() + extra, n );
 }