forked from Mirrorlandia_minetest/minetest
Mainmenu: Refactor tab UI code
- Use local variables for tabs in place of globals - Merge together if statements where possible - Replace manual table searching code with indexof where possible
This commit is contained in:
parent
27ee8d8943
commit
92d4a73843
@ -37,23 +37,29 @@ dofile(menupath .. DIR_DELIM .. "common.lua")
|
|||||||
dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
|
dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
|
dofile(menupath .. DIR_DELIM .. "modmgr.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "store.lua")
|
dofile(menupath .. DIR_DELIM .. "store.lua")
|
||||||
|
dofile(menupath .. DIR_DELIM .. "textures.lua")
|
||||||
|
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
|
||||||
if PLATFORM ~= "Android" then
|
if PLATFORM ~= "Android" then
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
|
end
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_server.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
|
local tabs = {}
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
|
|
||||||
dofile(menupath .. DIR_DELIM .. "textures.lua")
|
tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
|
||||||
|
tabs.mods = dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
|
||||||
|
tabs.credits = dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
|
||||||
|
if PLATFORM == "Android" then
|
||||||
|
tabs.simple_main = dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
|
||||||
else
|
else
|
||||||
dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
|
tabs.singleplayer = dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
|
||||||
|
tabs.multiplayer = dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
|
||||||
|
tabs.server = dofile(menupath .. DIR_DELIM .. "tab_server.lua")
|
||||||
|
tabs.texturepacks = dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
@ -69,8 +75,19 @@ local function init_globals()
|
|||||||
-- Init gamedata
|
-- Init gamedata
|
||||||
gamedata.worldindex = 0
|
gamedata.worldindex = 0
|
||||||
|
|
||||||
|
if PLATFORM == "Android" then
|
||||||
|
local world_list = core.get_worlds()
|
||||||
|
local world_index = table.indexof(world_list, "singleplayerworld")
|
||||||
|
|
||||||
if PLATFORM ~= "Android" then
|
if world_index == -1 then
|
||||||
|
core.create_world("singleplayerworld", 1)
|
||||||
|
|
||||||
|
world_list = core.get_worlds()
|
||||||
|
world_index = table.indexof(world_list, "singleplayerworld")
|
||||||
|
end
|
||||||
|
|
||||||
|
gamedata.worldindex = world_index
|
||||||
|
else
|
||||||
menudata.worldlist = filterlist.create(
|
menudata.worldlist = filterlist.create(
|
||||||
core.get_worlds,
|
core.get_worlds,
|
||||||
compare_worlds,
|
compare_worlds,
|
||||||
@ -93,57 +110,30 @@ local function init_globals()
|
|||||||
end
|
end
|
||||||
|
|
||||||
mm_texture.init()
|
mm_texture.init()
|
||||||
else
|
|
||||||
local world_list = core.get_worlds()
|
|
||||||
|
|
||||||
local found_singleplayerworld = false
|
|
||||||
|
|
||||||
for i,world in pairs(world_list) do
|
|
||||||
if world.name == "singleplayerworld" then
|
|
||||||
found_singleplayerworld = true
|
|
||||||
gamedata.worldindex = i
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if not found_singleplayerworld then
|
|
||||||
core.create_world("singleplayerworld", 1)
|
|
||||||
|
|
||||||
local world_list = core.get_worlds()
|
|
||||||
|
|
||||||
for i,world in pairs(world_list) do
|
|
||||||
if world.name == "singleplayerworld" then
|
|
||||||
gamedata.worldindex = i
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Create main tabview
|
-- Create main tabview
|
||||||
local tv_main = tabview_create("maintab", {x = 12, y = 5.2}, {x = 0, y = 0})
|
local tv_main = tabview_create("maintab", {x = 12, y = 5.2}, {x = 0, y = 0})
|
||||||
if PLATFORM ~= "Android" then
|
|
||||||
tv_main:set_autosave_tab(true)
|
if PLATFORM == "Android" then
|
||||||
end
|
tv_main:add(tabs.simple_main)
|
||||||
if PLATFORM ~= "Android" then
|
tv_main:add(tabs.settings)
|
||||||
tv_main:add(tab_singleplayer)
|
|
||||||
tv_main:add(tab_multiplayer)
|
|
||||||
tv_main:add(tab_server)
|
|
||||||
else
|
else
|
||||||
tv_main:add(tab_simple_main)
|
tv_main:set_autosave_tab(true)
|
||||||
|
tv_main:add(tabs.singleplayer)
|
||||||
|
tv_main:add(tabs.multiplayer)
|
||||||
|
tv_main:add(tabs.server)
|
||||||
|
tv_main:add(tabs.settings)
|
||||||
|
tv_main:add(tabs.texturepacks)
|
||||||
end
|
end
|
||||||
tv_main:add(tab_settings)
|
|
||||||
if PLATFORM ~= "Android" then
|
tv_main:add(tabs.mods)
|
||||||
tv_main:add(tab_texturepacks)
|
tv_main:add(tabs.credits)
|
||||||
end
|
|
||||||
tv_main:add(tab_mods)
|
|
||||||
tv_main:add(tab_credits)
|
|
||||||
|
|
||||||
tv_main:set_global_event_handler(main_event_handler)
|
tv_main:set_global_event_handler(main_event_handler)
|
||||||
|
|
||||||
tv_main:set_fixed_size(false)
|
tv_main:set_fixed_size(false)
|
||||||
|
|
||||||
if not (PLATFORM == "Android") then
|
if PLATFORM ~= "Android" then
|
||||||
tv_main:set_tab(core.setting_get("maintab_LAST"))
|
tv_main:set_tab(core.setting_get("maintab_LAST"))
|
||||||
end
|
end
|
||||||
ui.set_default("maintab")
|
ui.set_default("maintab")
|
||||||
|
@ -69,7 +69,7 @@ local previous_contributors = {
|
|||||||
"Zefram <zefram@fysh.org>",
|
"Zefram <zefram@fysh.org>",
|
||||||
}
|
}
|
||||||
|
|
||||||
tab_credits = {
|
return {
|
||||||
name = "credits",
|
name = "credits",
|
||||||
caption = fgettext("Credits"),
|
caption = fgettext("Credits"),
|
||||||
cbf_formspec = function(tabview, name, tabdata)
|
cbf_formspec = function(tabview, name, tabdata)
|
||||||
|
@ -163,7 +163,7 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_mods = {
|
return {
|
||||||
name = "mods",
|
name = "mods",
|
||||||
caption = fgettext("Mods"),
|
caption = fgettext("Mods"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
@ -256,7 +256,7 @@ local function on_change(type,old_tab,new_tab)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_multiplayer = {
|
return {
|
||||||
name = "multiplayer",
|
name = "multiplayer",
|
||||||
caption = fgettext("Client"),
|
caption = fgettext("Client"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
@ -186,7 +186,7 @@ local function main_button_handler(this, fields, name, tabdata)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_server = {
|
return {
|
||||||
name = "server",
|
name = "server",
|
||||||
caption = fgettext("Server"),
|
caption = fgettext("Server"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
@ -384,7 +384,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
|
|||||||
return ddhandled
|
return ddhandled
|
||||||
end
|
end
|
||||||
|
|
||||||
tab_settings = {
|
return {
|
||||||
name = "settings",
|
name = "settings",
|
||||||
caption = fgettext("Settings"),
|
caption = fgettext("Settings"),
|
||||||
cbf_formspec = formspec,
|
cbf_formspec = formspec,
|
||||||
|
@ -196,7 +196,7 @@ local function on_activate(type,old_tab,new_tab)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_simple_main = {
|
return {
|
||||||
name = "main",
|
name = "main",
|
||||||
caption = fgettext("Main"),
|
caption = fgettext("Main"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
@ -241,7 +241,7 @@ local function on_change(type, old_tab, new_tab)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_singleplayer = {
|
return {
|
||||||
name = "singleplayer",
|
name = "singleplayer",
|
||||||
caption = fgettext("Singleplayer"),
|
caption = fgettext("Singleplayer"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
@ -123,7 +123,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
tab_texturepacks = {
|
return {
|
||||||
name = "texturepacks",
|
name = "texturepacks",
|
||||||
caption = fgettext("Texturepacks"),
|
caption = fgettext("Texturepacks"),
|
||||||
cbf_formspec = get_formspec,
|
cbf_formspec = get_formspec,
|
||||||
|
Loading…
Reference in New Issue
Block a user