hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 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

3
plugins/Eq/EqFader.h
View File

@@ -26,6 +26,7 @@
#include "Fader.h"
#include "EffectControls.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include "qwidget.h"
#include "TextFloat.h"
#include "qlist.h"
@@ -46,7 +47,7 @@ public:
resize( 23, 116 );
m_lPeak = lPeak;
m_rPeak = rPeak;
connect( Engine::mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( updateVuMeters() ) );
connect( gui->mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( updateVuMeters() ) );
m_model = model;
setPeak_L( 0 );
setPeak_R( 0 );

7
plugins/MidiImport/MidiImport.cpp
View File

@@ -37,6 +37,7 @@
#include "ConfigManager.h"
#include "Pattern.h"
#include "Instrument.h"
#include "GuiApplication.h"
#include "MainWindow.h"
#include "MidiTime.h"
#include "debug.h"
@@ -99,7 +100,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
if( Engine::hasGUI() &&
ConfigManager::inst()->defaultSoundfont().isEmpty() )
{
QMessageBox::information( Engine::mainWindow(),
QMessageBox::information( gui->mainWindow(),
tr( "Setup incomplete" ),
tr( "You do not have set up a default soundfont in "
"the settings dialog (Edit->Settings). "
@@ -111,7 +112,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
#else
if( Engine::hasGUI() )
{
QMessageBox::information( Engine::mainWindow(),
QMessageBox::information( gui->mainWindow(),
tr( "Setup incomplete" ),
tr( "You did not compile LMMS with support for "
"SoundFont2 player, which is used to add default "
@@ -268,7 +269,7 @@ bool MidiImport::readSMF( TrackContainer* tc )
const int preTrackSteps = 2;
QProgressDialog pd( TrackContainer::tr( "Importing MIDI-file..." ),
TrackContainer::tr( "Cancel" ), 0, preTrackSteps, Engine::mainWindow() );
TrackContainer::tr( "Cancel" ), 0, preTrackSteps, gui->mainWindow() );
pd.setWindowTitle( TrackContainer::tr( "Please wait..." ) );
pd.setWindowModality(Qt::WindowModal);
pd.setMinimumDuration( 0 );

3
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

@@ -27,6 +27,7 @@
#include "SpectrumAnalyzer.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include "LedCheckbox.h"
#include "embed.h"
@@ -59,7 +60,7 @@ public:
m_background( PLUGIN_NAME::getIconPixmap( "spectrum_background" ).toImage() )
{
setFixedSize( 249, 151 );
connect( Engine::mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( update() ) );
connect( gui->mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( update() ) );
setAttribute( Qt::WA_OpaquePaintEvent, true );
}

3
plugins/VstEffect/VstEffectControls.cpp
View File

@@ -28,6 +28,7 @@
#include "VstEffect.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include <QMdiArea>
#include <QApplication>
@@ -309,7 +310,7 @@ manageVSTEffectView::manageVSTEffectView( VstEffect * _eff, VstEffectControls *
m_vi->m_scrollArea = new QScrollArea( widget );
l = new QGridLayout( widget );
m_vi->m_subWindow = Engine::mainWindow()->workspace()->addSubWindow(new QMdiSubWindow, Qt::SubWindow |
m_vi->m_subWindow = gui->mainWindow()->workspace()->addSubWindow(new QMdiSubWindow, Qt::SubWindow |
Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
m_vi->m_subWindow->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
m_vi->m_subWindow->setFixedSize( 960, 300);

5
plugins/flp_import/FlpImport.cpp
View File

@@ -43,6 +43,7 @@
#include "FxMixer.h"
#include "FxMixerView.h"
#include "GroupBox.h"
#include "GuiApplication.h"
#include "Instrument.h"
#include "InstrumentTrack.h"
#include "EnvelopeAndLfoParameters.h"
@@ -1418,7 +1419,7 @@ else
{
Engine::fxMixer()->createChannel();
}
Engine::fxMixerView()->refreshDisplay();
gui->fxMixerView()->refreshDisplay();
// set global parameters
Engine::getSong()->setMasterVolume( p.mainVolume );
@@ -1426,7 +1427,7 @@ else
Engine::getSong()->setTempo( p.tempo );
// set project notes
Engine::getProjectNotes()->setText( p.projectNotes );
gui->getProjectNotes()->setText( p.projectNotes );
progressDialog.setMaximum( p.maxPatterns + p.channels.size() +

3
plugins/vestige/vestige.cpp
View File

@@ -38,6 +38,7 @@
#include "InstrumentTrack.h"
#include "VstPlugin.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include "PixmapButton.h"
#include "StringPairDrag.h"
#include "TextFloat.h"
@@ -873,7 +874,7 @@ manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrume
widget = new QWidget(this);
l = new QGridLayout( this );
m_vi->m_subWindow = Engine::mainWindow()->workspace()->addSubWindow(new QMdiSubWindow, Qt::SubWindow |
m_vi->m_subWindow = gui->mainWindow()->workspace()->addSubWindow(new QMdiSubWindow, Qt::SubWindow |
Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
m_vi->m_subWindow->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::MinimumExpanding );
m_vi->m_subWindow->setFixedWidth( 960 );

6
plugins/vst_base/VstPlugin.cpp
View File

@@ -46,7 +46,7 @@
#endif
#include "ConfigManager.h"
#include "Engine.h"
#include "GuiApplication.h"
#include "MainWindow.h"
#include "Song.h"
#include "templates.h"
@@ -189,7 +189,7 @@ void VstPlugin::tryLoad( const QString &remoteVstPluginExecutable )
{
target->setFixedSize( m_pluginGeometry );
vstSubWin * sw = new vstSubWin(
Engine::mainWindow()->workspace() );
gui->mainWindow()->workspace() );
sw->setWidget( helper );
helper->setWindowTitle( name() );
m_pluginWidget = helper;
@@ -238,7 +238,7 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
if( _parent == NULL )
{
vstSubWin * sw = new vstSubWin(
Engine::mainWindow()->workspace() );
gui->mainWindow()->workspace() );
if( isEffect )
{
sw->setAttribute( Qt::WA_TranslucentBackground );