From ce42de4612fb3a2ab957c60e27fcbad51a663a11 Mon Sep 17 00:00:00 2001 From: Xertis <118364459+Xertis@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:58:52 +0300 Subject: [PATCH 1/6] Moving an XMLobject from the script to the layout --- res/layouts/pages/settings_controls.xml.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/res/layouts/pages/settings_controls.xml.lua b/res/layouts/pages/settings_controls.xml.lua index d1aba71e..ad8491ad 100644 --- a/res/layouts/pages/settings_controls.xml.lua +++ b/res/layouts/pages/settings_controls.xml.lua @@ -44,11 +44,6 @@ function on_open() document.sensitivity_track.value = core.get_setting("camera.sensitivity") refresh_sensitivity() - document.search_panel:add(string.format( - "%s", - gui.str("controls.key.tooltip", "settings"), gui.str("Key", "settings") - )) - local panel = document.bindings_panel local bindings = input.get_bindings() table.sort(bindings, function(a, b) return a > b end) From 395223b0185b4002f79544f06108527d361cf319 Mon Sep 17 00:00:00 2001 From: Xertis <118364459+Xertis@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:00:42 +0300 Subject: [PATCH 2/6] Update settings_controls.xml --- res/layouts/pages/settings_controls.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/layouts/pages/settings_controls.xml b/res/layouts/pages/settings_controls.xml index 30927037..9a1d1647 100644 --- a/res/layouts/pages/settings_controls.xml +++ b/res/layouts/pages/settings_controls.xml @@ -7,6 +7,7 @@ + @settings.Controls Search Mode From fbacb9fe189d96a1bcfe5a64c18637840f3c22f1 Mon Sep 17 00:00:00 2001 From: Xertis Date: Thu, 7 Nov 2024 22:17:01 +0300 Subject: [PATCH 3/6] adding new lang bindings --- res/texts/en_US.txt | 4 +++- res/texts/ru_RU.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/texts/en_US.txt b/res/texts/en_US.txt index 0d15d5b0..9c9cc2a5 100644 --- a/res/texts/en_US.txt +++ b/res/texts/en_US.txt @@ -14,7 +14,9 @@ world.generators.flat=Flat # Tooltips graphics.gamma.tooltip=Lighting brightness curve graphics.backlight.tooltip=Backlight to prevent total darkness -controls.key.tooltip=Search by attached button name + +# settings +settings.Controls Search Mode=Search by attached button name # Bindings chunks.reload=Reload Chunks diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt index a7d5ce43..74717336 100644 --- a/res/texts/ru_RU.txt +++ b/res/texts/ru_RU.txt @@ -20,7 +20,6 @@ pack.remove-confirm=Удалить весь поставляемый паком/ # Подсказки graphics.gamma.tooltip=Кривая яркости освещения graphics.backlight.tooltip=Подсветка, предотвращающая полную темноту -controls.key.tooltip=Поиск по привязвнной кнопки управления # Меню menu.Apply=Применить @@ -76,6 +75,7 @@ settings.Regular Sounds=Обычные Звуки settings.UI Sounds=Звуки Интерфейса settings.V-Sync=Вертикальная Синхронизация settings.Key=Кнопка +settings.Controls Search Mode=Поиск по привязанной кнопки управления settings.Limit Background FPS=Ограничить фоновую частоту кадров # Управление From 98b27af0d3f672b4bd09dd4ee4354189984c01a6 Mon Sep 17 00:00:00 2001 From: Xertis Date: Thu, 7 Nov 2024 22:20:09 +0300 Subject: [PATCH 4/6] some fix --- res/layouts/pages/settings_controls.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layouts/pages/settings_controls.xml b/res/layouts/pages/settings_controls.xml index 9a1d1647..c5655e1d 100644 --- a/res/layouts/pages/settings_controls.xml +++ b/res/layouts/pages/settings_controls.xml @@ -6,8 +6,8 @@ + @settings.Controls Search Mode - @settings.Controls Search Mode From 807bab56238459ba2920899845c01ac0bab021a3 Mon Sep 17 00:00:00 2001 From: Xertis Date: Thu, 7 Nov 2024 22:43:15 +0300 Subject: [PATCH 5/6] made the problemsLog scrollable --- res/layouts/console.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/layouts/console.xml b/res/layouts/console.xml index 3e1b802d..fdecac4d 100644 --- a/res/layouts/console.xml +++ b/res/layouts/console.xml @@ -15,6 +15,8 @@ color="#00000010" position-func="gui.get_viewport()[1]-350,0" size-func="351,gui.get_viewport()[2]-40" + interval='8' + max-length='380' padding="5,15,5,15"> From a9b052e7ca3b3d9ec2a38fafcdb7ff1ace0a7582 Mon Sep 17 00:00:00 2001 From: Xertis Date: Thu, 7 Nov 2024 22:57:00 +0300 Subject: [PATCH 6/6] Revert "made the problemsLog scrollable" This reverts commit 807bab56238459ba2920899845c01ac0bab021a3. --- res/layouts/console.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/res/layouts/console.xml b/res/layouts/console.xml index fdecac4d..3e1b802d 100644 --- a/res/layouts/console.xml +++ b/res/layouts/console.xml @@ -15,8 +15,6 @@ color="#00000010" position-func="gui.get_viewport()[1]-350,0" size-func="351,gui.get_viewport()[2]-40" - interval='8' - max-length='380' padding="5,15,5,15">