archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: Prevent Qt from blocking the explorer during installations

Browse source
This commit is contained in:
Megamouse 2020-01-28 22:04:43 +01:00
parent 360e484b08
commit 336cd6e33a
2 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rpcs3/rpcs3qt/main_window.cpp
View file

@ -397,6 +397,18 @@ void main_window::InstallPackages(QStringList file_paths, bool show_confirm)
} }
} }
if (!file_paths.isEmpty())
{
// Handle the actual installations with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
QTimer::singleShot(0, [this, file_paths]()
{
HandlePackageInstallation(file_paths);
});
}
}
void main_window::HandlePackageInstallation(QStringList file_paths)
{
if (file_paths.isEmpty()) if (file_paths.isEmpty())
{ {
return; return;
@ -490,24 +502,36 @@ void main_window::InstallPackages(QStringList file_paths, bool show_confirm)
} }
} }
void main_window::InstallPup(QString filePath) void main_window::InstallPup(QString file_path)
{ {
if (filePath.isEmpty()) if (file_path.isEmpty())
{ {
QString path_last_PUP = guiSettings->GetValue(gui::fd_install_pup).toString(); QString path_last_PUP = guiSettings->GetValue(gui::fd_install_pup).toString();
filePath = QFileDialog::getOpenFileName(this, tr("Select PS3UPDAT.PUP To Install"), path_last_PUP, tr("PS3 update file (PS3UPDAT.PUP);;All pup files (*.pup);;All files (*.*)")); file_path = QFileDialog::getOpenFileName(this, tr("Select PS3UPDAT.PUP To Install"), path_last_PUP, tr("PS3 update file (PS3UPDAT.PUP);;All pup files (*.pup);;All files (*.*)"));
} }
else else
{ {
if (QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Install firmware: %1?").arg(filePath), if (QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Install firmware: %1?").arg(file_path),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
{ {
LOG_NOTICE(LOADER, "Firmware: Cancelled installation from drop. File: %s", sstr(filePath)); LOG_NOTICE(LOADER, "Firmware: Cancelled installation from drop. File: %s", sstr(file_path));
return; return;
} }
} }
if (filePath.isEmpty()) if (!file_path.isEmpty())
{
// Handle the actual installation with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
QTimer::singleShot(0, [this, file_path]()
{
HandlePupInstallation(file_path);
});
}
}
void main_window::HandlePupInstallation(QString file_path)
{
if (file_path.isEmpty())
{ {
return; return;
} }
@ -515,8 +539,8 @@ void main_window::InstallPup(QString filePath)
Emu.SetForceBoot(true); Emu.SetForceBoot(true);
Emu.Stop(); Emu.Stop();
guiSettings->SetValue(gui::fd_install_pup, QFileInfo(filePath).path()); guiSettings->SetValue(gui::fd_install_pup, QFileInfo(file_path).path());
const std::string path = sstr(filePath); const std::string path = sstr(file_path);
fs::file pup_f(path); fs::file pup_f(path);
if (!pup_f) if (!pup_f)

4
rpcs3/rpcs3qt/main_window.h
View file

@ -117,8 +117,12 @@ private:
void CreateDockWindows(); void CreateDockWindows();
void EnableMenus(bool enabled); void EnableMenus(bool enabled);
void ShowTitleBars(bool show); void ShowTitleBars(bool show);
void InstallPackages(QStringList file_paths = QStringList(), bool show_confirm = true); void InstallPackages(QStringList file_paths = QStringList(), bool show_confirm = true);
void HandlePackageInstallation(QStringList file_paths = QStringList());
void InstallPup(QString filePath = ""); void InstallPup(QString filePath = "");
void HandlePupInstallation(QString file_path = "");
int IsValidFile(const QMimeData& md, QStringList* dropPaths = nullptr); int IsValidFile(const QMimeData& md, QStringList* dropPaths = nullptr);
void AddGamesFromDir(const QString& path); void AddGamesFromDir(const QString& path);