From 44e1f2319facc30a5625c525811546ab2be5c76b Mon Sep 17 00:00:00 2001 From: scribblemaniac Date: Fri, 13 May 2022 09:06:09 -0600 Subject: [PATCH] Improve tab ordering (#6019) --- src/citra_qt/cheats.ui | 54 ++++++++++++------ src/citra_qt/configuration/configure_audio.ui | 11 +++- .../configuration/configure_camera.ui | 26 ++++++--- src/citra_qt/configuration/configure_debug.ui | 10 +++- .../configuration/configure_enhancements.ui | 17 +++++- .../configuration/configure_general.ui | 14 ++++- .../configuration/configure_graphics.ui | 29 ++++++---- src/citra_qt/configuration/configure_input.ui | 44 ++++++++++++++- .../configuration/configure_system.ui | 18 +++++- src/citra_qt/configuration/configure_web.ui | 42 ++++++++------ src/citra_qt/debugger/ipc/record_dialog.ui | 56 +++++++++++++------ 11 files changed, 244 insertions(+), 77 deletions(-) diff --git a/src/citra_qt/cheats.ui b/src/citra_qt/cheats.ui index b6bb35b9e..c029d19bf 100644 --- a/src/citra_qt/cheats.ui +++ b/src/citra_qt/cheats.ui @@ -42,6 +42,12 @@ Qt::Horizontal + + + 0 + 0 + + @@ -59,14 +65,6 @@ - - - 10 - 60 - 121 - 16 - - Available Cheats: @@ -77,12 +75,12 @@ QAbstractItemView::NoEditTriggers - - QAbstractItemView::SelectRows - QAbstractItemView::SingleSelection + + QAbstractItemView::SelectRows + false @@ -123,26 +121,32 @@ Qt::Horizontal + + + 0 + 0 + + - - Save - false + + Save + - - Delete - false + + Delete + @@ -196,6 +200,12 @@ Qt::Horizontal + + + 0 + 0 + + @@ -209,6 +219,16 @@ + + buttonAddCheat + tableCheats + lineName + textNotes + textCode + buttonSave + buttonDelete + buttonClose + diff --git a/src/citra_qt/configuration/configure_audio.ui b/src/citra_qt/configuration/configure_audio.ui index dd2f49173..0eaaf39a2 100644 --- a/src/citra_qt/configuration/configure_audio.ui +++ b/src/citra_qt/configuration/configure_audio.ui @@ -7,7 +7,7 @@ 0 0 329 - 332 + 344 @@ -205,6 +205,15 @@ + + emulation_combo_box + output_sink_combo_box + toggle_audio_stretching + audio_device_combo_box + volume_slider + input_type_combo_box + input_device_combo_box + diff --git a/src/citra_qt/configuration/configure_camera.ui b/src/citra_qt/configuration/configure_camera.ui index 46c56b266..07977edd4 100644 --- a/src/citra_qt/configuration/configure_camera.ui +++ b/src/citra_qt/configuration/configure_camera.ui @@ -7,7 +7,7 @@ 0 0 400 - 300 + 489 @@ -186,12 +186,12 @@ - - QFrame::NoFrame - Select the system camera to use + + QFrame::NoFrame + Camera: @@ -227,12 +227,12 @@ - - QFrame::NoFrame - Select the image flip to apply + + QFrame::NoFrame + Flip: @@ -342,6 +342,18 @@ + + camera_selection + camera_mode + camera_position + image_source + camera_file + toolButton + system_camera + camera_flip + prompt_before_load + preview_button + diff --git a/src/citra_qt/configuration/configure_debug.ui b/src/citra_qt/configuration/configure_debug.ui index 24023106c..3d31d0e94 100644 --- a/src/citra_qt/configuration/configure_debug.ui +++ b/src/citra_qt/configuration/configure_debug.ui @@ -6,7 +6,7 @@ 0 0 - 400 + 443 300 @@ -137,6 +137,14 @@ + + toggle_gdbstub + gdbport_spinbox + log_filter_edit + toggle_console + open_log_button + toggle_cpu_jit + diff --git a/src/citra_qt/configuration/configure_enhancements.ui b/src/citra_qt/configuration/configure_enhancements.ui index 99a2fdb7e..2d1453ba7 100644 --- a/src/citra_qt/configuration/configure_enhancements.ui +++ b/src/citra_qt/configuration/configure_enhancements.ui @@ -7,7 +7,7 @@ 0 0 400 - 595 + 634 @@ -343,6 +343,21 @@ + + resolution_factor_combobox + toggle_linear_filter + shader_combobox + texture_filter_combobox + render_3d_combobox + factor_3d + layout_combobox + swap_screen + upright_screen + bg_button + toggle_custom_textures + toggle_dump_textures + toggle_preload_textures + diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui index 0eb58d5a2..9c3827fee 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/citra_qt/configuration/configure_general.ui @@ -7,7 +7,7 @@ 0 0 408 - 396 + 436 @@ -237,6 +237,18 @@ + + toggle_check_exit + toggle_background_pause + toggle_hide_mouse + toggle_update_check + toggle_auto_update + region_combobox + frame_limit + toggle_alternate_speed + frame_limit_alternate + button_reset_defaults + diff --git a/src/citra_qt/configuration/configure_graphics.ui b/src/citra_qt/configuration/configure_graphics.ui index 5616e1d42..97dc851d4 100644 --- a/src/citra_qt/configuration/configure_graphics.ui +++ b/src/citra_qt/configuration/configure_graphics.ui @@ -118,16 +118,16 @@ Advanced - - - - <html><head/><body><p>Reduce stuttering by storing and loading generated shaders to disk.</p></body></html> - - - Use Disk Shader Cache - - - + + + + <html><head/><body><p>Reduce stuttering by storing and loading generated shaders to disk.</p></body></html> + + + Use Disk Shader Cache + + + @@ -156,6 +156,15 @@ + + toggle_hw_renderer + toggle_hw_shader + toggle_separable_shader + toggle_accurate_mul + toggle_shader_jit + toggle_disk_shader_cache + toggle_vsync_new + diff --git a/src/citra_qt/configuration/configure_input.ui b/src/citra_qt/configuration/configure_input.ui index 63e5d5538..2afae408e 100644 --- a/src/citra_qt/configuration/configure_input.ui +++ b/src/citra_qt/configuration/configure_input.ui @@ -6,8 +6,8 @@ 0 0 - 374 - 670 + 441 + 727 @@ -816,6 +816,46 @@ + + profile + buttonNew + buttonDelete + buttonRename + buttonA + buttonB + buttonX + buttonY + buttonDpadLeft + buttonDpadRight + buttonDpadUp + buttonDpadDown + buttonCircleLeft + buttonCircleRight + buttonCircleUp + buttonCircleDown + buttonCircleAnalog + sliderCirclePadDeadzoneAndModifier + buttonCStickLeft + buttonCStickRight + buttonCStickUp + buttonCStickDown + buttonCStickAnalog + sliderCStickDeadzoneAndModifier + buttonL + buttonR + buttonZL + buttonZR + buttonStart + buttonSelect + buttonHome + buttonCircleMod + buttonDebug + buttonGpio14 + buttonMotionTouch + buttonAutoMap + buttonClearAll + buttonRestoreDefaults + diff --git a/src/citra_qt/configuration/configure_system.ui b/src/citra_qt/configuration/configure_system.ui index c6f12060c..b48e166e1 100644 --- a/src/citra_qt/configuration/configure_system.ui +++ b/src/citra_qt/configuration/configure_system.ui @@ -6,8 +6,8 @@ 0 0 - 471 - 555 + 520 + 564 @@ -406,6 +406,20 @@ + + toggle_new_3ds + edit_username + combo_birthmonth + combo_birthday + combo_language + combo_sound + combo_country + combo_init_clock + edit_init_time + spinBox_play_coins + button_regenerate_console_id + slider_clock_speed + diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui index 372297dec..c87cf48e6 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/citra_qt/configuration/configure_web.ui @@ -6,7 +6,7 @@ 0 0 - 926 + 996 561 @@ -55,7 +55,7 @@ - + @@ -65,8 +65,7 @@ - - + @@ -173,20 +172,20 @@ - - - Discord Presence - - - - - - Show Current Game in your Discord Status - - - - - + + + Discord Presence + + + + + + Show Current Game in your Discord Status + + + + + @@ -203,6 +202,13 @@ + + edit_token + button_verify_login + toggle_telemetry + button_regenerate_telemetry_id + toggle_discordrpc + diff --git a/src/citra_qt/debugger/ipc/record_dialog.ui b/src/citra_qt/debugger/ipc/record_dialog.ui index 0f5c7a435..0fbb54a2e 100644 --- a/src/citra_qt/debugger/ipc/record_dialog.ui +++ b/src/citra_qt/debugger/ipc/record_dialog.ui @@ -2,9 +2,6 @@ RecordDialog - - View Record - 0 @@ -13,17 +10,20 @@ 500 + + View Record + - + Client - + Process: @@ -37,7 +37,7 @@ - + Thread: @@ -51,7 +51,7 @@ - + Session: @@ -68,13 +68,13 @@ - + Server - + Process: @@ -88,7 +88,7 @@ - + Thread: @@ -102,7 +102,7 @@ - + Session: @@ -121,13 +121,13 @@ - + General - + Client Port: @@ -141,7 +141,7 @@ - + Service: @@ -155,7 +155,7 @@ - + Function: @@ -172,7 +172,7 @@ - + Command Buffer @@ -180,7 +180,7 @@ - + Select: @@ -229,6 +229,12 @@ Qt::Horizontal + + + 0 + 0 + + @@ -242,4 +248,20 @@ + + clientProcess + clientThread + clientSession + serverProcess + serverThread + serverSession + clientPort + service + function + cmdbufSelection + cmdbuf + okButton + + +