mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small main_window refactoring. Fixed one of the guiconfig crashes too somehow.

Browse Source
This commit is contained in:
Robbie 2017-07-13 19:21:40 -05:00 committed by Ivan
parent 3df960bb52
commit eb80b7ec34
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/rpcs3_app.cpp
View File

@ -68,6 +68,8 @@ void rpcs3_app::Init()
// Create connects to propagate events throughout Gui. // Create connects to propagate events throughout Gui.
InitializeConnects(); InitializeConnects();
RPCS3MainWin->Init();
setApplicationName("RPCS3"); setApplicationName("RPCS3");
RPCS3MainWin->show(); RPCS3MainWin->show();

39
rpcs3/rpcs3qt/main_window.cpp
View File

@ -47,6 +47,25 @@
inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); } inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_opened(false), ui(new Ui::main_window) main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_opened(false), ui(new Ui::main_window)
{
}
main_window::~main_window()
{
}
auto Pause = []()
{
if (Emu.IsReady()) Emu.Run();
else if (Emu.IsPaused()) Emu.Resume();
else if (Emu.IsRunning()) Emu.Pause();
else if (!Emu.GetPath().empty()) Emu.Load();
};
/* An init method is used so that RPCS3App can create the necessary connects before calling init (specifically the stylesheet connect).
* Simplifies logic a bit.
*/
void main_window::Init()
{ {
ui->setupUi(this); ui->setupUi(this);
@ -87,26 +106,10 @@ main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_open
setWindowTitle(QString::fromStdString("RPCS3 v" + rpcs3::version.to_string())); setWindowTitle(QString::fromStdString("RPCS3 v" + rpcs3::version.to_string()));
!appIcon.isNull() ? setWindowIcon(appIcon) : LOG_WARNING(GENERAL, "AppImage could not be loaded!"); !appIcon.isNull() ? setWindowIcon(appIcon) : LOG_WARNING(GENERAL, "AppImage could not be loaded!");
QTimer::singleShot(1, [=]() { RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath());
// Need to have this happen fast, but not now because connects aren't created yet. ConfigureGuiFromSettings(true);
// So, a tricky balance in terms of time but this works.
RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath());
ConfigureGuiFromSettings(true);
});
} }
main_window::~main_window()
{
}
auto Pause = []()
{
if (Emu.IsReady()) Emu.Run();
else if (Emu.IsPaused()) Emu.Resume();
else if (Emu.IsRunning()) Emu.Pause();
else if (!Emu.GetPath().empty()) Emu.Load();
};
void main_window::CreateThumbnailToolbar() void main_window::CreateThumbnailToolbar()
{ {
#ifdef _WIN32 #ifdef _WIN32

1
rpcs3/rpcs3qt/main_window.h
View File

@ -55,6 +55,7 @@ class main_window : public QMainWindow
public: public:
explicit main_window(QWidget *parent = 0); explicit main_window(QWidget *parent = 0);
void Init();
~main_window(); ~main_window();
void CreateThumbnailToolbar(); void CreateThumbnailToolbar();
QIcon GetAppIcon(); QIcon GetAppIcon();