From e361bac945564198c28d3ba0e3e74b210c6028d0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 17 Apr 2020 10:06:58 +0200 Subject: [PATCH] Qt: minor cleanup --- rpcs3/rpcs3qt/emu_settings.cpp | 8 ++++---- rpcs3/rpcs3qt/emu_settings.h | 2 +- rpcs3/rpcs3qt/qt_utils.cpp | 5 +++++ rpcs3/rpcs3qt/qt_utils.h | 3 +++ rpcs3/rpcs3qt/settings_dialog.cpp | 33 ++++++++++++++----------------- rpcs3/rpcs3qt/settings_dialog.ui | 20 +++++++++---------- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index a727d98224..9ebc280594 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -93,7 +93,7 @@ namespace cfg_adapter } /** Returns possible options for values for some particular setting.*/ -static QStringList getOptions(cfg_location location) +static QStringList get_options(cfg_location location) { QStringList values; auto begin = location.cbegin(); @@ -212,7 +212,7 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type, for (int i = range.first().toInt(); i <= max_item; i++) { - combobox->addItem(QString::number(i), QVariant(QString::number(i))); + combobox->addItem(QString::number(i), i); } } else @@ -414,7 +414,7 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox* spinbox, emu_settings_ty }); } -void emu_settings::EnhanceEdit(QLineEdit* edit, emu_settings_type type) +void emu_settings::EnhanceLineEdit(QLineEdit* edit, emu_settings_type type) { if (!edit) { @@ -478,7 +478,7 @@ void emu_settings::SaveSelectedLibraries(const std::vector& libs) QStringList emu_settings::GetSettingOptions(emu_settings_type type) const { - return getOptions(const_cast(m_settings_location[type])); + return get_options(const_cast(m_settings_location[type])); } std::string emu_settings::GetSettingName(emu_settings_type type) const diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index f0648235d2..5aaaba539f 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -51,7 +51,7 @@ public: void EnhanceDoubleSpinBox(QDoubleSpinBox* slider, emu_settings_type type, const QString& prefix = "", const QString& suffix = ""); /** Connects a line edit with the target settings type*/ - void EnhanceEdit(QLineEdit* edit, emu_settings_type type); + void EnhanceLineEdit(QLineEdit* edit, emu_settings_type type); /** Connects a button group with the target settings type*/ void EnhanceRadioButton(QButtonGroup* button_group, emu_settings_type type); diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp index e368a4dd02..a05c3d03dc 100644 --- a/rpcs3/rpcs3qt/qt_utils.cpp +++ b/rpcs3/rpcs3qt/qt_utils.cpp @@ -126,6 +126,11 @@ namespace gui return dummy_font.font(); } + int get_label_width(const QString& text) + { + return QLabel(text).sizeHint().width(); + } + QImage get_opaque_image_area(const QString& path) { QImage image = QImage(path); diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h index bb45bfd329..e65543ed61 100644 --- a/rpcs3/rpcs3qt/qt_utils.h +++ b/rpcs3/rpcs3qt/qt_utils.h @@ -42,6 +42,9 @@ namespace gui // Returns the font of the QLabels with object_name QFont get_label_font(const QString& object_name); + // Returns the width of the text + int get_label_width(const QString& text); + // Returns the part of the image loaded from path that is inside the bounding box of its opaque areas QImage get_opaque_image_area(const QString& path); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 9fd4f7a523..f56f2c9c58 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -197,7 +197,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->preferredSPUThreads, emu_settings_type::PreferredSPUThreads, true); SubscribeTooltip(ui->gb_spu_threads, tooltips.settings.preferred_spu_threads); - ui->preferredSPUThreads->setItemText(ui->preferredSPUThreads->findData("0"), tr("Auto", "Preferred SPU threads")); + ui->preferredSPUThreads->setItemText(ui->preferredSPUThreads->findData(0), tr("Auto", "Preferred SPU threads")); if (utils::has_rtm()) { @@ -420,10 +420,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std }); // Sliders - static const auto& minmax_label_width = [](const QString& sizer) - { - return QLabel(sizer).sizeHint().width(); - }; m_emu_settings->EnhanceSlider(ui->resolutionScale, emu_settings_type::ResolutionScale); SubscribeTooltip(ui->gb_resolutionScale, tooltips.settings.resolution_scale); @@ -440,11 +436,11 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std }; ui->resolutionScale->setPageStep(50); ui->resolutionScaleMin->setText(QString::number(ui->resolutionScale->minimum())); - ui->resolutionScaleMin->setFixedWidth(minmax_label_width("00")); + ui->resolutionScaleMin->setFixedWidth(gui::utils::get_label_width(QStringLiteral("00"))); ui->resolutionScaleMax->setText(QString::number(ui->resolutionScale->maximum())); - ui->resolutionScaleMax->setFixedWidth(minmax_label_width("0000")); + ui->resolutionScaleMax->setFixedWidth(gui::utils::get_label_width(QStringLiteral("0000"))); ui->resolutionScaleVal->setText(scaled_resolution(ui->resolutionScale->value())); - connect(ui->resolutionScale, &QSlider::valueChanged, [=, this](int value) + connect(ui->resolutionScale, &QSlider::valueChanged, [scaled_resolution, this](int value) { ui->resolutionScaleVal->setText(scaled_resolution(value)); }); @@ -469,9 +465,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std }; ui->minimumScalableDimension->setPageStep(64); ui->minimumScalableDimensionMin->setText(QString::number(ui->minimumScalableDimension->minimum())); - ui->minimumScalableDimensionMin->setFixedWidth(minmax_label_width("00")); + ui->minimumScalableDimensionMin->setFixedWidth(gui::utils::get_label_width(QStringLiteral("00"))); ui->minimumScalableDimensionMax->setText(QString::number(ui->minimumScalableDimension->maximum())); - ui->minimumScalableDimensionMax->setFixedWidth(minmax_label_width("0000")); + ui->minimumScalableDimensionMax->setFixedWidth(gui::utils::get_label_width(QStringLiteral("0000"))); ui->minimumScalableDimensionVal->setText(min_scalable_dimension(ui->minimumScalableDimension->value())); connect(ui->minimumScalableDimension, &QSlider::valueChanged, [=, this](int value) { @@ -633,8 +629,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std enable_time_stretching_options(enabled && ui->enableTimeStretching->isChecked()); }; - auto enable_buffering = [this, enable_buffering_options](const QString& text) + auto enable_buffering = [this, enable_buffering_options](int index) { + const auto text = ui->audioOutBox->currentData().toString(); const bool enabled = text == "XAudio2" || text == "OpenAL" || text == "FAudio"; ui->enableBuffering->setEnabled(enabled); enable_buffering_options(enabled && ui->enableBuffering->isChecked()); @@ -728,7 +725,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std #else SubscribeTooltip(ui->gb_audio_out, tooltips.settings.audio_out_linux); #endif - connect(ui->audioOutBox, &QComboBox::currentTextChanged, enable_buffering); + connect(ui->audioOutBox, QOverload::of(&QComboBox::currentIndexChanged), enable_buffering); // Microphone Comboboxes mics_combo[0] = ui->microphone1Box; @@ -786,7 +783,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->enableTimeStretching, tooltips.settings.enable_time_stretching); connect(ui->enableTimeStretching, &QCheckBox::clicked, enable_time_stretching_options); - enable_buffering(ui->audioOutBox->currentText()); + enable_buffering(ui->audioOutBox->currentIndex()); // Sliders @@ -873,13 +870,13 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std // Edits - m_emu_settings->EnhanceEdit(ui->edit_dns, emu_settings_type::DNSAddress); + m_emu_settings->EnhanceLineEdit(ui->edit_dns, emu_settings_type::DNSAddress); SubscribeTooltip(ui->gb_edit_dns, tooltips.settings.dns); - m_emu_settings->EnhanceEdit(ui->edit_npid, emu_settings_type::PSNNPID); + m_emu_settings->EnhanceLineEdit(ui->edit_npid, emu_settings_type::PSNNPID); SubscribeTooltip(ui->gb_edit_npid, tooltips.settings.psn_npid); - m_emu_settings->EnhanceEdit(ui->edit_swaps, emu_settings_type::IpSwapList); + m_emu_settings->EnhanceLineEdit(ui->edit_swaps, emu_settings_type::IpSwapList); SubscribeTooltip(ui->gb_edit_swaps, tooltips.settings.dns_swap); // Comboboxes @@ -956,7 +953,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std // Comboboxes m_emu_settings->EnhanceComboBox(ui->maxSPURSThreads, emu_settings_type::MaxSPURSThreads, true); - ui->maxSPURSThreads->setItemText(ui->maxSPURSThreads->findData("6"), tr("Unlimited (Default)", "Max SPURS threads")); + ui->maxSPURSThreads->setItemText(ui->maxSPURSThreads->findData(6), tr("Unlimited (Default)", "Max SPURS threads")); SubscribeTooltip(ui->gb_max_spurs_threads, tooltips.settings.max_spurs_threads); m_emu_settings->EnhanceComboBox(ui->sleepTimersAccuracy, emu_settings_type::SleepTimersAccuracy); @@ -1148,7 +1145,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->maxLLVMThreads, emu_settings_type::MaxLLVMThreads, true, true, std::thread::hardware_concurrency()); SubscribeTooltip(ui->gb_max_llvm, tooltips.settings.max_llvm_threads); - ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData("0"), tr("All (%1)", "Max LLVM threads").arg(std::thread::hardware_concurrency())); + ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData(0), tr("All (%1)", "Max LLVM threads").arg(std::thread::hardware_concurrency())); m_emu_settings->EnhanceComboBox(ui->perfOverlayDetailLevel, emu_settings_type::PerfOverlayDetailLevel); SubscribeTooltip(ui->perf_overlay_detail_level, tooltips.settings.perf_overlay_detail_level); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 4ad0454fbe..b65f1c560a 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -48,7 +48,7 @@ - + PPU Decoder @@ -78,7 +78,7 @@ - + SPU Decoder @@ -1717,13 +1717,13 @@ - - - - Accurate LLVM DFMA - - - + + + + Accurate LLVM DFMA + + + @@ -1771,7 +1771,7 @@ - + 0