mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-12-06 07:12:28 +01:00
Qt: save spinbox values with fmt::format
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run
This prevents saving localized strings with different decimal characters
This commit is contained in:
parent
bc55f7787e
commit
314b69c7d8
|
|
@ -668,10 +668,9 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, emu_settings_type type, con
|
||||||
spinbox->setRange(min, max);
|
spinbox->setRange(min, max);
|
||||||
spinbox->setValue(val);
|
spinbox->setValue(val);
|
||||||
|
|
||||||
connect(spinbox, &QSpinBox::textChanged, this, [type, spinbox, this](const QString& /* text*/)
|
connect(spinbox, &QSpinBox::valueChanged, this, [type, this](int value)
|
||||||
{
|
{
|
||||||
if (!spinbox) return;
|
SetSetting(type, fmt::format("%d", value));
|
||||||
SetSetting(type, spinbox->cleanText().toStdString());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
|
connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
|
||||||
|
|
@ -724,10 +723,9 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox* spinbox, emu_settings_ty
|
||||||
spinbox->setRange(min, max);
|
spinbox->setRange(min, max);
|
||||||
spinbox->setValue(val);
|
spinbox->setValue(val);
|
||||||
|
|
||||||
connect(spinbox, &QDoubleSpinBox::textChanged, this, [type, spinbox, this](const QString& /* text*/)
|
connect(spinbox, &QDoubleSpinBox::valueChanged, this, [type, this](double value)
|
||||||
{
|
{
|
||||||
if (!spinbox) return;
|
SetSetting(type, fmt::format("%f", value));
|
||||||
SetSetting(type, spinbox->cleanText().toStdString());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
|
connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
|
||||||
|
|
|
||||||
|
|
@ -432,9 +432,9 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
|
||||||
|
|
||||||
scroll(0); // Refresh
|
scroll(0); // Refresh
|
||||||
});
|
});
|
||||||
connect(sb_words, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=, this]()
|
connect(sb_words, &QSpinBox::valueChanged, this, [this](int value)
|
||||||
{
|
{
|
||||||
m_colcount = 1 << sb_words->value();
|
m_colcount = 1 << value;
|
||||||
ShowMemory();
|
ShowMemory();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ pad_motion_settings_dialog::pad_motion_settings_dialog(QDialog* parent, std::sha
|
||||||
m_config_entries[i]->mirrored.set(state != Qt::Unchecked);
|
m_config_entries[i]->mirrored.set(state != Qt::Unchecked);
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(m_shifts[i], QOverload<int>::of(&QSpinBox::valueChanged), this, [this, i](int value)
|
connect(m_shifts[i], &QSpinBox::valueChanged, this, [this, i](int value)
|
||||||
{
|
{
|
||||||
std::lock_guard lock(m_config_mutex);
|
std::lock_guard lock(m_config_mutex);
|
||||||
m_config_entries[i]->shift.set(value);
|
m_config_entries[i]->shift.set(value);
|
||||||
|
|
|
||||||
|
|
@ -123,8 +123,8 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
|
||||||
handle_config_value_changed(ui->configurable_combo_box->itemData(index).toDouble());
|
handle_config_value_changed(ui->configurable_combo_box->itemData(index).toDouble());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
connect(ui->configurable_spin_box, QOverload<int>::of(&QSpinBox::valueChanged), this, &patch_manager_dialog::handle_config_value_changed);
|
connect(ui->configurable_spin_box, &QSpinBox::valueChanged, this, &patch_manager_dialog::handle_config_value_changed);
|
||||||
connect(ui->configurable_double_spin_box, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &patch_manager_dialog::handle_config_value_changed);
|
connect(ui->configurable_double_spin_box, &QDoubleSpinBox::valueChanged, this, &patch_manager_dialog::handle_config_value_changed);
|
||||||
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
|
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
|
||||||
connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
|
connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ void raw_mouse_settings_dialog::add_tabs(QTabWidget* tabs)
|
||||||
m_accel_spin_boxes.push_back(mouse_acceleration_spin_box);
|
m_accel_spin_boxes.push_back(mouse_acceleration_spin_box);
|
||||||
mouse_acceleration_spin_box->setRange(0.1, 10.0);
|
mouse_acceleration_spin_box->setRange(0.1, 10.0);
|
||||||
mouse_acceleration_spin_box->setValue(config->mouse_acceleration.get() / 100.0);
|
mouse_acceleration_spin_box->setValue(config->mouse_acceleration.get() / 100.0);
|
||||||
connect(mouse_acceleration_spin_box, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, [player](double value)
|
connect(mouse_acceleration_spin_box, &QDoubleSpinBox::valueChanged, this, [player](double value)
|
||||||
{
|
{
|
||||||
auto& config = ::at32(g_cfg_raw_mouse.players, player)->mouse_acceleration;
|
auto& config = ::at32(g_cfg_raw_mouse.players, player)->mouse_acceleration;
|
||||||
config.set(std::clamp(value * 100.0, config.min, config.max));
|
config.set(std::clamp(value * 100.0, config.min, config.max));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue