mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	qt: Add support for opening files directly on macOS. (#7304)
* Associate 3ds files with Citra in Info.plist * qt: Add support for opening files directly on macOS. --------- Co-authored-by: shinra-electric <50119606+shinra-electric@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									9b147d3f9c
								
							
						
					
					
						commit
						36db566428
					
				
					 3 changed files with 66 additions and 0 deletions
				
			
		|  | @ -229,6 +229,7 @@ GMainWindow::GMainWindow(Core::System& system_) | |||
|     SetDefaultUIGeometry(); | ||||
|     RestoreUIState(); | ||||
| 
 | ||||
|     ConnectAppEvents(); | ||||
|     ConnectMenuEvents(); | ||||
|     ConnectWidgetEvents(); | ||||
| 
 | ||||
|  | @ -761,6 +762,21 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { | |||
|     } | ||||
| } | ||||
| 
 | ||||
| bool GApplicationEventFilter::eventFilter(QObject* object, QEvent* event) { | ||||
|     if (event->type() == QEvent::FileOpen) { | ||||
|         emit FileOpen(static_cast<QFileOpenEvent*>(event)); | ||||
|         return true; | ||||
|     } | ||||
|     return false; | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::ConnectAppEvents() { | ||||
|     const auto filter = new GApplicationEventFilter(); | ||||
|     QGuiApplication::instance()->installEventFilter(filter); | ||||
| 
 | ||||
|     connect(filter, &GApplicationEventFilter::FileOpen, this, &GMainWindow::OnFileOpen); | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::ConnectWidgetEvents() { | ||||
|     connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile); | ||||
|     connect(game_list, &GameList::OpenDirectory, this, &GMainWindow::OnGameListOpenDirectory); | ||||
|  | @ -2752,6 +2768,10 @@ bool GMainWindow::DropAction(QDropEvent* event) { | |||
|     return true; | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::OnFileOpen(const QFileOpenEvent* event) { | ||||
|     BootGame(event->file()); | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::dropEvent(QDropEvent* event) { | ||||
|     DropAction(event); | ||||
| } | ||||
|  |  | |||
|  | @ -41,6 +41,7 @@ class LoadingScreen; | |||
| class MicroProfileDialog; | ||||
| class MultiplayerState; | ||||
| class ProfilerWidget; | ||||
| class QFileOpenEvent; | ||||
| template <typename> | ||||
| class QFutureWatcher; | ||||
| class QLabel; | ||||
|  | @ -96,6 +97,8 @@ public: | |||
|     bool DropAction(QDropEvent* event); | ||||
|     void AcceptDropEvent(QDropEvent* event); | ||||
| 
 | ||||
|     void OnFileOpen(const QFileOpenEvent* event); | ||||
| 
 | ||||
|     void UninstallTitles( | ||||
|         const std::vector<std::tuple<Service::FS::MediaType, u64, QString>>& titles); | ||||
| 
 | ||||
|  | @ -137,6 +140,7 @@ private: | |||
|     void SyncMenuUISettings(); | ||||
|     void RestoreUIState(); | ||||
| 
 | ||||
|     void ConnectAppEvents(); | ||||
|     void ConnectWidgetEvents(); | ||||
|     void ConnectMenuEvents(); | ||||
|     void UpdateMenuState(); | ||||
|  | @ -382,5 +386,15 @@ protected: | |||
|     void mouseReleaseEvent(QMouseEvent* event) override; | ||||
| }; | ||||
| 
 | ||||
| class GApplicationEventFilter : public QObject { | ||||
|     Q_OBJECT | ||||
| 
 | ||||
| signals: | ||||
|     void FileOpen(const QFileOpenEvent* event); | ||||
| 
 | ||||
| protected: | ||||
|     bool eventFilter(QObject* object, QEvent* event) override; | ||||
| }; | ||||
| 
 | ||||
| Q_DECLARE_METATYPE(std::size_t); | ||||
| Q_DECLARE_METATYPE(Service::AM::InstallStatus); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue