PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #357 from Xertis/main

Browse Source 
Correction settings.controls
This commit is contained in:
MihailRis 2024-11-07 23:31:52 +03:00 committed by GitHub
commit f84fe71021
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/layouts/pages/settings_controls.xml
View File

@ -6,6 +6,7 @@
</trackbar> </trackbar>
<panel id='search_panel' size='380,60' padding='2' interval='1' color='#0000004C'> <panel id='search_panel' size='380,60' padding='2' interval='1' color='#0000004C'>
<textbox id='search_textbox' multiline='false' size='300,20' sub-consumer='function(x) refresh_search() end'></textbox> <textbox id='search_textbox' multiline='false' size='300,20' sub-consumer='function(x) refresh_search() end'></textbox>
<checkbox size='100,24' id='search_key_checkbox' consumer='function(x) refresh_search() end'>@settings.Controls Search Mode</checkbox>
</panel> </panel>
<panel id='bindings_panel' size='380,204' padding='2' interval='1' max-length='300' color='#0000004C'> <panel id='bindings_panel' size='380,204' padding='2' interval='1' max-length='300' color='#0000004C'>
<!-- content is generated in script --> <!-- content is generated in script -->

5
res/layouts/pages/settings_controls.xml.lua
View File

@ -44,11 +44,6 @@ function on_open()
document.sensitivity_track.value = core.get_setting("camera.sensitivity") document.sensitivity_track.value = core.get_setting("camera.sensitivity")
refresh_sensitivity() refresh_sensitivity()
document.search_panel:add(string.format(
"<checkbox size='100,24' id='search_key_checkbox' consumer='function(x) refresh_search() end' tooltip='%s'>%s</checkbox>",
gui.str("controls.key.tooltip", "settings"), gui.str("Key", "settings")
))
local panel = document.bindings_panel local panel = document.bindings_panel
local bindings = input.get_bindings() local bindings = input.get_bindings()
table.sort(bindings, function(a, b) return a > b end) table.sort(bindings, function(a, b) return a > b end)

4
res/texts/en_US.txt
View File

@ -14,7 +14,9 @@ world.generators.flat=Flat
# Tooltips # Tooltips
graphics.gamma.tooltip=Lighting brightness curve graphics.gamma.tooltip=Lighting brightness curve
graphics.backlight.tooltip=Backlight to prevent total darkness 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 # Bindings
chunks.reload=Reload Chunks chunks.reload=Reload Chunks

2
res/texts/ru_RU.txt
View File

@ -20,7 +20,6 @@ pack.remove-confirm=Удалить весь поставляемый паком/
# Подсказки # Подсказки
graphics.gamma.tooltip=Кривая яркости освещения graphics.gamma.tooltip=Кривая яркости освещения
graphics.backlight.tooltip=Подсветка, предотвращающая полную темноту graphics.backlight.tooltip=Подсветка, предотвращающая полную темноту
controls.key.tooltip=Поиск по привязвнной кнопки управления
# Меню # Меню
menu.Apply=Применить menu.Apply=Применить
@ -76,6 +75,7 @@ settings.Regular Sounds=Обычные Звуки
settings.UI Sounds=Звуки Интерфейса settings.UI Sounds=Звуки Интерфейса
settings.V-Sync=Вертикальная Синхронизация settings.V-Sync=Вертикальная Синхронизация
settings.Key=Кнопка settings.Key=Кнопка
settings.Controls Search Mode=Поиск по привязанной кнопки управления
settings.Limit Background FPS=Ограничить фоновую частоту кадров settings.Limit Background FPS=Ограничить фоновую частоту кадров
# Управление # Управление