From afd06675fa2b93c81f0f868443c03cc3ad8bee07 Mon Sep 17 00:00:00 2001 From: archshift Date: Mon, 31 Aug 2015 18:30:06 -0700 Subject: Don't show render window until a game is started --- src/citra_qt/main.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/citra_qt/main.h') diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 32523fded..e99501cab 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -102,6 +102,8 @@ private: GRenderWindow* render_window; + // Whether emulation is currently running in Citra. + bool emulation_running = false; std::unique_ptr emu_thread; ProfilerWidget* profilerWidget; -- cgit v1.2.3 From 6e1bb58ee8ace739615e42cff02f07ee396edb6e Mon Sep 17 00:00:00 2001 From: archshift Date: Mon, 31 Aug 2015 21:35:33 -0700 Subject: Initial implementation of a game list --- src/citra_qt/main.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/citra_qt/main.h') diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index e99501cab..48a1032bd 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -10,6 +10,7 @@ #include "ui_main.h" +class GameList; class GImageInfo; class GRenderWindow; class EmuThread; @@ -87,6 +88,8 @@ private slots: void OnStartGame(); void OnPauseGame(); void OnStopGame(); + /// Called whenever a user selects a game in the game list widget. + void OnGameListLoadFile(QString game_path); void OnMenuLoadFile(); void OnMenuLoadSymbolMap(); void OnMenuRecentFile(); @@ -101,6 +104,7 @@ private: Ui::MainWindow ui; GRenderWindow* render_window; + GameList* game_list; // Whether emulation is currently running in Citra. bool emulation_running = false; -- cgit v1.2.3 From 797b91a449c549995ab4afe786275b02b3e1ab87 Mon Sep 17 00:00:00 2001 From: archshift Date: Sun, 6 Sep 2015 15:33:57 -0700 Subject: Add menu item for selecting the game list folder --- src/citra_qt/main.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/citra_qt/main.h') diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 48a1032bd..6d27ce6a9 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -92,6 +92,8 @@ private slots: void OnGameListLoadFile(QString game_path); void OnMenuLoadFile(); void OnMenuLoadSymbolMap(); + /// Called whenever a user selects the "File->Select Game List Root" menu item + void OnMenuSelectGameListRoot(); void OnMenuRecentFile(); void OnOpenHotkeysDialog(); void OnConfigure(); -- cgit v1.2.3