Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup graphics settings list #16432

Merged
merged 9 commits into from
Nov 24, 2022
3 changes: 2 additions & 1 deletion UI/DevScreens.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ void DevMenuScreen::CreatePopupContents(UI::ViewGroup *parent) {
items->Add(new CheckBox(&g_Config.bShowGpuProfile, dev->T("GPU Profile")));
}
items->Add(new Choice(dev->T("Toggle Freeze")))->OnClick.Handle(this, &DevMenuScreen::OnFreezeFrame);
items->Add(new Choice(dev->T("Dump Frame GPU Commands")))->OnClick.Handle(this, &DevMenuScreen::OnDumpFrame);

items->Add(new Choice(dev->T("Dump next frame to log")))->OnClick.Handle(this, &DevMenuScreen::OnDumpFrame);
items->Add(new Choice(dev->T("Toggle Audio Debug")))->OnClick.Handle(this, &DevMenuScreen::OnToggleAudioDebug);
#ifdef USE_PROFILER
items->Add(new CheckBox(&g_Config.bShowFrameProfiler, dev->T("Frame Profiler"), ""));
Expand Down
3 changes: 3 additions & 0 deletions UI/DisplayLayoutScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ void DisplayLayoutScreen::CreateViews() {
});
rightColumn->Add(rotation);

static const char *bufFilters[] = { "Linear", "Nearest", };
rightColumn->Add(new PopupMultiChoice(&g_Config.iBufFilter, gr->T("Screen Scaling Filter"), bufFilters, 1, ARRAY_SIZE(bufFilters), gr->GetName(), screenManager()));

rightColumn->Add(new ItemHeader(gr->T("Postprocessing effect")));

