From 1a0df6c5a6c273e9255d132eb4f6a303f9b24a62 Mon Sep 17 00:00:00 2001
From: Paul Giblock <drfaygo@gmail.com>
Date: Tue, 29 Apr 2008 23:51:10 +0000
Subject: [PATCH] Add FX Mixer button to main toolbar

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@947 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog               |  6 ++++++
 include/main_window.h   |  1 +
 src/gui/main_window.cpp | 33 ++++++++++++++++++---------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7bb0308c9..83665052f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-29	Paul Giblock	<drfaygo/at/gmail/dot/com>
+
+	* include/main_window.h:
+	* src/gui/main_window.cpp:
+	Add button for toggling FX Window.  Can use a better icon.
+
 2008-04-28	Paul Giblock	<drfaygo/at/gmail/dot/com>
 
 	* plugins/sf2_player/sf2_player.cpp:
diff --git a/include/main_window.h b/include/main_window.h
index 95bc66409..fbff593c3 100644
--- a/include/main_window.h
+++ b/include/main_window.h
@@ -110,6 +110,7 @@ public slots:
 	void toggleBBEditorWin( void );
 	void toggleSongEditorWin( void );
 	void toggleProjectNotesWin( void );
+	void toggleFxMixerWin( void );
 	void togglePianoRollWin( void );
 
 	void undo( void );
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index cabfb33e6..99a64b4d2 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -52,6 +52,7 @@
 #include "piano_roll.h"
 #include "embed.h"
 #include "engine.h"
+#include "fx_mixer_view.h" 
 #include "about_dialog.h"
 #include "file_browser.h"
 #include "plugin_browser.h"
@@ -315,21 +316,16 @@ void mainWindow::finalize( void )
 				"in an easy way."
 				) );
 
-//TODO: Relocate effect board button
-/*	toolButton * effect_board_window = new toolButton(
+	toolButton * fx_mixer_window = new toolButton(
 					embed::getIconPixmap( "effect_board" ),
-					tr( "Show/hide EffectBoard" ) + " (F9)",
-					this, SLOT( emptySlot() ), m_toolBar );
-	effect_board_window->setShortcut( Qt::Key_F9 );
-#ifdef QT4
-	effect_board_window->setWhatsThis( 
-#else
-	QWhatsThis::add( effect_board_window,
-#endif
+					tr( "Show/hide FX Mixer" ) + " (F11)",
+					this, SLOT( toggleFxMixerWin() ), m_toolBar );
+	fx_mixer_window->setShortcut( Qt::Key_F11 );
+	fx_mixer_window->setWhatsThis( 
 		tr( "By pressing this button, you can show or hide the "
-			"EffectBoard. The EffectBoard is a very powerful tool "
+			"FX Mixer. The FX Mixer is a very powerful tool "
 			"for managing effects for your song. You can insert "
-			"effects into different effect-channels." ) );*/
+			"effects into different effect-channels." ) );
 
 	toolButton * project_notes_window = new toolButton(
 					embed::getIconPixmap( "project_notes" ),
@@ -347,9 +343,8 @@ void mainWindow::finalize( void )
 	m_toolBarLayout->addWidget( piano_roll_window, 1, 2 );
 	m_toolBarLayout->addWidget( song_editor_window, 1, 3 );
 	m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
-//TODO: Relocate effect board
-	//m_toolBarLayout->addWidget( effect_board_window, 1, 4 );
-	m_toolBarLayout->addWidget( project_notes_window, 1, 5 );
+	m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
+	m_toolBarLayout->addWidget( project_notes_window, 1, 6 );
 
 	m_toolBarLayout->setColumnStretch( 100, 1 );
 
@@ -843,6 +838,14 @@ void mainWindow::toggleAutomationEditorWin( void )
 
 
 
+void mainWindow::toggleFxMixerWin( void )
+{
+	toggleWindow( engine::getFxMixerView() );
+}
+
+
+
+
 void mainWindow::undo( void )
 {
 	engine::getProjectJournal()->undo();