diff --git a/src/frontend/cia_build_dialog.cpp b/src/frontend/cia_build_dialog.cpp index dede332..cd6a338 100644 --- a/src/frontend/cia_build_dialog.cpp +++ b/src/frontend/cia_build_dialog.cpp @@ -16,7 +16,6 @@ CIABuildDialog::CIABuildDialog(QWidget* parent, bool is_dir_, bool is_nand, bool is_dir(is_dir_) { ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); if (is_dir) { setWindowTitle(tr("Batch Build CIA")); diff --git a/src/frontend/helpers/dpi_aware_dialog.cpp b/src/frontend/helpers/dpi_aware_dialog.cpp index 0cedbfc..e1d5f39 100644 --- a/src/frontend/helpers/dpi_aware_dialog.cpp +++ b/src/frontend/helpers/dpi_aware_dialog.cpp @@ -8,7 +8,10 @@ #include "frontend/helpers/dpi_aware_dialog.h" DPIAwareDialog::DPIAwareDialog(QWidget* parent, int width, int height) - : QDialog(parent), original_width(width), original_height(height) {} + : QDialog(parent), original_width(width), original_height(height) { + + setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); +} DPIAwareDialog::~DPIAwareDialog() = default; diff --git a/src/frontend/import_dialog.cpp b/src/frontend/import_dialog.cpp index 6df0b6f..6445f02 100644 --- a/src/frontend/import_dialog.cpp +++ b/src/frontend/import_dialog.cpp @@ -157,7 +157,6 @@ ImportDialog::ImportDialog(QWidget* parent, const Core::Config& config_) qRegisterMetaType(); ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); RelistContent(); UpdateSizeDisplay(); diff --git a/src/frontend/main.cpp b/src/frontend/main.cpp index b62120a..f9c141c 100644 --- a/src/frontend/main.cpp +++ b/src/frontend/main.cpp @@ -35,7 +35,6 @@ MainDialog::MainDialog(QWidget* parent) : DPIAwareDialog(parent, 640, 256), ui(std::make_unique()) { ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(false); ui->buttonBox->button(QDialogButtonBox::StandardButton::Reset)->setText(tr("Refresh")); diff --git a/src/frontend/select_files_dialog.cpp b/src/frontend/select_files_dialog.cpp index 1d3197b..710f29f 100644 --- a/src/frontend/select_files_dialog.cpp +++ b/src/frontend/select_files_dialog.cpp @@ -13,7 +13,6 @@ SelectFilesDialog::SelectFilesDialog(QWidget* parent, bool source_is_dir_, bool source_is_dir(source_is_dir_), destination_is_dir(destination_is_dir_) { ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); connect(ui->buttonBox, &QDialogButtonBox::accepted, [this] { if (ui->source->text().isEmpty() || ui->destination->text().isEmpty()) { diff --git a/src/frontend/title_info_dialog.cpp b/src/frontend/title_info_dialog.cpp index 6a32684..47abc4c 100644 --- a/src/frontend/title_info_dialog.cpp +++ b/src/frontend/title_info_dialog.cpp @@ -24,7 +24,6 @@ TitleInfoDialog::TitleInfoDialog(QWidget* parent, Core::SDMCImporter& importer_, importer(importer_), specifier(std::move(specifier_)) { ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); LoadInfo(); diff --git a/src/frontend/utilities.cpp b/src/frontend/utilities.cpp index 9892c0b..77dd1e7 100644 --- a/src/frontend/utilities.cpp +++ b/src/frontend/utilities.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include "core/file_sys/data/data_container.h" #include "core/file_sys/data/extdata.h" @@ -14,6 +13,7 @@ #include "core/file_sys/ncch_container.h" #include "core/key/key.h" #include "core/sdmc_decryptor.h" +#include "frontend/helpers/rate_limited_progress_dialog.h" #include "frontend/select_files_dialog.h" #include "frontend/utilities.h" #include "ui_utilities.h" @@ -22,7 +22,6 @@ UtilitiesDialog::UtilitiesDialog(QWidget* parent) : DPIAwareDialog(parent, 640, 384), ui(std::make_unique()) { ui->setupUi(this); - setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); connect(ui->useSdDecryption, &QCheckBox::clicked, [this] { const bool checked = ui->useSdDecryption->isChecked(); @@ -121,12 +120,8 @@ bool UtilitiesDialog::LoadSDKeys() { } void UtilitiesDialog::ShowProgressDialog(std::function operation) { - auto* dialog = new QProgressDialog(tr("Processing..."), tr("Cancel"), 0, 0, this); - dialog->setWindowFlags(dialog->windowFlags() & (~Qt::WindowContextHelpButtonHint)); - dialog->setWindowModality(Qt::WindowModal); + auto* dialog = new RateLimitedProgressDialog(tr("Processing..."), tr("Cancel"), 0, 0, this); dialog->setCancelButton(nullptr); - dialog->setMinimumDuration(0); - dialog->setValue(0); using FutureWatcher = QFutureWatcher; auto* future_watcher = new FutureWatcher(this);