Draw::DrawContext *draw = screenManager()->getDrawContext();
Expand Down
239 changes: 106 additions & 133 deletions UI/GameSettingsScreen.cpp

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions UI/GameSettingsScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ class DeveloperToolsScreen : public UIDialogScreenWithGameBackground {
private:
UI::EventReturn OnRunCPUTests(UI::EventParams &e);
UI::EventReturn OnLoggingChanged(UI::EventParams &e);
UI::EventReturn OnLoadLanguageIni(UI::EventParams &e);
UI::EventReturn OnSaveLanguageIni(UI::EventParams &e);
UI::EventReturn OnOpenTexturesIniFile(UI::EventParams &e);
UI::EventReturn OnLogConfig(UI::EventParams &e);
UI::EventReturn OnJitAffectingSetting(UI::EventParams &e);
Expand Down
2 changes: 1 addition & 1 deletion UI/PauseScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ void GamePauseScreen::CreateViews() {
rightColumnItems->Add(new Choice(pa->T("Settings")))->OnClick.Handle(this, &GamePauseScreen::OnGameSettings);
rightColumnItems->Add(new Choice(pa->T("Create Game Config")))->OnClick.Handle(this, &GamePauseScreen::OnCreateConfig);
}
UI::Choice *displayEditor_ = rightColumnItems->Add(new Choice(gr->T("Display layout editor")));
UI::Choice *displayEditor_ = rightColumnItems->Add(new Choice(gr->T("Display Layout && Effects")));
displayEditor_->OnClick.Add([&](UI::EventParams &) -> UI::EventReturn {
screenManager()->push(new DisplayLayoutScreen(gamePath_));
return UI::EVENT_DONE;
Expand Down
2 changes: 1 addition & 1 deletion Windows/ppsspp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ BEGIN
MENUITEM "Ignore Windows Key", ID_OPTIONS_IGNOREWINKEY
MENUITEM "Language...", ID_OPTIONS_LANGUAGE
MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS
MENUITEM "Display Layout Editor", ID_OPTIONS_DISPLAY_LAYOUT
MENUITEM "Display Layout && Effects", ID_OPTIONS_DISPLAY_LAYOUT
MENUITEM "More Settings...", ID_OPTIONS_MORE_SETTINGS
MENUITEM "", 0, MFT_SEPARATOR
MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/ar_AE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Direct3D9 = Direct3D &9
Direct3D11 = Direct3D &11
Disassembly = ‎&التفكيك...
Discord = Discord
Display Layout Editor = ‎أظهر مُعدل النسق...
Display Layout && Effects = ‎أظهر مُعدل النسق...
Display Rotation = ‎تدوير العرض
Dump Next Frame to Log = ‎تصحيح الفريم التالي إلي سجل
Emulation = ‎&محاكاة
Expand Down Expand Up @@ -240,7 +240,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Dump decrypted EBOOT.BIN on game boot
Dump Frame GPU Commands = Dump frame GPU commands
Dump next frame to log = Dump next frame to log
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = ‎تفعيل سجل التصحيح
Enter address = ‎أدخل العنوان
Expand All @@ -252,8 +252,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Jit compare
JIT debug tools = JIT debug tools
Language = ‎اللغة
Load language ini = ‎تحميل ملف اللغة
Log Dropped Frame Statistics = ‎سجل التفاصيل للفريمات المتدنية
Log Level = ‎مستوي السجل
Log View = ‎أظهر السجل
Expand All @@ -269,7 +267,6 @@ RestoreDefaultSettings = Are you sure you want to restore all settings back to t
RestoreGameDefaultSettings = Are you sure you want to restore the game-specific settings\nback to the PPSSPP defaults?
Resume = Resume
Run CPU Tests = ‎شغل فحوص المعالج
Save language ini = ‎إحفظ ملف اللغة
Save new textures = ‎حفظ الرسم الجديد
Shader Viewer = ‎مستعرض الرسوميات
Show Developer Menu = ‎أظهر قائمة المطور
Expand Down Expand Up @@ -495,9 +492,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Display layout editor
Display Layout && Effects = ‎أظهر مُعدل النسق
Display Resolution (HW scaler) = Display resolution (HW scaler)
Dump next frame to log = Dump next frame to log
Enable Cardboard VR = Enable Cardboard VR
FPS = FPS
Frame Rate Control = ‎التحكم في معدل الإطارات
Expand Down Expand Up @@ -549,7 +545,6 @@ Rendering Resolution = ‎حجم التصيير
RenderingMode NonBuffered Tip = ‎أسرع, لكن يمكن أن لا يظهر أي شئ في بعض الألعاب
Rotation = ‎الدوران
Safe = ‎أمن
Screen layout = Screen layout
Screen Scaling Filter = ‎فلتر تكبير حجم الشاشة
Show Debug Statistics = ‎أظهر معلومات التصحيح
Show FPS Counter = ‎أظهر عداد الـFPS
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/az_AZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Direct3D9 = &Direct3D9
Direct3D11 = Direct3D &11
Disassembly = &Disassembly...
Discord = Discord
Display Layout Editor = Display layout editor...
Display Layout && Effects = Display layout && effects...
Display Rotation = Display rotation
Dump Next Frame to Log = D&ump Next Frame to Log
Emulation = &Emulation
Expand Down Expand Up @@ -232,7 +232,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Dump decrypted EBOOT.BIN on game boot
Dump Frame GPU Commands = Dump frame GPU commands
Dump next frame to log = Dump next frame to log
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = Enable debug logging
Enter address = Enter address
Expand All @@ -244,8 +244,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Jit compare
JIT debug tools = JIT debug tools
Language = Language
Load language ini = Dil faylı yüklə(.ini)
Log Dropped Frame Statistics = Log dropped frame statistics
Log Level = Log level
Log View = Log view
Expand All @@ -261,7 +259,6 @@ RestoreDefaultSettings = Are you sure you want to restore all settings back to t
RestoreGameDefaultSettings = Are you sure you want to restore the game-specific settings\nback to the PPSSPP defaults?
Resume = Resume
Run CPU Tests = Run CPU tests
Save language ini = Dil faylını qeyd et (.ini)
Save new textures = Save new textures
Shader Viewer = Shader viewer
Show Developer Menu = Show developer menu
Expand Down Expand Up @@ -487,9 +484,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Display layout editor
Display Layout && Effects = Display layout && effects
Display Resolution (HW scaler) = Display resolution (HW scaler)
Dump next frame to log = Dump next frame to log
Enable Cardboard VR = Enable Cardboard VR
FPS = FPS
Frame Rate Control = Framerate control
Expand Down Expand Up @@ -541,7 +537,6 @@ Rendering Resolution = Rendering resolution
RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
Rotation = Rotation
Safe = Safe
Screen layout = Screen layout
Screen Scaling Filter = Screen scaling filter
Show Debug Statistics = Show debug statistics
Show FPS Counter = Show FPS counter
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/bg_BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Direct3D9 = &Direct3D9
Direct3D11 = Direct3D &11
Disassembly = &Disassembly...
Discord = Discord
Display Layout Editor = Display layout editor...
Display Layout && Effects = Display layout && effects...
Display Rotation = Display rotation
Dump Next Frame to Log = D&ump Next Frame to Log
Emulation = &Емулация
Expand Down Expand Up @@ -232,7 +232,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Dump decrypted EBOOT.BIN on game boot
Dump Frame GPU Commands = Dump frame GPU commands
Dump next frame to log = Dump next frame to log
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = Enable debug logging
Enter address = Enter address
Expand All @@ -244,8 +244,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Jit compare
JIT debug tools = JIT debug tools
Language = Език
Load language ini = Зареди езиков ini
Log Dropped Frame Statistics = Log dropped frame statistics
Log Level = Log level
Log View = Log view
Expand All @@ -261,7 +259,6 @@ RestoreDefaultSettings = Сигурни ли сте, че искате да въ
RestoreGameDefaultSettings = Are you sure you want to restore the game-specific settings\nback to the PPSSPP defaults?
Resume = Resume
Run CPU Tests = Run CPU tests
Save language ini = Запази езиков ini
Save new textures = Save new textures
Shader Viewer = Shader viewer
Show Developer Menu = Покажи developer меню
Expand Down Expand Up @@ -487,9 +484,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Display layout editor
Display Layout && Effects = Display layout && effects
Display Resolution (HW scaler) = Display resolution (HW scaler)
Dump next frame to log = Dump next frame to log
Enable Cardboard VR = Enable Cardboard VR
FPS = Кадри в сек.
Frame Rate Control = Framerate control
Expand Down Expand Up @@ -541,7 +537,6 @@ Rendering Resolution = Rendering resolution
RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
Rotation = Rotation
Safe = Safe
Screen layout = Screen layout
Screen Scaling Filter = Screen scaling filter
Show Debug Statistics = Покажи debug инфо
Show FPS Counter = Покажи брояча за кадри в сек.
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/ca_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Direct3D9 = &Direct3D9
Direct3D11 = Direct3D11
Disassembly = &Desensamblador...
Discord = Discord
Display Layout Editor = Editeu la posició dels botons...
Display Layout && Effects = Editeu la posició dels botons...
Display Rotation = Rotació de la pantalla
Dump Next Frame to Log = Aboca el següent marc al registre
Emulation = &Emulació
Expand Down Expand Up @@ -232,7 +232,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Aboca «EBOOT.BIN» desxifrat quan s'iniciï el joc
Dump Frame GPU Commands = Aboca ordres del marc GPU
Dump next frame to log = Dump next frame to log
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = Activa el registre
Enter address = Inseriu adreça
Expand All @@ -244,8 +244,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Comparació Jit
JIT debug tools = JIT debug tools
Language = Llengua
Load language ini = Carrega INI d'idioma
Log Dropped Frame Statistics = Registra estadístiques de caigudes de marcs
Log Level = Nivell del registre
Log View = Vegeu el registre
Expand All @@ -261,7 +259,6 @@ RestoreDefaultSettings = Esteu segur que voleu restablir els ajustaments de fàb
RestoreGameDefaultSettings = Esteu segur que voleu restablir els paràmetres de joc\na els paràmetres per defecte de PPSSPP?
Resume = Resume
Run CPU Tests = Proves de CPU
Save language ini = Desa l'INI de l'idioma
Save new textures = Desa les noves textures
Shader Viewer = Visualitzador de shader
Show Developer Menu = Mostra el menú de desenvolupament
Expand Down Expand Up @@ -487,9 +484,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Display layout editor
Display Layout && Effects = Display layout && effects
Display Resolution (HW scaler) = Display resolution (HW scaler)
Dump next frame to log = Dump next frame to log
Enable Cardboard VR = Enable Cardboard VR
FPS = FPS
Frame Rate Control = Framerate control
Expand Down Expand Up @@ -541,7 +537,6 @@ Rendering Resolution = Rendering resolution
RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
Rotation = Rotation
Safe = Safe
Screen layout = Screen layout
Screen Scaling Filter = Screen scaling filter
Show Debug Statistics = Show debug statistics
Show FPS Counter = Show FPS counter
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/cz_CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Direct3D9 = &Direct3D9
Direct3D11 = Direct3D &11
Disassembly = R&ozebrání strojového kódu...
Discord = Discord
Display Layout Editor = Zobrazit editor rozvržení...
Display Layout && Effects = Zobrazit editor rozvržení...
Display Rotation = Otočení obrazovky
Dump Next Frame to Log = &Vypsat příští snímek do záznamu
Emulation = &Emulace
Expand Down Expand Up @@ -232,7 +232,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Vypsat dešifrovaný EBOOT.BIN při načtení hry
Dump Frame GPU Commands = Vypsat příkazy snímku pro grafický procesor
Dump next frame to log = Vypsat příští snímek do záznamu
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = Povolit záznam při ladění
Enter address = Zadejte adresu
Expand All @@ -244,8 +244,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Porovnání JIT
JIT debug tools = JIT debug tools
Language = Jazyk
Load language ini = Načíst ini s jazykem
Log Dropped Frame Statistics = Log dropped frame statistics
Log Level = Úroveň záznamu
Log View = Zobrazení záznamu
Expand All @@ -261,7 +259,6 @@ RestoreDefaultSettings = Jste si jisti obnovou všech nastavení zpět na jejich
RestoreGameDefaultSettings = Jste si jisti obnovou nastavení hry\nzpět na výchozí hodnoty PPSSPP?
Resume = Resume
Run CPU Tests = Spustit zkoušky CPU
Save language ini = Uložit ini s jazykem
Save new textures = Save new textures
Shader Viewer = Prohlížeč shaderů
Show Developer Menu = Zobrazit nabídku pro vývojáře
Expand Down Expand Up @@ -487,9 +484,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Zobrazit editor rozvržení
Display Layout && Effects = Zobrazit editor rozvržení
Display Resolution (HW scaler) = Rozlišení obrazovky (Hardwarové zvětšení)
Dump next frame to log = Vypsat příští snímek do záznamu
Enable Cardboard VR = Enable Cardboard VR
FPS = FPS
Frame Rate Control = Kontrola frekvence snímků
Expand Down Expand Up @@ -541,7 +537,6 @@ Rendering Resolution = Rozlišení vykreslování
RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
Rotation = Otočení
Safe = Bezpečné
Screen layout = Screen layout
Screen Scaling Filter = Filtr změny velikosti obrazovky
Show Debug Statistics = Zobrazit statistiky ladění
Show FPS Counter = Zobrazit počítadlo
Expand Down
11 changes: 3 additions & 8 deletions assets/lang/da_DK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Direct3D9 = &Direct3D9
Direct3D11 = Direct3D11
Disassembly = &Disassembly...
Discord = Discord
Display Layout Editor = Display layout editor...
Display Layout && Effects = Display layout && effects...
Display Rotation = Display rotation
Dump Next Frame to Log = G&em næste frame i loggen
Emulation = &Emulation
Expand Down Expand Up @@ -232,7 +232,7 @@ DevMenu = DevMenu
Disabled JIT functionality = Disabled JIT functionality
Draw Frametimes Graph = Draw frametimes graph
Dump Decrypted Eboot = Dump dekrypteret EBOOT.BIN ved spil boot
Dump Frame GPU Commands = Drop frame GPU kommandoer
Dump next frame to log = Gem næste frame i loggen
Enable driver bug workarounds = Enable driver bug workarounds
Enable Logging = Aktiver fejlfindingslogning
Enter address = Indtast adresse
Expand All @@ -244,8 +244,6 @@ GPU Log Profiler = GPU Log Profiler
GPU Profile = GPU profile
Jit Compare = Jit sammenlign
JIT debug tools = JIT debug tools
Language = Sprog
Load language ini = Hent sprog ini
Log Dropped Frame Statistics = Log Droppede Frames Statistik
Log Level = Logniveau
Log View = Log visning
Expand All @@ -261,7 +259,6 @@ RestoreDefaultSettings = Er du sikker på at du vil sætte indstillinger tilbage
RestoreGameDefaultSettings = Er du sikker på at du vil nustille de spilspecifikke\nindstillinger tilbage til standard?
Resume = Resume
Run CPU Tests = Kør CPU test
Save language ini = Gem sprog ini
Save new textures = Gem nye textures
Shader Viewer = Shader viewer
Show Developer Menu = Vis udviklermenu
Expand Down Expand Up @@ -487,9 +484,8 @@ Device = Device
Direct3D 9 = Direct3D 9
Direct3D 11 = Direct3D 11
Disabled = Disabled
Display layout editor = Display layout editor
Display Layout && Effects = Display layout && effects
Display Resolution (HW scaler) = Skærmopløsning (HW scaler)
Dump next frame to log = Gem næste frame i loggen
Enable Cardboard VR = Enable Cardboard VR
FPS = FPS
Frame Rate Control = Frameratekontrol
Expand Down Expand Up @@ -541,7 +537,6 @@ Rendering Resolution = Render opløsning
RenderingMode NonBuffered Tip = Hurtigere, men intet vises i nogle spil
Rotation = Rotation
Safe = Sikker
Screen layout = Screen layout
Screen Scaling Filter = Skærmskaleringsfilter
Show Debug Statistics = Vis debugstatistik
Show FPS Counter = Vis FPS
Expand Down
Loading