mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 09:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add boot test menu entry

Browse Source
This commit is contained in:
RipleyTom 2022-06-03 00:03:31 +02:00 committed by Megamouse
parent 26045a9be5
commit 2010d697c8
4 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/CMakeLists.txt
View File

@ -210,4 +210,6 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
install(DIRECTORY ../bin/git install(DIRECTORY ../bin/git
DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
install(DIRECTORY ../bin/test
DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
endif() endif()

41
rpcs3/rpcs3qt/main_window.cpp
View File

@ -472,6 +472,46 @@ void main_window::BootElf()
Boot(path, "", true); Boot(path, "", true);
} }
void main_window::BootTest()
{
bool stopped = false;
if (Emu.IsRunning())
{
Emu.Pause();
stopped = true;
}
#ifdef _WIN32
const QString path_tests = QString::fromStdString(fs::get_config_dir()) + "/test/";
#elif defined(__linux__)
const QString path_tests = QCoreApplication::applicationDirPath() + "/../share/rpcs3/test/";
#else
const QString path_tests = QCoreApplication::applicationDirPath() + "/../Resources/test/";
#endif
const QString file_path = QFileDialog::getOpenFileName(this, tr("Select (S)ELF To Boot"), path_tests, tr(
"(S)ELF files (*.elf *.self);;"
"ELF files (*.elf);;"
"SELF files (*.self);;"
"All files (*.*)"),
Q_NULLPTR, QFileDialog::DontResolveSymlinks);
if (file_path.isEmpty())
{
if (stopped)
{
Emu.Resume();
}
return;
}
const std::string path = sstr(QFileInfo(file_path).absoluteFilePath());
gui_log.notice("Booting from BootTest...");
Boot(path, "", true);
}
void main_window::BootGame() void main_window::BootGame()
{ {
bool stopped = false; bool stopped = false;
@ -1903,6 +1943,7 @@ void main_window::CreateActions()
void main_window::CreateConnects() void main_window::CreateConnects()
{ {
connect(ui->bootElfAct, &QAction::triggered, this, &main_window::BootElf); connect(ui->bootElfAct, &QAction::triggered, this, &main_window::BootElf);
connect(ui->bootTestAct, &QAction::triggered, this, &main_window::BootTest);
connect(ui->bootGameAct, &QAction::triggered, this, &main_window::BootGame); connect(ui->bootGameAct, &QAction::triggered, this, &main_window::BootGame);
connect(ui->bootVSHAct, &QAction::triggered, this, &main_window::BootVSH); connect(ui->bootVSHAct, &QAction::triggered, this, &main_window::BootVSH);
connect(ui->actionopen_rsx_capture, &QAction::triggered, this, [this](){ BootRsxCapture(); }); connect(ui->actionopen_rsx_capture, &QAction::triggered, this, [this](){ BootRsxCapture(); });

1
rpcs3/rpcs3qt/main_window.h
View File

@ -109,6 +109,7 @@ private Q_SLOTS:
void OnPlayOrPause(); void OnPlayOrPause();
void Boot(const std::string& path, const std::string& title_id = "", bool direct = false, bool add_only = false, cfg_mode config_mode = cfg_mode::custom, const std::string& config_path = ""); void Boot(const std::string& path, const std::string& title_id = "", bool direct = false, bool add_only = false, cfg_mode config_mode = cfg_mode::custom, const std::string& config_path = "");
void BootElf(); void BootElf();
void BootTest();
void BootGame(); void BootGame();
void BootVSH(); void BootVSH();
void BootRsxCapture(std::string path = ""); void BootRsxCapture(std::string path = "");

20
rpcs3/rpcs3qt/main_window.ui
View File

@ -151,6 +151,19 @@
<property name="title"> <property name="title">
<string>File</string> <string>File</string>
</property> </property>
<widget class="QMenu" name="bootElfMenu">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Boot (S)Elf</string>
</property>
<property name="toolTipsVisible">
<bool>true</bool>
</property>
<addaction name="bootElfAct"/>
<addaction name="bootTestAct"/>
</widget>
<widget class="QMenu" name="bootRecentMenu"> <widget class="QMenu" name="bootRecentMenu">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -186,9 +199,9 @@
<addaction name="createFirmwareCacheAct"/> <addaction name="createFirmwareCacheAct"/>
<addaction name="removeFirmwareCacheAct"/> <addaction name="removeFirmwareCacheAct"/>
</widget> </widget>
<addaction name="bootElfAct"/>
<addaction name="bootGameAct"/> <addaction name="bootGameAct"/>
<addaction name="bootVSHAct"/> <addaction name="bootVSHAct"/>
<addaction name="bootElfMenu"/>
<addaction name="bootRecentMenu"/> <addaction name="bootRecentMenu"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="addGamesAct"/> <addaction name="addGamesAct"/>
@ -400,6 +413,11 @@
<string>Boot SELF/ELF</string> <string>Boot SELF/ELF</string>
</property> </property>
</action> </action>
<action name="bootTestAct">
<property name="text">
<string>Boot Test</string>
</property>
</action>
<action name="bootGameAct"> <action name="bootGameAct">
<property name="text"> <property name="text">
<string>Boot Game</string> <string>Boot Game</string>