diff --git a/include/MainWindow.h b/include/MainWindow.h index a76fc320c..6335c6401 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -1,7 +1,7 @@ /* * main_window.h - declaration of class MainWindow, the main window of LMMS * - * Copyright (c) 2004-2008 Tobias Doerffel + * Copyright (c) 2004-2013 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -106,7 +106,7 @@ public slots: void aboutLMMS( void ); void help( void ); void toggleAutomationEditorWin( void ); - void toggleBBEditorWin( void ); + void toggleBBEditorWin( bool forceShow = false ); void toggleSongEditorWin( void ); void toggleProjectNotesWin( void ); void toggleFxMixerWin( void ); @@ -132,7 +132,7 @@ private: void finalize( void ); - void toggleWindow( QWidget * _w ); + void toggleWindow( QWidget *window, bool forceShow = false ); QMdiArea * m_workspace; diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 8a70355fd..98bf7e408 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * main_window.cpp - implementation of LMMS-main-window * - * Copyright (c) 2004-2011 Tobias Doerffel + * Copyright (c) 2004-2013 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -810,16 +808,17 @@ void MainWindow::help( void ) -void MainWindow::toggleWindow( QWidget * _w ) +void MainWindow::toggleWindow( QWidget *window, bool forceShow ) { - QWidget * parent = _w->parentWidget(); + QWidget *parent = window->parentWidget(); - if( m_workspace->activeSubWindow() != parent - || parent->isHidden() ) + if( forceShow || + m_workspace->activeSubWindow() != parent || + parent->isHidden() ) { parent->show(); - _w->show(); - _w->setFocus(); + window->show(); + window->setFocus(); } else { @@ -836,9 +835,9 @@ void MainWindow::toggleWindow( QWidget * _w ) -void MainWindow::toggleBBEditorWin( void ) +void MainWindow::toggleBBEditorWin( bool forceShow ) { - toggleWindow( engine::getBBEditor() ); + toggleWindow( engine::getBBEditor(), forceShow ); } @@ -1072,5 +1071,3 @@ void MainWindow::autoSave() #include "moc_MainWindow.cxx" - -#endif