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

Add more info to PKG install progress dialog

Browse source 
And fix installation of single packages
This commit is contained in:
Megamouse 2020-11-19 20:18:50 +01:00
parent 4d50d9daa4
commit df94c906da
2 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

46
rpcs3/rpcs3qt/main_window.cpp
View file

@ -565,16 +565,22 @@ void main_window::InstallPackages(QStringList file_paths)
std::vector<compat::package_info> infos; std::vector<compat::package_info> infos;
// Let the user choose the packages to install and select the order in which they shall be installed. game_compatibility* compat = m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr;
if (file_paths.size() > 1) if (file_paths.size() > 1)
{ {
pkg_install_dialog dlg(file_paths, m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr, this); // Let the user choose the packages to install and select the order in which they shall be installed.
pkg_install_dialog dlg(file_paths, compat, this);
connect(&dlg, &QDialog::accepted, [&infos, &dlg]() connect(&dlg, &QDialog::accepted, [&infos, &dlg]()
{ {
infos = dlg.GetPathsToInstall(); infos = dlg.GetPathsToInstall();
}); });
dlg.exec(); dlg.exec();
} }
else
{
infos.push_back(game_compatibility::GetPkgInfo(file_paths.front(), compat));
}
if (infos.empty()) if (infos.empty())
{ {
@ -614,16 +620,38 @@ void main_window::HandlePackageInstallation(const std::vector<compat::package_in
{ {
progress = 0.; progress = 0.;
const compat::package_info& package = packages.at(i);
QString app_info = package.title; // This should always be non-empty
if (!package.title_id.isEmpty() || !package.version.isEmpty())
{
app_info += QStringLiteral("\n");
if (!package.title_id.isEmpty())
{
app_info += package.title_id;
}
if (!package.version.isEmpty())
{
if (!package.title_id.isEmpty())
{
app_info += " ";
}
app_info += tr("v.%0", "Package version for install progress dialog").arg(package.version);
}
}
pdlg.SetValue(0); pdlg.SetValue(0);
pdlg.setLabelText(tr("Installing package (%0/%1), please wait...").arg(i + 1).arg(count)); pdlg.setLabelText(tr("Installing package (%0/%1), please wait...\n\n%2").arg(i + 1).arg(count).arg(app_info));
pdlg.show(); pdlg.show();
Emu.SetForceBoot(true); Emu.SetForceBoot(true);
Emu.Stop(); Emu.Stop();
const QString file_path = packages.at(i).path; const QFileInfo file_info(package.path);
const QFileInfo file_info(file_path); const std::string path = sstr(package.path);
const std::string path = sstr(file_path);
const std::string file_name = sstr(file_info.fileName()); const std::string file_name = sstr(file_info.fileName());
// Run PKG unpacking asynchronously // Run PKG unpacking asynchronously
@ -671,7 +699,7 @@ void main_window::HandlePackageInstallation(const std::vector<compat::package_in
if (worker()) if (worker())
{ {
m_game_list_frame->Refresh(true); m_game_list_frame->Refresh(true);
gui_log.success("Successfully installed %s.", file_name); gui_log.success("Successfully installed %s (title_id=%s, title=%s, version=%s).", file_name, sstr(package.title_id), sstr(package.title), sstr(package.version));
if (i == (count - 1)) if (i == (count - 1))
{ {
@ -685,12 +713,12 @@ void main_window::HandlePackageInstallation(const std::vector<compat::package_in
if (error == package_error::app_version) if (error == package_error::app_version)
{ {
gui_log.error("Cannot install %s.", file_name); gui_log.error("Cannot install %s.", file_name);
QMessageBox::warning(this, tr("Warning!"), tr("The following package cannot be installed on top of the current data:\n%1!").arg(file_path)); QMessageBox::warning(this, tr("Warning!"), tr("The following package cannot be installed on top of the current data:\n%1!").arg(package.path));
} }
else else
{ {
gui_log.error("Failed to install %s.", file_name); gui_log.error("Failed to install %s.", file_name);
QMessageBox::critical(this, tr("Failure!"), tr("Failed to install software from package:\n%1!").arg(file_path)); QMessageBox::critical(this, tr("Failure!"), tr("Failed to install software from package:\n%1!").arg(package.path));
} }
} }
return; return;

2
rpcs3/rpcs3qt/progress_dialog.cpp
View file

@ -15,7 +15,7 @@ progress_dialog::progress_dialog(const QString &windowTitle, const QString &labe
: QProgressDialog(labelText, cancelButtonText, minimum, maximum, parent, flags) : QProgressDialog(labelText, cancelButtonText, minimum, maximum, parent, flags)
{ {
setWindowTitle(windowTitle); setWindowTitle(windowTitle);
setFixedSize(QLabel("This is the very length of the progressdialog due to hidpi reasons.").sizeHint().width(), sizeHint().height()); setMinimumSize(QLabel("This is the very length of the progressdialog due to hidpi reasons.").sizeHint().width(), sizeHint().height());
setValue(0); setValue(0);
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);