mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-01 21:04:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gui_application' into ed_refac

Browse Source 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
This commit is contained in:
Lukas W
2015-01-07 00:03:32 +01:00
parent 0c4833ca4a 0df3998f95
commit 748cccd266
48 changed files with 436 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/gui/MainWindow.cpp
View File

@@ -22,6 +22,7 @@
*
*/
#include "MainWindow.h"
#include <QDomElement>
#include <QUrl>
@@ -36,7 +37,7 @@
#include <QWhatsThis>
#include "lmmsversion.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include "BBEditor.h"
#include "SongEditor.h"
#include "Song.h"
@@ -533,10 +534,10 @@ void MainWindow::finalize()
// Add editor subwindows
for (QWidget* widget : QList<QWidget*>{
Engine::automationEditor(),
Engine::getBBEditor(),
Engine::pianoRoll(),
Engine::songEditor()
gui->automationEditor(),
gui->getBBEditor(),
gui->pianoRoll(),
gui->songEditor()
})
{
QMdiSubWindow* window = workspace()->addSubWindow(widget);
@@ -545,13 +546,13 @@ void MainWindow::finalize()
window->resize(widget->sizeHint());
}
Engine::automationEditor()->parentWidget()->hide();
Engine::getBBEditor()->parentWidget()->move( 610, 5 );
Engine::getBBEditor()->parentWidget()->show();
Engine::pianoRoll()->parentWidget()->move(5, 5);
Engine::pianoRoll()->parentWidget()->hide();
Engine::songEditor()->parentWidget()->move(5, 5);
Engine::songEditor()->parentWidget()->show();
gui->automationEditor()->parentWidget()->hide();
gui->getBBEditor()->parentWidget()->move( 610, 5 );
gui->getBBEditor()->parentWidget()->show();
gui->pianoRoll()->parentWidget()->move(5, 5);
gui->pianoRoll()->parentWidget()->hide();
gui->songEditor()->parentWidget()->move(5, 5);
gui->songEditor()->parentWidget()->show();
// reset window title every time we change the state of a subwindow to show the correct title
foreach( QMdiSubWindow * subWindow, workspace()->subWindowList() )
@@ -878,7 +879,7 @@ void MainWindow::showSettingsDialog()
void MainWindow::aboutLMMS()
{
AboutDialog().exec();
AboutDialog(this).exec();
}
@@ -935,10 +936,10 @@ void MainWindow::refocus()
{
QList<QWidget*> editors;
editors
<< Engine::songEditor()->parentWidget()
<< Engine::getBBEditor()->parentWidget()
<< Engine::pianoRoll()->parentWidget()
<< Engine::automationEditor()->parentWidget();
<< gui->songEditor()->parentWidget()
<< gui->getBBEditor()->parentWidget()
<< gui->pianoRoll()->parentWidget()
<< gui->automationEditor()->parentWidget();
bool found = false;
QList<QWidget*>::Iterator editor;
@@ -960,7 +961,7 @@ void MainWindow::refocus()
void MainWindow::toggleBBEditorWin( bool forceShow )
{
toggleWindow( Engine::getBBEditor(), forceShow );
toggleWindow( gui->getBBEditor(), forceShow );
}
@@ -968,7 +969,7 @@ void MainWindow::toggleBBEditorWin( bool forceShow )
void MainWindow::toggleSongEditorWin()
{
toggleWindow( Engine::songEditor() );
toggleWindow( gui->songEditor() );
}
@@ -976,7 +977,7 @@ void MainWindow::toggleSongEditorWin()
void MainWindow::toggleProjectNotesWin()
{
toggleWindow( Engine::getProjectNotes() );
toggleWindow( gui->getProjectNotes() );
}
@@ -984,7 +985,7 @@ void MainWindow::toggleProjectNotesWin()
void MainWindow::togglePianoRollWin()
{
toggleWindow( Engine::pianoRoll() );
toggleWindow( gui->pianoRoll() );
}
@@ -992,7 +993,7 @@ void MainWindow::togglePianoRollWin()
void MainWindow::toggleAutomationEditorWin()
{
toggleWindow( Engine::automationEditor() );
toggleWindow( gui->automationEditor() );
}
@@ -1000,7 +1001,7 @@ void MainWindow::toggleAutomationEditorWin()
void MainWindow::toggleFxMixerWin()
{
toggleWindow( Engine::fxMixerView() );
toggleWindow( gui->fxMixerView() );
}
@@ -1008,7 +1009,7 @@ void MainWindow::toggleFxMixerWin()
void MainWindow::toggleControllerRack()
{
toggleWindow( Engine::getControllerRackView() );
toggleWindow( gui->getControllerRackView() );
}
@@ -1016,29 +1017,29 @@ void MainWindow::toggleControllerRack()
void MainWindow::updatePlayPauseIcons()
{
Engine::songEditor()->setPauseIcon( false );
Engine::automationEditor()->setPauseIcon( false );
Engine::getBBEditor()->setPauseIcon( false );
Engine::pianoRoll()->setPauseIcon( false );
gui->songEditor()->setPauseIcon( false );
gui->automationEditor()->setPauseIcon( false );
gui->getBBEditor()->setPauseIcon( false );
gui->pianoRoll()->setPauseIcon( false );
if( Engine::getSong()->isPlaying() )
{
switch( Engine::getSong()->playMode() )
{
case Song::Mode_PlaySong:
Engine::songEditor()->setPauseIcon( true );
gui->songEditor()->setPauseIcon( true );
break;
case Song::Mode_PlayAutomationPattern:
Engine::automationEditor()->setPauseIcon( true );
gui->automationEditor()->setPauseIcon( true );
break;
case Song::Mode_PlayBB:
Engine::getBBEditor()->setPauseIcon( true );
gui->getBBEditor()->setPauseIcon( true );
break;
case Song::Mode_PlayPattern:
Engine::pianoRoll()->setPauseIcon( true );
gui->pianoRoll()->setPauseIcon( true );
break;
default: