diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 21acda55c..180f6ca68 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -780,8 +780,7 @@ void GMainWindow::InitializeHotkeys() { }); connect_shortcut(QStringLiteral("Toggle Per-Application Speed"), [&] { if (!hotkey_registry - .GetKeySequence(QStringLiteral("Main Window"), - QStringLiteral("Toggle Custom Emulation Speed")) + .GetKeySequence(QStringLiteral("Main Window"), QStringLiteral("Toggle Turbo Mode")) .isEmpty()) { return; } @@ -793,16 +792,11 @@ void GMainWindow::InitializeHotkeys() { connect_shortcut(QStringLiteral("Toggle Custom Textures"), [&] { Settings::values.custom_textures = !Settings::values.custom_textures; }); - connect_shortcut(QStringLiteral("Toggle Custom Emulation Speed"), &GMainWindow::ToggleEmulationSpeed); + connect_shortcut(QStringLiteral("Toggle Turbo Mode"), &GMainWindow::ToggleEmulationSpeed); - connect_shortcut(QStringLiteral("Increase Speed Limit"), [&] { - AdjustSpeedLimit(true); - }); - - connect_shortcut(QStringLiteral("Decrease Speed Limit"), [&] { - AdjustSpeedLimit(false); - }); + connect_shortcut(QStringLiteral("Increase Speed Limit"), [&] { AdjustSpeedLimit(true); }); + connect_shortcut(QStringLiteral("Decrease Speed Limit"), [&] { AdjustSpeedLimit(false); }); connect_shortcut(QStringLiteral("Audio Mute/Unmute"), &GMainWindow::OnMute); connect_shortcut(QStringLiteral("Audio Volume Down"), &GMainWindow::OnDecreaseVolume); diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 412c7f41e..d2aa2c697 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -83,7 +83,7 @@ const std::array QtConfig::default_hotkeys {{ {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), Qt::WindowShortcut}}, {QStringLiteral("Swap Screens"), QStringLiteral("Main Window"), {QStringLiteral("F9"), Qt::WindowShortcut}}, {QStringLiteral("Toggle 3D"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+3"), Qt::ApplicationShortcut}}, - {QStringLiteral("Toggle Custom Emulation Speed"), QStringLiteral("Main Window"), {QStringLiteral("+"), Qt::ApplicationShortcut}}, + {QStringLiteral("Toggle Turbo Mode"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::ApplicationShortcut}}, {QStringLiteral("Toggle Custom Textures"), QStringLiteral("Main Window"), {QStringLiteral("F7"), Qt::ApplicationShortcut}}, {QStringLiteral("Toggle Filter Bar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F"), Qt::WindowShortcut}}, {QStringLiteral("Toggle Frame Advancing"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+A"), Qt::ApplicationShortcut}}, diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index ac8d047df..746b4b167 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -30,7 +30,8 @@ ConfigureGeneral::ConfigureGeneral(bool is_powered_on, QWidget* parent) connect(ui->turbo_speed_slider, &QSlider::valueChanged, this, [&](int value) { UISettings::values.turbo_speed_slider.SetValue(SliderToSettings(value)); - ui->turbo_speed_display_label->setText(QStringLiteral("%1%").arg(UISettings::values.turbo_speed_slider.GetValue())); + ui->turbo_speed_display_label->setText( + QStringLiteral("%1%").arg(UISettings::values.turbo_speed_slider.GetValue())); }); // Set a minimum width for the label to prevent the slider from changing size. @@ -75,7 +76,10 @@ ConfigureGeneral::~ConfigureGeneral() = default; void ConfigureGeneral::SetConfiguration() { if (Settings::IsConfiguringGlobal()) { - ui->turbo_speed_slider->setValue(SettingsToSlider(UISettings::values.turbo_speed_slider.GetValue())); + ui->turbo_speed_slider->setValue( + SettingsToSlider(UISettings::values.turbo_speed_slider.GetValue())); + ui->turbo_speed_display_label->setText( + QStringLiteral("%1%").arg(UISettings::values.turbo_speed_slider.GetValue())); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); ui->toggle_background_pause->setChecked( @@ -203,7 +207,7 @@ void ConfigureGeneral::RetranslateUI() { void ConfigureGeneral::SetupPerGameUI() { if (Settings::IsConfiguringGlobal()) { ui->region_combobox->setEnabled(Settings::values.region_value.UsingGlobal()); - if (is_powered_on) { + if (is_powered_on) { ui->frame_limit->setEnabled(false); } else { ui->frame_limit->setEnabled(Settings::values.frame_limit.UsingGlobal()); diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h index f89bbc559..9c833b936 100644 --- a/src/citra_qt/uisettings.h +++ b/src/citra_qt/uisettings.h @@ -76,7 +76,7 @@ struct Values { Settings::Setting show_filter_bar{true, "showFilterBar"}; Settings::Setting show_status_bar{true, "showStatusBar"}; - Settings::Setting turbo_speed_slider{100, "turboSpeedSlider"}; + Settings::Setting turbo_speed_slider{200, "turboSpeedSlider"}; Settings::Setting confirm_before_closing{true, "confirmClose"}; Settings::Setting save_state_warning{true, "saveStateWarning"}; Settings::Setting first_start{true, "firstStart"};