RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Qt: implement progress_dialog

Browse source
This commit is contained in:
Unknown 2017-11-25 14:01:35 +01:00 • committed by Ivan
parent 2f7d621fc8
commit 917ee472d4
5 changed files with 132 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

59
rpcs3/rpcs3qt/main_window.cpp
View file

@ -5,7 +5,6 @@
#include <QFileDialog>
#include <QVBoxLayout>
#include <QDockWidget>
#include <QProgressDialog>
#include <QDesktopWidget>
#include <QMimeData>
@ -26,6 +25,7 @@
#include "emu_settings.h"
#include "about_dialog.h"
#include "gamepads_settings_dialog.h"
#include "progress_dialog.h"
#include <thread>
@ -357,20 +357,14 @@ void main_window::InstallPkg(const QString& dropPath)
const std::string fileName = sstr(QFileInfo(filePath).fileName());
const std::string path = sstr(filePath);
QProgressDialog pdlg(tr("Installing package ... please wait ..."), tr("Cancel"), 0, 1000, this);
progress_dialog pdlg(0, 1000, this);
pdlg.setWindowTitle(tr("RPCS3 Package Installer"));
pdlg.setLabelText(tr("Installing package ... please wait ..."));
pdlg.setCancelButtonText(tr("Cancel"));
pdlg.setWindowModality(Qt::WindowModal);
pdlg.setFixedWidth(QLabel("This is the very length of the progressdialog due to hidpi reasons.").sizeHint().width());
pdlg.show();
#ifdef _WIN32
std::unique_ptr<QWinTaskbarButton> taskbar_button = std::make_unique<QWinTaskbarButton>();
taskbar_button->setWindow(windowHandle());
QWinTaskbarProgress* taskbar_progress = taskbar_button->progress();
taskbar_progress->setRange(0, 1000);
taskbar_progress->setVisible(true);
#endif
// Synchronization variable
atomic_t<double> progress(0.);
{
@ -397,19 +391,13 @@ void main_window::InstallPkg(const QString& dropPath)
// Update progress window
double pval = progress;
pval < 0 ? pval += 1. : pval;
pdlg.setValue(static_cast<int>(pval * pdlg.maximum()));
#ifdef _WIN32
taskbar_progress->setValue(static_cast<int>(pval * taskbar_progress->maximum()));
#endif
pdlg.SetValue(static_cast<int>(pval * pdlg.maximum()));
QCoreApplication::processEvents();
}
if (progress > 0.)
{
pdlg.setValue(pdlg.maximum());
#ifdef _WIN32
taskbar_progress->setValue(taskbar_progress->maximum());
#endif
pdlg.SetValue(pdlg.maximum());
std::this_thread::sleep_for(100ms);
}
}
@ -420,10 +408,6 @@ void main_window::InstallPkg(const QString& dropPath)
LOG_SUCCESS(GENERAL, "Successfully installed %s.", fileName);
guiSettings->ShowInfoBox(gui::ib_pkg_success, tr("Success!"), tr("Successfully installed software from package!"), this);
}
#ifdef _WIN32
taskbar_progress->hide();
#endif
}
void main_window::InstallPup(const QString& dropPath)
@ -485,20 +469,14 @@ void main_window::InstallPup(const QString& dropPath)
return;
}
QProgressDialog pdlg(tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast<int>(updatefilenames.size()), this);
progress_dialog pdlg(0, static_cast<int>(updatefilenames.size()), this);
pdlg.setWindowTitle(tr("RPCS3 Firmware Installer"));
pdlg.setLabelText(tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)));
pdlg.setCancelButtonText(tr("Cancel"));
pdlg.setWindowModality(Qt::WindowModal);
pdlg.setFixedWidth(QLabel("This is the very length of the progressdialog due to hidpi reasons.").sizeHint().width());
pdlg.show();
#ifdef _WIN32
QWinTaskbarButton *taskbar_button = new QWinTaskbarButton();
taskbar_button->setWindow(windowHandle());
QWinTaskbarProgress *taskbar_progress = taskbar_button->progress();
taskbar_progress->setRange(0, static_cast<int>(updatefilenames.size()));
taskbar_progress->setVisible(true);
#endif
// Synchronization variable
atomic_t<int> progress(0);
{
@ -543,17 +521,10 @@ void main_window::InstallPup(const QString& dropPath)
if (pdlg.wasCanceled())
{
progress = -1;
#ifdef _WIN32
taskbar_progress->hide();
taskbar_button->~QWinTaskbarButton();
#endif
break;
}
// Update progress window
pdlg.setValue(static_cast<int>(progress));
#ifdef _WIN32
taskbar_progress->setValue(static_cast<int>(progress));
#endif
pdlg.SetValue(static_cast<int>(progress));
QCoreApplication::processEvents();
}
@ -562,10 +533,7 @@ void main_window::InstallPup(const QString& dropPath)
if (progress > 0)
{
pdlg.setValue(pdlg.maximum());
#ifdef _WIN32
taskbar_progress->setValue(taskbar_progress->maximum());
#endif
pdlg.SetValue(pdlg.maximum());
std::this_thread::sleep_for(100ms);
}
}
@ -574,11 +542,6 @@ void main_window::InstallPup(const QString& dropPath)
{
LOG_SUCCESS(GENERAL, "Successfully installed PS3 firmware version %s.", version_string);
guiSettings->ShowInfoBox(gui::ib_pup_success, tr("Success!"), tr("Successfully installed PS3 firmware and LLE Modules!"), this);
#ifdef _WIN32
taskbar_progress->hide();
taskbar_button->~QWinTaskbarButton();
#endif
}
}