From 006ef5b4a5e362eed848ca26b411a8059d74b965 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Thu, 15 Oct 2015 21:32:31 +0200 Subject: New settings tab contain all possible settings Settings are automatically parsed from builtin/settingtypes.txt The edit dialog automatically adjust based on the type of setting --- builtin/mainmenu/tab_settings.lua | 835 +++++++++++++++++++------------------- 1 file changed, 421 insertions(+), 414 deletions(-) (limited to 'builtin/mainmenu/tab_settings.lua') diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index d39030b1d..90d245337 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -1,5 +1,5 @@ --Minetest ---Copyright (C) 2013 sapier +--Copyright (C) 2015 PilzAdam -- --This program is free software; you can redistribute it and/or modify --it under the terms of the GNU Lesser General Public License as published by @@ -15,497 +15,504 @@ --with this program; if not, write to the Free Software Foundation, Inc., --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --------------------------------------------------------------------------------- +local FILENAME = "settingtypes.txt" -local leaves_style_labels = { - fgettext("Opaque Leaves"), - fgettext("Simple Leaves"), - fgettext("Fancy Leaves") -} +local function parse_setting_line(settings, line) + -- empty lines + if line:match("^[%s]*$") then + -- clear current_comment so only comments directly above a setting are bound to it + settings.current_comment = "" + return + end -local leaves_style = { - {leaves_style_labels[1]..","..leaves_style_labels[2]..","..leaves_style_labels[3]}, - {"opaque", "simple", "fancy"}, -} + -- category + local category = line:match("^%[([^%]]+)%]$") + if category then + local level = 0 + local index = 1 + while category:sub(index, index) == "*" do + level = level + 1 + index = index + 1 + end + category = category:sub(index, -1) + table.insert(settings, { + name = category, + level = level, + type = "category", + }) + return + end + + -- comment + local comment = line:match("^#[%s]*(.*)$") + if comment then + if settings.current_comment == "" then + settings.current_comment = comment + else + settings.current_comment = settings.current_comment .. "\n" .. comment + end + return + end -local dd_filter_labels = { - fgettext("No Filter"), - fgettext("Bilinear Filter"), - fgettext("Trilinear Filter") -} + -- settings + local first_part, name, readable_name, setting_type = + line:match("^(([%w%._-]+)[%s]+%(([^%)]*)%)[%s]+([%w_]+)[%s]*)") -local filters = { - {dd_filter_labels[1]..","..dd_filter_labels[2]..","..dd_filter_labels[3]}, - {"", "bilinear_filter", "trilinear_filter"}, -} + if first_part then + if readable_name == "" then + readable_name = nil + end + local remaining_line = line:sub(first_part:len() + 1) + + if setting_type == "int" then + local default, min, max = remaining_line:match("^([%d]+)[%s]*([%d]*)[%s]*([%d]*)$") + if default and tonumber(default) then + if min == "" then + min = nil + end + if max == "" then + max = nil + end + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "int", + default = default, + min = min, + max = max, + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid int in " .. FILENAME .. ": " .. line) + end -local dd_mipmap_labels = { - fgettext("No Mipmap"), - fgettext("Mipmap"), - fgettext("Mipmap + Aniso. Filter") -} + elseif setting_type == "string" or setting_type == "flags" or setting_type == "noise_params" then + local default = remaining_line:match("^[%s]*(.*)$") + if default then + table.insert(settings, { + name = name, + readable_name = readable_name, + type = setting_type, + default = default, + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid string in " .. FILENAME .. ": " .. line) + end -local mipmap = { - {dd_mipmap_labels[1]..","..dd_mipmap_labels[2]..","..dd_mipmap_labels[3]}, - {"", "mip_map", "anisotropic_filter"}, -} + elseif setting_type == "bool" then + if remaining_line == "false" or remaining_line == "true" then + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "bool", + default = remaining_line, + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid bool in " .. FILENAME .. ": " .. line) + end -local function getLeavesStyleSettingIndex() - local style = core.setting_get("leaves_style") - if (style == leaves_style[2][3]) then - return 3 - elseif (style == leaves_style[2][2]) then - return 2 - end - return 1 -end + elseif setting_type == "float" then + local default, min, max + = remaining_line:match("^([%d%.]+)[%s]*([%d%.]*)[%s]*([%d%.]*)$") + if default and tonumber(default) then + if min == "" then + min = nil + end + if max == "" then + max = nil + end + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "float", + default = default, + min = min, + max = max, + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid float in " .. FILENAME .. ": " .. line) + end -local dd_antialiasing_labels = { - fgettext("None"), - fgettext("2x"), - fgettext("4x"), - fgettext("8x"), -} + elseif setting_type == "enum" then + local default, values = remaining_line:match("^([^%s]+)[%s]+(.+)$") + if default and values ~= "" then + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "enum", + default = default, + values = values:split(","), + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid enum in " .. FILENAME .. ": " .. line) + end -local antialiasing = { - {dd_antialiasing_labels[1]..","..dd_antialiasing_labels[2]..",".. - dd_antialiasing_labels[3]..","..dd_antialiasing_labels[4]}, - {"0", "2", "4", "8"} -} + elseif setting_type == "path" then + local default = remaining_line:match("^[%s]*(.*)$") + if default then + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "path", + default = default, + comment = settings.current_comment, + }) + else + core.log("error", "Found invalid path in " .. FILENAME .. ": " .. line) + end -local function getFilterSettingIndex() - if (core.setting_get(filters[2][3]) == "true") then - return 3 - end - if (core.setting_get(filters[2][3]) == "false" and core.setting_get(filters[2][2]) == "true") then - return 2 + elseif setting_type == "key" then + --ignore keys, since we have a special dialog for them + + -- TODO: flags, noise_params (, struct) + + else + core.log("error", "Found setting with invalid setting type in " .. FILENAME .. ": " .. line) + end + else + core.log("error", "Found invalid line in " .. FILENAME .. ": " .. line) end - return 1 + -- clear current_comment since we just used it + -- if we not just used it, then clear it since we only want comments + -- directly above the setting to be bound to it + settings.current_comment = "" end -local function getMipmapSettingIndex() - if (core.setting_get(mipmap[2][3]) == "true") then - return 3 +local function parse_config_file() + local file = io.open(core.get_builtin_path() .. DIR_DELIM .. FILENAME, "r") + local settings = {} + if not file then + core.log("error", "Can't load " .. FILENAME) + return settings end - if (core.setting_get(mipmap[2][3]) == "false" and core.setting_get(mipmap[2][2]) == "true") then - return 2 + + -- store this helper variable in the table so it's easier to pass to parse_setting_line() + settings.current_comment = "" + + local line = file:read("*line") + while line do + parse_setting_line(settings, line) + line = file:read("*line") end - return 1 + + settings.current_comment = nil + + file:close() + return settings end -local function getAntialiasingSettingIndex() - local antialiasing_setting = core.setting_get("fsaa") - for i = 1, #(antialiasing[2]) do - if antialiasing_setting == antialiasing[2][i] then - return i - end +local settings = parse_config_file() +local selected_setting = 1 + +local function get_current_value(setting) + local value = core.setting_get(setting.name) + if value == nil then + value = setting.default end - return 1 + return value end -local function antialiasing_fname_to_name(fname) - for i = 1, #(dd_antialiasing_labels) do - if fname == dd_antialiasing_labels[i] then - return antialiasing[2][i] - end +local function create_change_setting_formspec(dialogdata) + local setting = settings[selected_setting] + local formspec = "size[10,5.2,true]" .. + "button[5,4.5;2,1;btn_done;" .. fgettext("Save") .. "]" .. + "button[3,4.5;2,1;btn_cancel;" .. fgettext("Cancel") .. "]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[0,0;10,3;info;" + + if setting.readable_name then + formspec = formspec .. "#FFFF00," .. fgettext(setting.readable_name) + .. " (" .. core.formspec_escape(setting.name) .. ")," + else + formspec = formspec .. "#FFFF00," .. core.formspec_escape(setting.name) .. "," end - return 0 -end -local function dlg_confirm_reset_formspec(data) - local retval = - "size[8,3]" .. - "label[1,1;".. fgettext("Are you sure to reset your singleplayer world?") .. "]".. - "button[1,2;2.6,0.5;dlg_reset_singleplayer_confirm;".. - fgettext("Yes") .. "]" .. - "button[4,2;2.8,0.5;dlg_reset_singleplayer_cancel;".. - fgettext("No!!!") .. "]" - return retval -end + formspec = formspec .. ",," -local function dlg_confirm_reset_btnhandler(this, fields, dialogdata) + for _, comment_line in ipairs(fgettext_ne(setting.comment):split("\n")) do + formspec = formspec .. "," .. core.formspec_escape(comment_line) .. "," + end - if fields["dlg_reset_singleplayer_confirm"] ~= nil then - local worldlist = core.get_worlds() - local found_singleplayerworld = false + formspec = formspec .. ";1]" - for i=1,#worldlist,1 do - if worldlist[i].name == "singleplayerworld" then - found_singleplayerworld = true - gamedata.worldindex = i + if setting.type == "bool" then + local selected_index + if core.is_yes(get_current_value(setting)) then + selected_index = 2 + else + selected_index = 1 + end + formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" + .. fgettext("Disabled") .. "," .. fgettext("Enabled") .. ";" .. selected_index .. "]" + + elseif setting.type == "enum" then + local selected_index = 0 + formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" + for index, value in ipairs(setting.values) do + -- translating value is not possible, since it's the value + -- that we set the setting to + formspec = formspec .. core.formspec_escape(value) .. "," + if get_current_value(setting) == value then + selected_index = index end end - - if found_singleplayerworld then - core.delete_world(gamedata.worldindex) + if #setting.values > 0 then + formspec = formspec:sub(1, -2) -- remove trailing comma end + formspec = formspec .. ";" .. selected_index .. "]" - core.create_world("singleplayerworld", 1) - - worldlist = core.get_worlds() - - found_singleplayerworld = false - - for i=1,#worldlist,1 do - if worldlist[i].name == "singleplayerworld" then - found_singleplayerworld = true - gamedata.worldindex = i - end + elseif setting.type == "path" then + local current_value = dialogdata.selected_path + if not current_value then + current_value = get_current_value(setting) end - end + formspec = formspec .. "field[0.5,4;7.5,1;te_setting_value;;" + .. core.formspec_escape(current_value) .. "]" + .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]" - this.parent:show() - this:hide() - this:delete() - return true + else + -- TODO: fancy input for float, int, flags, noise_params + formspec = formspec .. "field[0.5,4;9.5,1;te_setting_value;;" + .. core.formspec_escape(get_current_value(setting)) .. "]" + end + return formspec end -local function showconfirm_reset(tabview) - local new_dlg = dialog_create("reset_spworld", - dlg_confirm_reset_formspec, - dlg_confirm_reset_btnhandler, - nil) - new_dlg:set_parent(tabview) - tabview:hide() - new_dlg:show() -end +local function handle_change_setting_buttons(this, fields) + if fields["btn_done"] or fields["key_enter"] then + local setting = settings[selected_setting] + if setting.type == "bool" then + local new_value = fields["dd_setting_value"] + -- Note: new_value is the actual (translated) value shown in the dropdown + core.setting_setbool(setting.name, new_value == fgettext("Enabled")) -local function gui_scale_to_scrollbar() - local current_value = tonumber(core.setting_get("gui_scaling")) + elseif setting.type == "enum" then + local new_value = fields["dd_setting_value"] + core.setting_set(setting.name, new_value) - if (current_value == nil) or current_value < 0.25 then - return 0 - end - if current_value <= 1.25 then - return ((current_value - 0.25)/ 1.0) * 700 - end - if current_value <= 6 then - return ((current_value -1.25) * 100) + 700 + else + local new_value = fields["te_setting_value"] + core.setting_set(setting.name, new_value) + end + core.setting_save() + this:delete() + return true end - return 1000 -end - -local function scrollbar_to_gui_scale(value) - value = tonumber(value) - - if (value <= 700) then - return ((value / 700) * 1.0) + 0.25 - end - if (value <= 1000) then - return ((value - 700) / 100) + 1.25 + if fields["btn_cancel"] then + this:delete() + return true end - return 1 -end - -local function viewing_range_min_to_scrollbar() - local current_value_min = tonumber(core.setting_get("viewing_range_nodes_min")) - - if (current_value_min == nil) then - return 0 + if fields["btn_browser_path"] then + core.show_file_open_dialog("dlg_browse_path", fgettext_ne("Select path")) end - return current_value_min * 2 -end -local function viewing_range_max_to_scrollbar() - local current_value_max = tonumber(core.setting_get("viewing_range_nodes_max")) - - if (current_value_max == nil) then - return 0 + if fields["dlg_browse_path_accepted"] then + this.data.selected_path = fields["dlg_browse_path_accepted"] + core.update_formspec(this:get_formspec()) end - return current_value_max * 2 -end -local function scrollbar_to_viewing_range(value) - value = tonumber(value) - - if (value <= 1000) then - return value / 2 - end - return 35 + return false end -local function formspec(tabview, name, tabdata) - local tab_string = - "box[0,0;3.5,4.0;#999999]" .. - "checkbox[0.25,0;cb_smooth_lighting;".. fgettext("Smooth Lighting") - .. ";".. dump(core.setting_getbool("smooth_lighting")) .. "]".. - "checkbox[0.25,0.5;cb_particles;".. fgettext("Enable Particles") .. ";" - .. dump(core.setting_getbool("enable_particles")) .. "]".. - "checkbox[0.25,1;cb_3d_clouds;".. fgettext("3D Clouds") .. ";" - .. dump(core.setting_getbool("enable_3d_clouds")) .. "]".. - "checkbox[0.25,1.5;cb_opaque_water;".. fgettext("Opaque Water") .. ";" - .. dump(core.setting_getbool("opaque_water")) .. "]".. - "checkbox[0.25,2.0;cb_connected_glass;".. fgettext("Connected Glass") .. ";" - .. dump(core.setting_getbool("connected_glass")) .. "]".. - "checkbox[0.25,2.5;cb_node_highlighting;".. fgettext("Node Highlighting") .. ";" - .. dump(core.setting_getbool("enable_node_highlighting")) .. "]".. - "dropdown[0.25,3.2;3.3;dd_leaves_style;" .. leaves_style[1][1] .. ";" - .. getLeavesStyleSettingIndex() .. "]" .. - "box[3.75,0;3.75,3.45;#999999]" .. - "label[3.85,0.1;".. fgettext("Texturing:") .. "]".. - "dropdown[3.85,0.55;3.85;dd_filters;" .. filters[1][1] .. ";" - .. getFilterSettingIndex() .. "]" .. - "dropdown[3.85,1.35;3.85;dd_mipmap;" .. mipmap[1][1] .. ";" - .. getMipmapSettingIndex() .. "]" .. - "label[3.85,2.15;".. fgettext("Antialiasing:") .. "]".. - "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. antialiasing[1][1] .. ";" - .. getAntialiasingSettingIndex() .. "]" .. - "box[7.75,0;4,4;#999999]" .. - "checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";" - .. dump(core.setting_getbool("enable_shaders")) .. "]" - - if PLATFORM ~= "Android" then - tab_string = tab_string .. - "button[8,4.75;3.75,0.5;btn_change_keys;".. fgettext("Change keys") .. "]" - else - tab_string = tab_string .. - "button[8,4.75;3.75,0.5;btn_reset_singleplayer;".. fgettext("Reset singleplayer world") .. "]" - end - tab_string = tab_string .. - "box[0,4.25;3.5,1.1;#999999]" .. - "label[0.25,4.25;" .. fgettext("GUI scale factor") .. "]" .. - "scrollbar[0.25,4.75;3,0.4;sb_gui_scaling;horizontal;" .. - gui_scale_to_scrollbar() .. "]" .. - "tooltip[sb_gui_scaling;" .. - fgettext("Scaling factor applied to menu elements: ") .. - dump(core.setting_get("gui_scaling")) .. "]" - - if PLATFORM == "Android" then - tab_string = tab_string .. - "box[3.75,3.55;3.75,1.8;#999999]" .. - "checkbox[3.9,3.45;cb_touchscreen_target;".. fgettext("Touch free target") .. ";" - .. dump(core.setting_getbool("touchtarget")) .. "]" - end - - if core.setting_get("touchscreen_threshold") ~= nil then - tab_string = tab_string .. - "label[4.3,4.1;" .. fgettext("Touchthreshold (px)") .. "]" .. - "dropdown[3.85,4.55;3.85;dd_touchthreshold;0,10,20,30,40,50;" .. - ((tonumber(core.setting_get("touchscreen_threshold"))/10)+1) .. "]" - end +local function create_settings_formspec(tabview, name, tabdata) + local formspec = "tablecolumns[color;tree;text;text]" .. + "tableoptions[background=#00000000;border=false]" .. + "table[0,0;12,4.5;list_settings;" - if core.setting_getbool("enable_shaders") then - tab_string = tab_string .. - "checkbox[8,0.5;cb_bumpmapping;".. fgettext("Bumpmapping") .. ";" - .. dump(core.setting_getbool("enable_bumpmapping")) .. "]".. - "checkbox[8,1.0;cb_generate_normalmaps;".. fgettext("Generate Normalmaps") .. ";" - .. dump(core.setting_getbool("generate_normalmaps")) .. "]".. - "checkbox[8,1.5;cb_parallax;".. fgettext("Parallax Occlusion") .. ";" - .. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]".. - "checkbox[8,2.0;cb_waving_water;".. fgettext("Waving Water") .. ";" - .. dump(core.setting_getbool("enable_waving_water")) .. "]".. - "checkbox[8,2.5;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";" - .. dump(core.setting_getbool("enable_waving_leaves")) .. "]".. - "checkbox[8,3.0;cb_waving_plants;".. fgettext("Waving Plants") .. ";" - .. dump(core.setting_getbool("enable_waving_plants")) .. "]" - else - tab_string = tab_string .. - "textlist[8.33,0.7;4,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" .. - "textlist[8.33,1.2;4,1;;#888888" .. fgettext("Generate Normalmaps") .. ";0;true]" .. - "textlist[8.33,1.7;4,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" .. - "textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" .. - "textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" .. - "textlist[8.33,3.2;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]" + local current_level = 0 + for _, entry in ipairs(settings) do + local name + if not core.setting_getbool("main_menu_technical_settings") and entry.readable_name then + name = fgettext_ne(entry.readable_name) + else + name = entry.name + end + + if entry.type == "category" then + current_level = entry.level + formspec = formspec .. "#FFFF00," .. current_level .. "," .. core.formspec_escape(name) .. ",," + elseif entry.type == "bool" then + local value = get_current_value(entry) + if core.is_yes(value) then + value = fgettext("Enabled") + else + value = fgettext("Disabled") + end + formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," + .. value .. "," + else + formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," + .. core.formspec_escape(get_current_value(entry)) .. "," + end end - local get_vrange_min = core.setting_get("viewing_range_nodes_min") - local get_vrange_max = core.setting_get("viewing_range_nodes_max") - - if core.setting_getbool("viewing_range_auto") then - tab_string = tab_string .. - "box[3.75,3.5;3.75,2;#999999]" .. - "label[3.85,3.5;" .. fgettext("Viewing Range :") .. "]" .. - "label[3.85,4;" .. fgettext("Min.") .. "]" .. - "scrollbar[4.65,4.05;2.75,0.4;sb_viewing_range_min;horizontal;" .. - viewing_range_min_to_scrollbar() .. "]" .. - "tooltip[sb_viewing_range_min;" .. fgettext("Minimal Viewing Range: $1 nodes", - get_vrange_min) .. "]" .. - "checkbox[3.85,4.8;cb_vrange_auto_adjust;" .. fgettext("Auto-adjust") .. ";" .. - dump(core.setting_getbool("viewing_range_auto")) .. "]".. - "label[3.85,4.5;" .. fgettext("Max.") .. "]" .. - "scrollbar[4.65,4.55;2.75,0.4;sb_viewing_range_max;horizontal;" .. - viewing_range_max_to_scrollbar() .. "]" .. - "tooltip[sb_viewing_range_max;" .. fgettext("Maximal Viewing Range: $1 nodes", - get_vrange_max) .. "]" - - if (get_vrange_min == nil and get_vrange_min > get_vrange_max) then - core.setting_set("viewing_range_nodes_min", get_vrange_max) - end - elseif (core.setting_getbool("viewing_range_auto") == nil or - core.setting_getbool("viewing_range_auto") == false) then - tab_string = tab_string .. - "box[3.75,3.5;3.75,1.5;#999999]" .. - "label[3.85,3.5;" .. fgettext("Viewing Range :") .. "]" .. - "label[3.85,4;" .. fgettext("Fixed") .. "]" .. - "scrollbar[4.65,4.05;2.75,0.4;sb_viewing_range_fixed;horizontal;" .. - viewing_range_min_to_scrollbar() .. "]" .. - "tooltip[sb_viewing_range_fixed;" .. fgettext("Fixed Viewing Range: $1 nodes", - get_vrange_min) .. "]" .. - "checkbox[3.85,4.3;cb_vrange_auto_adjust;" .. fgettext("Auto-adjust") .. ";" .. - dump(core.setting_getbool("viewing_range_auto")) .. "]" + if #settings > 0 then + formspec = formspec:sub(1, -2) -- remove trailing comma end + formspec = formspec .. ";" .. selected_setting .. "]" .. + "button[4,4.5;3,1;btn_change_keys;".. fgettext("Change keys") .. "]" .. + "button[10,4.5;2,1;btn_edit;" .. fgettext("Edit") .. "]" .. + "button[7,4.5;3,1;btn_restore;" .. fgettext("Restore Default") .. "]" .. + "checkbox[0,4.5;cb_tech_settings;" .. fgettext("Show technical names") .. ";" + .. dump(core.setting_getbool("main_menu_technical_settings")) .. "]" - return tab_string + return formspec end --------------------------------------------------------------------------------- local function handle_settings_buttons(this, fields, tabname, tabdata) - if fields["cb_smooth_lighting"] then - core.setting_set("smooth_lighting", fields["cb_smooth_lighting"]) - return true - end - if fields["cb_particles"] then - core.setting_set("enable_particles", fields["cb_particles"]) - return true - end - if fields["cb_3d_clouds"] then - core.setting_set("enable_3d_clouds", fields["cb_3d_clouds"]) - return true - end - if fields["cb_opaque_water"] then - core.setting_set("opaque_water", fields["cb_opaque_water"]) - return true - end - if fields["cb_connected_glass"] then - core.setting_set("connected_glass", fields["cb_connected_glass"]) - return true - end - if fields["cb_node_highlighting"] then - core.setting_set("enable_node_highlighting", fields["cb_node_highlighting"]) - return true - end - if fields["cb_vrange_auto_adjust"] then - core.setting_set("viewing_range_auto", fields["cb_vrange_auto_adjust"]) - return true - end - if fields["cb_shaders"] then - if (core.setting_get("video_driver") == "direct3d8" - or core.setting_get("video_driver") == "direct3d9") then - core.setting_set("enable_shaders", "false") - gamedata.errormessage = fgettext("To enable shaders the OpenGL driver needs to be used.") + local list_enter = false + if fields["list_settings"] then + selected_setting = core.get_table_index("list_settings") + if core.explode_table_event(fields["list_settings"]).type == "DCL" then + -- Directly toggle booleans + local setting = settings[selected_setting] + if setting.type == "bool" then + local current_value = get_current_value(setting) + core.setting_setbool(setting.name, not core.is_yes(current_value)) + core.setting_save() + return true + else + list_enter = true + end else - core.setting_set("enable_shaders", fields["cb_shaders"]) + return true end - return true end - if fields["cb_bumpmapping"] then - core.setting_set("enable_bumpmapping", fields["cb_bumpmapping"]) - end - if fields["cb_generate_normalmaps"] then - core.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"]) - end - if fields["cb_parallax"] then - core.setting_set("enable_parallax_occlusion", fields["cb_parallax"]) + + if fields["btn_edit"] or list_enter then + local setting = settings[selected_setting] + if setting.type ~= "category" then + local edit_dialog = dialog_create("change_setting", create_change_setting_formspec, + handle_change_setting_buttons) + edit_dialog:set_parent(this) + this:hide() + edit_dialog:show() + end return true end - if fields["cb_waving_water"] then - core.setting_set("enable_waving_water", fields["cb_waving_water"]) + + if fields["btn_restore"] then + local setting = settings[selected_setting] + if setting.type ~= "category" then + core.setting_set(setting.name, setting.default) + core.setting_save() + core.update_formspec(this:get_formspec()) + end return true end - if fields["cb_waving_leaves"] then - core.setting_set("enable_waving_leaves", fields["cb_waving_leaves"]) + + if fields["btn_change_keys"] then + core.show_keys_menu() + return true end - if fields["cb_waving_plants"] then - core.setting_set("enable_waving_plants", fields["cb_waving_plants"]) + + if fields["cb_tech_settings"] then + core.setting_set("main_menu_technical_settings", fields["cb_tech_settings"]) + core.setting_save() + core.update_formspec(this:get_formspec()) return true end - if fields["sb_gui_scaling"] then - local event = core.explode_scrollbar_event(fields["sb_gui_scaling"]) + return false +end - if event.type == "CHG" then - local tosave = string.format("%.2f",scrollbar_to_gui_scale(event.value)) - core.setting_set("gui_scaling",tosave) - return true +local function create_minetest_conf_example() + local result = "# This file contains a list of all available settings and their default value for minetest.conf\n" .. + "\n" .. + "# By default, all the settings are commented and not functional.\n" .. + "# Uncomment settings by removing the preceding #.\n" .. + "\n" .. + "# minetest.conf is read by default from:\n" .. + "# ../minetest.conf\n" .. + "# ../../minetest.conf\n" .. + "# Any other path can be chosen by passing the path as a parameter\n" .. + "# to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" .. + "\n" .. + "# Further documentation:\n" .. + "# http://wiki.minetest.net/\n" .. + "\n" + + for _, entry in ipairs(settings) do + if entry.type == "category" then + if entry.level == 0 then + result = result .. "#\n# " .. entry.name .. "\n#\n\n" + else + for i = 1, entry.level do + result = result .. "#" + end + result = result .. "# " .. entry.name .. "\n\n" + end + else + if entry.comment_line ~= "" then + for _, comment_line in ipairs(entry.comment:split("\n")) do + result = result .."# " .. comment_line .. "\n" + end + end + result = result .. "# type: " .. entry.type + if entry.min then + result = result .. " min: " .. entry.min + end + if entry.max then + result = result .. " max: " .. entry.max + end + if entry.values then + result = result .. " values: " .. table.concat(entry.values, ", ") + end + result = result .. "\n" + result = result .. "# " .. entry.name .. " = ".. entry.default .. "\n\n" end end + return result +end - for k, range in pairs({"min", "max", "fixed"}) do - if fields["sb_viewing_range_"..range] then - local event = core.explode_scrollbar_event(fields["sb_viewing_range_"..range]) - local tosave = string.format("%d", scrollbar_to_viewing_range(event.value)) - - if event.type == "CHG" and k < 3 then - core.setting_set("viewing_range_nodes_"..range, tosave) - return true - elseif event.type == "CHG" and k == 3 then - core.setting_set("viewing_range_nodes_min", tosave) - core.setting_set("viewing_range_nodes_max", tosave) - return true +local function create_translation_file() + local result = "// This file is automatically generated\n" .. + "// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" .. + "// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" .. + "fake_function() {\n" + for _, entry in ipairs(settings) do + if entry.type == "category" then + result = result .. "\tgettext(\"" .. entry.name .. "\");\n" + else + if entry.readable_name then + result = result .. "\tgettext(\"" .. entry.readable_name .. "\");\n" + end + if entry.comment ~= "" then + local comment = entry.comment:gsub("\n", "\\n") + result = result .. "\tgettext(\"" .. comment .. "\");\n" end end end + result = result .. "}\n" + return result +end - if fields["btn_change_keys"] then - core.show_keys_menu() - return true - end - if fields["cb_touchscreen_target"] then - core.setting_set("touchtarget", fields["cb_touchscreen_target"]) - return true - end - if fields["btn_reset_singleplayer"] then - showconfirm_reset(this) - return true +if false then + local file = io.open("minetest.conf.example", "w") + if file then + file:write(create_minetest_conf_example()) + file:close() end +end - --Note dropdowns have to be handled LAST! - local ddhandled = false - - if fields["dd_leaves_style"] == leaves_style_labels[1] then - core.setting_set("leaves_style", leaves_style[2][1]) - ddhandled = true - elseif fields["dd_leaves_style"] == leaves_style_labels[2] then - core.setting_set("leaves_style", leaves_style[2][2]) - ddhandled = true - elseif fields["dd_leaves_style"] == leaves_style_labels[3] then - core.setting_set("leaves_style", leaves_style[2][3]) - ddhandled = true - end - if fields["dd_filters"] == dd_filter_labels[1] then - core.setting_set("bilinear_filter", "false") - core.setting_set("trilinear_filter", "false") - ddhandled = true - elseif fields["dd_filters"] == dd_filter_labels[2] then - core.setting_set("bilinear_filter", "true") - core.setting_set("trilinear_filter", "false") - ddhandled = true - elseif fields["dd_filters"] == dd_filter_labels[3] then - core.setting_set("bilinear_filter", "false") - core.setting_set("trilinear_filter", "true") - ddhandled = true +if false then + local file = io.open("src/settings_translation_file.c", "w") + if file then + file:write(create_translation_file()) + file:close() end - if fields["dd_mipmap"] == dd_mipmap_labels[1] then - core.setting_set("mip_map", "false") - core.setting_set("anisotropic_filter", "false") - ddhandled = true - elseif fields["dd_mipmap"] == dd_mipmap_labels[2] then - core.setting_set("mip_map", "true") - core.setting_set("anisotropic_filter", "false") - ddhandled = true - elseif fields["dd_mipmap"] == dd_mipmap_labels[3] then - core.setting_set("mip_map", "true") - core.setting_set("anisotropic_filter", "true") - ddhandled = true - end - if fields["dd_antialiasing"] then - core.setting_set("fsaa", - antialiasing_fname_to_name(fields["dd_antialiasing"])) - ddhandled = true - end - if fields["dd_touchthreshold"] then - core.setting_set("touchscreen_threshold",fields["dd_touchthreshold"]) - ddhandled = true - end - - return ddhandled end tab_settings = { name = "settings", caption = fgettext("Settings"), - cbf_formspec = formspec, - cbf_button_handler = handle_settings_buttons + cbf_formspec = create_settings_formspec, + cbf_button_handler = handle_settings_buttons, } -- cgit v1.2.3