diff options
| author | Wuzzy <wuzzy2@mail.ru> | 2016-11-05 18:42:14 +0100 |
|---|---|---|
| committer | est31 <est31@users.noreply.github.com> | 2016-11-05 18:42:14 +0100 |
| commit | 1c570cb3906a871920f8a628a307308820004a23 (patch) | |
| tree | f8b45c417fb9eeef63659f4c33bc99ce2cdafe0d /builtin/mainmenu/dlg_config_world.lua | |
| parent | 66bb2954362748c4722d366d0df490ad51a591a2 (diff) | |
| download | minetest-1c570cb3906a871920f8a628a307308820004a23.tar.gz minetest-1c570cb3906a871920f8a628a307308820004a23.tar.bz2 minetest-1c570cb3906a871920f8a628a307308820004a23.zip | |
Separate optional from required mod dependencies in main menu (#4721)
* Separate optional from require dep's in main menu
* Simplify modmgr mod dependency listing code
Diffstat (limited to 'builtin/mainmenu/dlg_config_world.lua')
| -rw-r--r-- | builtin/mainmenu/dlg_config_world.lua | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua index 6e6224c92..7b3ab9852 100644 --- a/builtin/mainmenu/dlg_config_world.lua +++ b/builtin/mainmenu/dlg_config_world.lua @@ -47,13 +47,18 @@ local function get_formspec(data) if mod == nil then mod = {name=""} end + + local hard_deps, soft_deps = modmgr.get_dependencies(mod.path) retval = retval .. "label[0,0.7;" .. fgettext("Mod:") .. "]" .. "label[0.75,0.7;" .. mod.name .. "]" .. - "label[0,1.25;" .. fgettext("Depends:") .. "]" .. - "textlist[0,1.75;5,4.25;world_config_depends;" .. - modmgr.get_dependencies(mod.path) .. ";0]" .. + "label[0,1.25;" .. fgettext("Dependencies:") .. "]" .. + "textlist[0,1.75;5,2.125;world_config_depends;" .. + hard_deps .. ";0]" .. + "label[0,3.875;" .. fgettext("Optional dependencies:") .. "]" .. + "textlist[0,4.375;5,1.8;world_config_optdepends;" .. + soft_deps .. ";0]" .. "button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" .. "button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]" @@ -86,11 +91,11 @@ local function get_formspec(data) if enabled_all then retval = retval .. "button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" .. fgettext("Disable all") .. "]" .. - "textlist[5.5,0.75;5.75,5.25;world_config_modlist;" + "textlist[5.5,0.75;5.75,5.4;world_config_modlist;" else retval = retval .. "button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" .. fgettext("Enable all") .. "]" .. - "textlist[5.5,0.75;5.75,5.25;world_config_modlist;" + "textlist[5.5,0.75;5.75,5.4;world_config_modlist;" end retval = retval .. modmgr.render_modlist(data.list) retval = retval .. ";" .. data.selected_mod .."]" |