From 2172e61ce54f2d44add0be09ed6fcc94e5a5224b Mon Sep 17 00:00:00 2001 From: Asinine Date: Tue, 27 Mar 2018 16:55:54 +0000 Subject: [PATCH] Update settings to indicate speed differences between Interpreters and Recompilers for less confusion (#4345) * Update settings_dialog.ui * Qt: completely detach ppu and spu ui texts from backend. --- rpcs3/rpcs3qt/settings_dialog.cpp | 16 +++++----------- rpcs3/rpcs3qt/settings_dialog.ui | 6 +++--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index f20675a466..d8ee3636cd 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -159,20 +159,11 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: for (int i = 0; i < ppu_list.count(); i++) { - ppuBG->button(i)->setText(ppu_list[i]); - if (ppu_list[i] == selectedPPU) { ppuBG->button(i)->setChecked(true); } -#ifndef LLVM_AVAILABLE - if (ppu_list[i].toLower().contains("llvm")) - { - ppuBG->button(i)->setEnabled(false); - } -#endif - connect(ppuBG->button(i), &QAbstractButton::pressed, [=]() { xemu_settings->SetSetting(emu_settings::PPUDecoder, sstr(ppu_list[i])); @@ -198,8 +189,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: for (int i = 0; i < spu_list.count(); i++) { - spuBG->button(i)->setText(spu_list[i]); - if (spu_list[i] == selectedSPU) { spuBG->button(i)->setChecked(true); @@ -212,6 +201,11 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: } } +#ifndef LLVM_AVAILABLE + ui->ppu_llvm->setEnabled(false); + ui->spu_llvm->setEnabled(false); +#endif + // lib options tool tips SubscribeTooltip(ui->lib_auto, json_cpu_lib["auto"].toString()); SubscribeTooltip(ui->lib_manu, json_cpu_lib["manual"].toString()); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 051788c45a..7dd0e34610 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -70,7 +70,7 @@ - Recompiler (LLVM) + LLVM Recompiler (fastest) @@ -100,7 +100,7 @@ - Recompiler (ASMJIT) + ASMJIT Recompiler (fastest) @@ -110,7 +110,7 @@ false - Recompiler (LLVM) + LLVM Recompiler