Queue file events for later

LMMS · Mar 14, 2017 · 5aceca1 · 5aceca1
1 parent 3299eb4
commit 5aceca1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 20 deletions.
diff --git a/include/MainApplication.h b/include/MainApplication.h
@@ -6,8 +6,14 @@
 class MainApplication : public QApplication
 {
 public:
-    MainApplication(int& argc, char * * argv);
-    bool event(QEvent *event);
+	MainApplication(int& argc, char** argv);
+	bool event(QEvent* event);
+	inline QString& queuedFile()
+	{
+	    return m_queuedFile;
+	}
+private:
+	QString m_queuedFile;
 };
 
 #endif // MAINAPPLICATION_H
diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -263,7 +263,7 @@ int main( int argc, char * * argv )
 
 	QCoreApplication * app = coreOnly ?
 			new QCoreApplication( argc, argv ) :
-                                        new MainApplication( argc, argv ) ;
+					new MainApplication( argc, argv );
 
 	Mixer::qualitySettings qs( Mixer::qualitySettings::Mode_HighQuality );
 	ProjectRenderer::OutputSettings os( 44100, false, 160,
@@ -842,6 +842,12 @@ int main( int argc, char * * argv )
 			gui->mainWindow()->showMaximized();
 		}
 
+		// Handle macOS-style FileOpen QEvents
+		QString queuedFile = static_cast<MainApplication *>( app )->queuedFile();
+		if ( !queuedFile.isEmpty() ) {
+			fileToLoad = queuedFile;
+		}
+
 		if( !fileToLoad.isEmpty() )
 		{
 			if( fileToLoad == recoveryFile )

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(LMMS_SRCS
 	gui/LfoControllerDialog.cpp
 	gui/LmmsPalette.cpp
 	gui/LmmsStyle.cpp
+        gui/MainApplication.cpp
 	gui/MainWindow.cpp
 	gui/MidiSetupWidget.cpp
 	gui/ModelView.cpp

diff --git a/src/gui/MainApplication.cpp b/src/gui/MainApplication.cpp
@@ -21,27 +21,47 @@
  * Boston, MA 02110-1301 USA.
  *
  */
+#include <QDebug>
 #include <QFileOpenEvent>
 
 #include "MainApplication.h"
+#include "GuiApplication.h"
+#include "MainWindow.h"
+#include "Engine.h"
+#include "Song.h"
 
+MainApplication::MainApplication(int& argc, char** argv) :
+	QApplication(argc, argv),
+	m_queuedFile() {}
 
-MainApplication::MainApplication( int& argc, char * * argv ) : QApplication( argc, argv ) {}
-
-boolean MainApplication::event( QEvent * event )
+bool MainApplication::event(QEvent* event)
 {
-    switch(event->type())
-    {
-            case QEvent::FileOpen:
-            {
-                    QFileOpenEvent * fileEvent = static_cast<QFileOpenEvent *>( event );
-                    if( event )
-                    {
-                            Engine::getSong()->loadProject( fileEvent->file() );
-                            return true;
-                    }
-            }
-            default:
-                    return QApplication::event( event );
-    }
+	switch(event->type())
+	{
+		case QEvent::FileOpen:
+		{
+			QFileOpenEvent * fileEvent = static_cast<QFileOpenEvent *>( event );
+			if(event)
+			{
+				// Handle the project file
+				m_queuedFile = fileEvent->file();
+				if(Engine::getSong())
+				{
+					if(gui->mainWindow()->mayChangeProject(true))
+					{
+						qDebug() << "Loading file " << m_queuedFile;
+						Engine::getSong()->loadProject(m_queuedFile);
+					}
+				}
+				else
+				{
+					qDebug() << "Queuing file " << m_queuedFile;
+				}
+				return true;
+			}
+			// Fall through to default
+		}
+		default:
+			return QApplication::event(event);
+	}
 }