Add formspec toolkit and refactor mainmenu to use it

Fix crash on using cursor keys in client menu without selected server
Add support for non fixed size tabviews

1 files changed, 78 insertions, 1302 deletions

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 58e9ab949..ab2b8d80c 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -1,147 +1,71 @@
-
-engine = core
-local menupath = core.get_mainmenu_path()..DIR_DELIM
-local commonpath = core.get_builtin_path()..DIR_DELIM.."common"..DIR_DELIM
-
-dofile(menupath.."filterlist.lua")
-dofile(menupath.."modmgr.lua")
-dofile(menupath.."modstore.lua")
-dofile(menupath.."gamemgr.lua")
-dofile(menupath.."textures.lua")
-dofile(menupath.."menubar.lua")
-dofile(commonpath.."async_event.lua")
+--Minetest
+--Copyright (C) 2014 sapier
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 mt_color_grey  = "#AAAAAA"
 mt_color_blue  = "#0000DD"
 mt_color_green = "#00DD00"
 mt_color_dark_green = "#003300"
 
---for all other colors ask sfan5 to complete his worK!
-
-menu = {}
-local tabbuilder = {}
-local worldlist = nil
-
---------------------------------------------------------------------------------
-local function filter_texture_pack_list(list)
-	retval = {"None"}
-	for _,i in ipairs(list) do
-		if i~="base" then
-			table.insert(retval, i)
-		end
-	end
-	return retval
-end
-
---------------------------------------------------------------------------------
-function menu.render_favorite(spec,render_details)
-	local text = ""
-
-	if spec.name ~= nil then
-		text = text .. engine.formspec_escape(spec.name:trim())
-
---		if spec.description ~= nil and
---			engine.formspec_escape(spec.description):trim() ~= "" then
---			text = text .. " (" .. engine.formspec_escape(spec.description) .. ")"
---		end
-	else
-		if spec.address ~= nil then
-			text = text .. spec.address:trim()
-
-			if spec.port ~= nil then
-				text = text .. ":" .. spec.port
-			end
-		end
-	end
-
-	if not render_details then
-		return text
-	end
-
-	local details = ""
-	if spec.password == true then
-		details = details .. "*"
-	else
-		details = details .. "_"
-	end
-
-	if spec.creative then
-		details = details .. "C"
-	else
-		details = details .. "_"
-	end
-
-	if spec.damage then
-		details = details .. "D"
-	else
-		details = details .. "_"
-	end
-
-	if spec.pvp then
-		details = details .. "P"
-	else
-		details = details .. "_"
-	end
-	details = details .. " "
-
-	local playercount = ""
-
-	if spec.clients ~= nil and
-		spec.clients_max ~= nil then
-		playercount = string.format("%03d",spec.clients) .. "/" ..
-						string.format("%03d",spec.clients_max) .. " "
-	end
+--for all other colors ask sfan5 to complete his work!
 
-	return playercount .. engine.formspec_escape(details) ..  text
-end
-
---------------------------------------------------------------------------------
-os.tempfolder = function()
-	local filetocheck = os.tmpname()
-	os.remove(filetocheck)
-
-	local randname = "MTTempModFolder_" .. math.random(0,10000)
-	if DIR_DELIM == "\\" then
-		local tempfolder = os.getenv("TEMP")
-		return tempfolder .. filetocheck
-	else
-		local backstring = filetocheck:reverse()
-		return filetocheck:sub(0,filetocheck:len()-backstring:find(DIR_DELIM)+1) ..randname
-	end
-
-end
+local menupath = core.get_mainmenu_path()
+local basepath = core.get_builtin_path()
+defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
+					DIR_DELIM .. "pack" .. DIR_DELIM
 
---------------------------------------------------------------------------------
-function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
-	local textlines = engine.splittext(text,textlen)
-	
-	local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
-								.. width .. "," .. height .. ";"
-								.. tl_name .. ";"
-	
-	for i=1, #textlines, 1 do
-		textlines[i] = textlines[i]:gsub("\r","")
-		retval = retval .. engine.formspec_escape(textlines[i]) .. ","
-	end
-	
-	retval = retval .. ";0;"
-	
-	if transparency then
-		retval = retval .. "true"
+dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua")
+dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua")
+dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
+dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "dialog.lua")
+dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "tabview.lua")
+dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "ui.lua")
+dofile(menupath .. DIR_DELIM .. "common.lua")
+dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
+dofile(menupath .. DIR_DELIM .. "modmgr.lua")
+dofile(menupath .. DIR_DELIM .. "store.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
+dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
+dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
+dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
+dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
+dofile(menupath .. DIR_DELIM .. "tab_server.lua")
+dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
+dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
+dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
+dofile(menupath .. DIR_DELIM .. "textures.lua")
+
+--------------------------------------------------------------------------------
+local function main_event_handler(tabview,event)
+	if event == "MenuQuit" then
+		core.close()
 	end
-	
-	retval = retval .. "]"
-
-	return retval
+	return true
 end
 
 --------------------------------------------------------------------------------
-function init_globals()
+local function init_globals()
 	--init gamedata
 	gamedata.worldindex = 0
 
-	worldlist = filterlist.create(
-					engine.get_worlds,
+	menudata.worldlist = filterlist.create(
+					core.get_worlds,
 					compare_worlds,
 					function(element,uid)
 						if element.name == uid then
@@ -157,1182 +81,34 @@ function init_globals()
 					end --filter fct
 					)
 
-	filterlist.add_sort_mechanism(worldlist,"alphabetic",sort_worlds_alphabetic)
-	filterlist.set_sortmode(worldlist,"alphabetic")
-end
-
---------------------------------------------------------------------------------
-function update_menu()
-
-	local formspec
-
-	-- handle errors
-	if gamedata.errormessage ~= nil then
-		formspec = "size[12,5.2,true]" ..
-			"textarea[1,2;10,2;;ERROR: " ..
-			engine.formspec_escape(gamedata.errormessage) ..
-			";]"..
-			"button[4.5,4.2;3,0.5;btn_error_confirm;" .. fgettext("Ok") .. "]"
-	else
-		formspec = tabbuilder.gettab()
-	end
-
-	engine.update_formspec(formspec)
-end
-
---------------------------------------------------------------------------------
-function menu.render_world_list()
-	local retval = ""
-
-	local current_worldlist = filterlist.get_list(worldlist)
-
-	for i,v in ipairs(current_worldlist) do
-		if retval ~= "" then
-			retval = retval ..","
-		end
-
-		retval = retval .. engine.formspec_escape(v.name) ..
-					" \\[" .. engine.formspec_escape(v.gameid) .. "\\]"
-	end
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function menu.render_texture_pack_list(list)
-	local retval = ""
-
-	for i, v in ipairs(list) do
-		if retval ~= "" then
-			retval = retval ..","
-		end
-
-		retval = retval .. engine.formspec_escape(v)
-	end
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function menu.asyncOnlineFavourites()
-	menu.favorites = {}
-	engine.handle_async(
-		function(param)
-			--return core.get_favorites("online")
-		end,
-		nil,
-		function(result)
-			menu.favorites = result
-			engine.event_handler("Refresh")
-		end
-		)
-end
-
---------------------------------------------------------------------------------
-function menu.init()
-	--init menu data
-	gamemgr.update_gamelist()
-
-	menu.last_game	= tonumber(engine.setting_get("main_menu_last_game_idx"))
-
-	if type(menu.last_game) ~= "number" then
-		menu.last_game = 1
-	end
-
-	if engine.setting_getbool("public_serverlist") then
-		menu.asyncOnlineFavourites()
-	else
-		menu.favorites = engine.get_favorites("local")
-	end
-
-	menu.defaulttexturedir = engine.get_texturepath_share() .. DIR_DELIM .. "base" ..
-					DIR_DELIM .. "pack" .. DIR_DELIM
-end
-
---------------------------------------------------------------------------------
-function menu.lastgame()
-	if menu.last_game > 0 and menu.last_game <= #gamemgr.games then
-		return gamemgr.games[menu.last_game]
-	end
-
-	if #gamemgr.games >= 1 then
-		menu.last_game = 1
-		return gamemgr.games[menu.last_game]
-	end
-
-	--error case!!
-	return nil
-end
-
---------------------------------------------------------------------------------
-function menu.update_last_game()
-
-	local current_world = filterlist.get_raw_element(worldlist,
-							engine.setting_get("mainmenu_last_selected_world")
-							)
-
-	if current_world == nil then
-		return
-	end
-
-	local gamespec, i = gamemgr.find_by_gameid(current_world.gameid)
-	if i ~= nil then
-		menu.last_game = i
-		engine.setting_set("main_menu_last_game_idx",menu.last_game)
-	end
-end
-
---------------------------------------------------------------------------------
-function menu.handle_key_up_down(fields,textlist,settingname)
-
-	if fields["key_up"] then
-		local oldidx = engine.get_textlist_index(textlist)
-
-		if oldidx ~= nil and oldidx > 1 then
-			local newidx = oldidx -1
-			engine.setting_set(settingname,
-				filterlist.get_raw_index(worldlist,newidx))
-		end
-	end
-
-	if fields["key_down"] then
-		local oldidx = engine.get_textlist_index(textlist)
-
-		if oldidx ~= nil and oldidx < filterlist.size(worldlist) then
-			local newidx = oldidx + 1
-			engine.setting_set(settingname,
-				filterlist.get_raw_index(worldlist,newidx))
-		end
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.dialog_create_world()
-	local mapgens = {"v6", "v7", "indev", "singlenode", "math"}
-
-	local current_seed = engine.setting_get("fixed_map_seed") or ""
-	local current_mg   = engine.setting_get("mg_name")
-
-	local mglist = ""
-	local selindex = 1
-	local i = 1
-	for k,v in pairs(mapgens) do
-		if current_mg == v then
-			selindex = i
-		end
-		i = i + 1
-		mglist = mglist .. v .. ","
-	end
-	mglist = mglist:sub(1, -2)
-
-	local retval =
-		"label[2,0;" .. fgettext("World name") .. "]"..
-		"field[4.5,0.4;6,0.5;te_world_name;;]" ..
-
-		"label[2,1;" .. fgettext("Seed") .. "]"..
-		"field[4.5,1.4;6,0.5;te_seed;;".. current_seed .. "]" ..
-
-		"label[2,2;" .. fgettext("Mapgen") .. "]"..
-		"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" ..
-
-		"label[2,3;" .. fgettext("Game") .. "]"..
-		"textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() ..
-		";" .. menu.last_game .. ";true]" ..
-
-		"button[5,5.5;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
-		"button[7.5,5.5;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.dialog_delete_world()
-	return	"label[2,2;" ..
-			fgettext("Delete World \"$1\"?", filterlist.get_raw_list(worldlist)[menu.world_to_del].name) .. "]"..
-			"button[3.5,4.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes").. "]" ..
-			"button[6,4.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]"
-end
-
---------------------------------------------------------------------------------
-
-function tabbuilder.gettab()
-	local tsize = tabbuilder.tabsizes[tabbuilder.current_tab] or {width=12, height=5.2}
-	local retval = "size[" .. tsize.width .. "," .. tsize.height .. ",true]"
-
-	if tabbuilder.show_buttons then
-		retval = retval .. tabbuilder.tab_header()
-	end
-
-	local buildfunc = tabbuilder.tabfuncs[tabbuilder.current_tab]
-	if buildfunc ~= nil then
-		retval = retval .. buildfunc()
-	end
-
-	retval = retval .. modmgr.gettab(tabbuilder.current_tab)
-	retval = retval .. gamemgr.gettab(tabbuilder.current_tab)
-	retval = retval .. modstore.gettab(tabbuilder.current_tab)
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_create_world_buttons(fields)
-
-	if fields["world_create_confirm"] or
-		fields["key_enter"] then
-
-		local worldname = fields["te_world_name"]
-		local gameindex = engine.get_textlist_index("games")
-
-		if gameindex ~= nil and
-			worldname ~= "" then
-
-			local message = nil
-
-			if not filterlist.uid_exists_raw(worldlist,worldname) then
-				engine.setting_set("mg_name",fields["dd_mapgen"])
-				message = engine.create_world(worldname,gameindex)
-			else
-				message = fgettext("A world named \"$1\" already exists", worldname)
-			end
-
-			engine.setting_set("fixed_map_seed", fields["te_seed"])
-
-			if message ~= nil then
-				gamedata.errormessage = message
-			else
-				menu.last_game = gameindex
-				engine.setting_set("main_menu_last_game_idx",gameindex)
-
-				filterlist.refresh(worldlist)
-				engine.setting_set("mainmenu_last_selected_world",
-									filterlist.raw_index_by_uid(worldlist,worldname))
-			end
-		else
-			gamedata.errormessage =
-				fgettext("No worldname given or no game selected")
-		end
-	end
-
-	if fields["games"] then
-		tabbuilder.skipformupdate = true
-		return
-	end
-
-	--close dialog
-	tabbuilder.is_dialog = false
-	tabbuilder.show_buttons = true
-	tabbuilder.current_tab = engine.setting_get("main_menu_tab")
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_delete_world_buttons(fields)
-
-	if fields["world_delete_confirm"] then
-		if menu.world_to_del > 0 and
-			menu.world_to_del <= #filterlist.get_raw_list(worldlist) then
-			engine.delete_world(menu.world_to_del)
-			menu.world_to_del = 0
-			filterlist.refresh(worldlist)
-		end
-	end
-
-	tabbuilder.is_dialog = false
-	tabbuilder.show_buttons = true
-	tabbuilder.current_tab = engine.setting_get("main_menu_tab")
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_multiplayer_buttons(fields)
-
-	if fields["te_name"] ~= nil then
-		gamedata.playername = fields["te_name"]
-		engine.setting_set("name", fields["te_name"])
-	end
-
-	if fields["favourites"] ~= nil then
-		local event = engine.explode_textlist_event(fields["favourites"])
-		if event.type == "DCL" then
-			if event.index <= #menu.favorites then
-				gamedata.address = menu.favorites[event.index].address
-				gamedata.port = menu.favorites[event.index].port
-				gamedata.playername		= fields["te_name"]
-				if fields["te_pwd"] ~= nil then
-					gamedata.password		= fields["te_pwd"]
-				end
-				gamedata.selected_world = 0
-
-				if menu.favorites ~= nil then
-					gamedata.servername = menu.favorites[event.index].name
-					gamedata.serverdescription = menu.favorites[event.index].description
-				end
-
-				if gamedata.address ~= nil and
-					gamedata.port ~= nil then
-					engine.setting_set("address",gamedata.address)
-					engine.setting_set("remote_port",gamedata.port)
-					engine.start()
-				end
-			end
-		end
-
-		if event.type == "CHG" then
-			if event.index <= #menu.favorites then
-				local address = menu.favorites[event.index].address
-				local port = menu.favorites[event.index].port
-
-				if address ~= nil and
-					port ~= nil then
-					engine.setting_set("address",address)
-					engine.setting_set("remote_port",port)
-				end
-
-				menu.fav_selected = event.index
-			end
-		end
-		return
-	end
-
-	if fields["key_up"] ~= nil or
-		fields["key_down"] ~= nil then
-
-		local fav_idx = engine.get_textlist_index("favourites")
-
-		if fav_idx ~= nil then
-			if fields["key_up"] ~= nil and fav_idx > 1 then
-				fav_idx = fav_idx -1
-			else if fields["key_down"] and fav_idx < #menu.favorites then
-				fav_idx = fav_idx +1
-			end end
-		end
-
-		local address = menu.favorites[fav_idx].address
-		local port = menu.favorites[fav_idx].port
-
-		if address ~= nil and
-			port ~= nil then
-			engine.setting_set("address",address)
-			engine.setting_set("remote_port",port)
-		end
-
-		menu.fav_selected = fav_idx
-		return
-	end
-
-	if fields["cb_public_serverlist"] ~= nil then
-		engine.setting_set("public_serverlist", fields["cb_public_serverlist"])
-
-		if engine.setting_getbool("public_serverlist") then
-			menu.asyncOnlineFavourites()
-		else
-			menu.favorites = engine.get_favorites("local")
-		end
-		menu.fav_selected = nil
-		return
-	end
-
-	if fields["btn_delete_favorite"] ~= nil then
-		local current_favourite = engine.get_textlist_index("favourites")
-		if current_favourite == nil then return end
-		engine.delete_favorite(current_favourite)
-		menu.favorites = engine.get_favorites()
-		menu.fav_selected = nil
-
-		engine.setting_set("address","")
-		engine.setting_set("remote_port","30000")
-
-		return
-	end
-
-	if fields["btn_mp_connect"] ~= nil or
-		fields["key_enter"] ~= nil then
-
-		gamedata.playername		= fields["te_name"]
-		gamedata.password		= fields["te_pwd"]
-		gamedata.address		= fields["te_address"]
-		gamedata.port			= fields["te_port"]
-
-		local fav_idx = engine.get_textlist_index("favourites")
-
-		if fav_idx ~= nil and fav_idx <= #menu.favorites and
-			menu.favorites[fav_idx].address == fields["te_address"] and
-			menu.favorites[fav_idx].port    == fields["te_port"] then
-
-			gamedata.servername			= menu.favorites[fav_idx].name
-			gamedata.serverdescription	= menu.favorites[fav_idx].description
-		else
-			gamedata.servername			= ""
-			gamedata.serverdescription	= ""
-		end
-
-		gamedata.selected_world = 0
-
-		engine.setting_set("address",fields["te_address"])
-		engine.setting_set("remote_port",fields["te_port"])
-
-		engine.start()
-		return
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_server_buttons(fields)
-
-	local world_doubleclick = false
-
-	if fields["srv_worlds"] ~= nil then
-		local event = engine.explode_textlist_event(fields["srv_worlds"])
-
-		if event.type == "DCL" then
-			world_doubleclick = true
-		end
-		if event.type == "CHG" then
-			engine.setting_set("mainmenu_last_selected_world",
-				filterlist.get_raw_index(worldlist,engine.get_textlist_index("srv_worlds")))
-		end
-	end
-
-	menu.handle_key_up_down(fields,"srv_worlds","mainmenu_last_selected_world")
-
-	if fields["cb_creative_mode"] then
-		engine.setting_set("creative_mode", fields["cb_creative_mode"])
-	end
-
-	if fields["cb_enable_damage"] then
-		engine.setting_set("enable_damage", fields["cb_enable_damage"])
-	end
-
-	if fields["cb_server_announce"] then
-		engine.setting_set("server_announce", fields["cb_server_announce"])
-	end
-
-	if fields["start_server"] ~= nil or
-		world_doubleclick or
-		fields["key_enter"] then
-		local selected = engine.get_textlist_index("srv_worlds")
-		if selected ~= nil then
-			gamedata.playername		= fields["te_playername"]
-			gamedata.password		= fields["te_passwd"]
-			gamedata.port			= fields["te_serverport"]
-			gamedata.address		= ""
-			gamedata.selected_world	= filterlist.get_raw_index(worldlist,selected)
-
-			engine.setting_set("port",gamedata.port)
-			if fields["te_serveraddr"] ~= nil then
-				engine.setting_set("bind_address",fields["te_serveraddr"])
-			end
-
-			menu.update_last_game(gamedata.selected_world)
-			engine.start()
-		end
-	end
-
-	if fields["world_create"] ~= nil then
-		tabbuilder.current_tab = "dialog_create_world"
-		tabbuilder.is_dialog = true
-		tabbuilder.show_buttons = false
-	end
-
-	if fields["world_delete"] ~= nil then
-		local selected = engine.get_textlist_index("srv_worlds")
-		if selected ~= nil and
-			selected <= filterlist.size(worldlist) then
-			local world = filterlist.get_list(worldlist)[selected]
-			if world ~= nil and
-				world.name ~= nil and
-				world.name ~= "" then
-				menu.world_to_del = filterlist.get_raw_index(worldlist,selected)
-				tabbuilder.current_tab = "dialog_delete_world"
-				tabbuilder.is_dialog = true
-				tabbuilder.show_buttons = false
-			else
-				menu.world_to_del = 0
-			end
-		end
-	end
-
-	if fields["world_configure"] ~= nil then
-		selected = engine.get_textlist_index("srv_worlds")
-		if selected ~= nil then
-			modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
-			if modmgr.init_worldconfig() then
-				tabbuilder.current_tab = "dialog_configure_world"
-				tabbuilder.is_dialog = true
-				tabbuilder.show_buttons = false
-			end
-		end
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_settings_buttons(fields)
-	if fields["cb_fancy_trees"] then
-		engine.setting_set("new_style_leaves", fields["cb_fancy_trees"])
-	end
-	if fields["cb_smooth_lighting"] then
-		engine.setting_set("smooth_lighting", fields["cb_smooth_lighting"])
-	end
-	if fields["cb_3d_clouds"] then
-		engine.setting_set("enable_3d_clouds", fields["cb_3d_clouds"])
-	end
-	if fields["cb_opaque_water"] then
-		engine.setting_set("opaque_water", fields["cb_opaque_water"])
-	end
-
-	if fields["cb_mipmapping"] then
-		engine.setting_set("mip_map", fields["cb_mipmapping"])
-	end
-	if fields["cb_anisotrophic"] then
-		engine.setting_set("anisotropic_filter", fields["cb_anisotrophic"])
-	end
-	if fields["cb_bilinear"] then
-		engine.setting_set("bilinear_filter", fields["cb_bilinear"])
-	end
-	if fields["cb_trilinear"] then
-		engine.setting_set("trilinear_filter", fields["cb_trilinear"])
-	end
-
-	if fields["cb_shaders"] then
-		if (engine.setting_get("video_driver") == "direct3d8" or engine.setting_get("video_driver") == "direct3d9") then
-			engine.setting_set("enable_shaders", "false")
-			gamedata.errormessage = fgettext("To enable shaders the OpenGL driver needs to be used.")
-		else
-			engine.setting_set("enable_shaders", fields["cb_shaders"])
-		end
-	end
-	if fields["cb_pre_ivis"] then
-		engine.setting_set("preload_item_visuals", fields["cb_pre_ivis"])
-	end
-	if fields["cb_particles"] then
-		engine.setting_set("enable_particles", fields["cb_particles"])
-	end
-	if fields["cb_bumpmapping"] then
-		engine.setting_set("enable_bumpmapping", fields["cb_bumpmapping"])
-	end
-	if fields["cb_parallax"] then
-		engine.setting_set("enable_parallax_occlusion", fields["cb_parallax"])
-	end
-	if fields["cb_generate_normalmaps"] then
-		engine.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"])
-	end
-	if fields["cb_waving_water"] then
-		engine.setting_set("enable_waving_water", fields["cb_waving_water"])
-	end
-	if fields["cb_waving_leaves"] then
-		engine.setting_set("enable_waving_leaves", fields["cb_waving_leaves"])
-	end
-	if fields["cb_waving_plants"] then
-		engine.setting_set("enable_waving_plants", fields["cb_waving_plants"])
-	end
-	if fields["btn_change_keys"] ~= nil then
-		engine.show_keys_menu()
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_singleplayer_buttons(fields)
-
-	local world_doubleclick = false
-
-	if fields["sp_worlds"] ~= nil then
-		local event = engine.explode_textlist_event(fields["sp_worlds"])
-
-		if event.type == "DCL" then
-			world_doubleclick = true
-		end
-
-		if event.type == "CHG" then
-			engine.setting_set("mainmenu_last_selected_world",
-				filterlist.get_raw_index(worldlist,engine.get_textlist_index("sp_worlds")))
-		end
-	end
-
-	menu.handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world")
-
-	if fields["cb_creative_mode"] then
-		engine.setting_set("creative_mode", fields["cb_creative_mode"])
-	end
-
-	if fields["cb_enable_damage"] then
-		engine.setting_set("enable_damage", fields["cb_enable_damage"])
-	end
-
-	if fields["play"] ~= nil or
-		world_doubleclick or
-		fields["key_enter"] then
-		local selected = engine.get_textlist_index("sp_worlds")
-		if selected ~= nil then
-			gamedata.selected_world	= filterlist.get_raw_index(worldlist,selected)
-			gamedata.singleplayer	= true
-
-			menu.update_last_game(gamedata.selected_world)
-
-			engine.start()
-		end
-	end
-
-	if fields["world_create"] ~= nil then
-		tabbuilder.current_tab = "dialog_create_world"
-		tabbuilder.is_dialog = true
-		tabbuilder.show_buttons = false
-	end
-
-	if fields["world_delete"] ~= nil then
-		local selected = engine.get_textlist_index("sp_worlds")
-		if selected ~= nil and
-			selected <= filterlist.size(worldlist) then
-			local world = filterlist.get_list(worldlist)[selected]
-			if world ~= nil and
-				world.name ~= nil and
-				world.name ~= "" then
-				menu.world_to_del = filterlist.get_raw_index(worldlist,selected)
-				tabbuilder.current_tab = "dialog_delete_world"
-				tabbuilder.is_dialog = true
-				tabbuilder.show_buttons = false
-			else
-				menu.world_to_del = 0
-			end
-		end
-	end
-
-	if fields["world_configure"] ~= nil then
-		selected = engine.get_textlist_index("sp_worlds")
-		if selected ~= nil then
-			modmgr.world_config_selected_world = filterlist.get_raw_index(worldlist,selected)
-			if modmgr.init_worldconfig() then
-				tabbuilder.current_tab = "dialog_configure_world"
-				tabbuilder.is_dialog = true
-				tabbuilder.show_buttons = false
-			end
-		end
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_texture_pack_buttons(fields)
-	if fields["TPs"] ~= nil then
-		local event = engine.explode_textlist_event(fields["TPs"])
-		if event.type == "CHG" or event.type == "DCL" then
-			local index = engine.get_textlist_index("TPs")
-			engine.setting_set("mainmenu_last_selected_TP",
-				index)
-			local list = filter_texture_pack_list(engine.get_dirlist(engine.get_texturepath(), true))
-			local current_index = engine.get_textlist_index("TPs")
-			if current_index ~= nil and #list >= current_index then
-				local new_path = engine.get_texturepath()..DIR_DELIM..list[current_index]
-				if list[current_index] == "None" then new_path = "" end
-
-				engine.setting_set("texture_path", new_path)
-			end
-		end
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_header()
-
-	if tabbuilder.last_tab_index == nil then
-		tabbuilder.last_tab_index = 1
-	end
-
-	local toadd = ""
-
-	for i=1,#tabbuilder.current_buttons,1 do
-
-		if toadd ~= "" then
-			toadd = toadd .. ","
-		end
-
-		toadd = toadd .. tabbuilder.current_buttons[i].caption
-	end
-	return "tabheader[-0.3,-0.99;main_tab;" .. toadd ..";" .. tabbuilder.last_tab_index .. ";true;false]"
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.handle_tab_buttons(fields)
-
-	if fields["main_tab"] then
-		local index = tonumber(fields["main_tab"])
-		tabbuilder.last_tab_index = index
-		tabbuilder.current_tab = tabbuilder.current_buttons[index].name
-
-		engine.setting_set("main_menu_tab",tabbuilder.current_tab)
-	end
-
-	--handle tab changes
-	if tabbuilder.current_tab ~= tabbuilder.old_tab then
-		if tabbuilder.current_tab ~= "singleplayer" and not tabbuilder.is_dialog then
-			menu.update_gametype(true)
-		end
-	end
-
-	if tabbuilder.current_tab == "singleplayer" then
-		menu.update_gametype()
-	end
-
-	tabbuilder.old_tab = tabbuilder.current_tab
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_multiplayer()
-
-	local retval =
-		"vertlabel[0,-0.25;".. fgettext("CLIENT") .. "]" ..
-		"label[1,-0.25;".. fgettext("Favorites:") .. "]"..
-		"label[1,4.25;".. fgettext("Address/Port") .. "]"..
-		"label[9,2.75;".. fgettext("Name/Password") .. "]" ..
-		"field[1.25,5.25;5.5,0.5;te_address;;" ..engine.setting_get("address") .."]" ..
-		"field[6.75,5.25;2.25,0.5;te_port;;" ..engine.setting_get("remote_port") .."]" ..
-		"checkbox[1,3.6;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" ..
-		dump(engine.setting_getbool("public_serverlist")) .. "]"
-
-	if not engine.setting_getbool("public_serverlist") then
-		retval = retval ..
-		"button[6.45,3.95;2.25,0.5;btn_delete_favorite;".. fgettext("Delete") .. "]"
-	end
-
-	retval = retval ..
-		"button[9,4.95;2.5,0.5;btn_mp_connect;".. fgettext("Connect") .. "]" ..
-		"field[9.3,3.75;2.5,0.5;te_name;;" ..engine.setting_get("name") .."]" ..
-		"pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" ..
-		"textarea[9.3,0.25;2.5,2.75;;"
-	if menu.fav_selected ~= nil and
-		menu.favorites[menu.fav_selected].description ~= nil then
-		retval = retval ..
-			engine.formspec_escape(menu.favorites[menu.fav_selected].description,true)
-	end
-
-	retval = retval ..
-		";]" ..
-		"textlist[1,0.35;7.5,3.35;favourites;"
-
-	local render_details = engine.setting_getbool("public_serverlist")
-
-	if #menu.favorites > 0 then
-		retval = retval .. menu.render_favorite(menu.favorites[1],render_details)
-
-		for i=2,#menu.favorites,1 do
-			retval = retval .. "," .. menu.render_favorite(menu.favorites[i],render_details)
-		end
-	end
-
-	if menu.fav_selected ~= nil then
-		retval = retval .. ";" .. menu.fav_selected .. "]"
-	else
-		retval = retval .. ";0]"
-	end
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_server()
-
-	local index = filterlist.get_current_index(worldlist,
-				tonumber(engine.setting_get("mainmenu_last_selected_world"))
-				)
-
-	local retval =
-		"button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
-		"button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
-		"button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-		"button[8.5,4.9;3.25,0.5;start_server;".. fgettext("Start Game") .. "]" ..
-		"label[4,-0.25;".. fgettext("Select World:") .. "]"..
-		"vertlabel[0,-0.25;".. fgettext("START SERVER") .. "]" ..
-		"checkbox[0.5,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
-		dump(engine.setting_getbool("creative_mode")) .. "]"..
-		"checkbox[0.5,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
-		dump(engine.setting_getbool("enable_damage")) .. "]"..
-		"checkbox[0.5,1.15;cb_server_announce;".. fgettext("Public") .. ";" ..
-		dump(engine.setting_getbool("server_announce")) .. "]"..
-		"field[0.8,3.2;3.5,0.5;te_playername;".. fgettext("Name") .. ";" ..
-		engine.setting_get("name") .. "]" ..
-		"pwdfield[0.8,4.2;3.5,0.5;te_passwd;".. fgettext("Password") .. "]"
-		
-	local bind_addr = engine.setting_get("bind_address")
-	if bind_addr ~= nil and bind_addr ~= "" then
-		retval = retval ..
-			"field[0.8,5.2;2.25,0.5;te_serveraddr;".. fgettext("Bind Address") .. ";" ..
-			engine.setting_get("bind_address") .."]" ..
-			"field[3.05,5.2;1.25,0.5;te_serverport;".. fgettext("Port") .. ";" ..
-			engine.setting_get("port") .."]"
-	else
-		retval = retval ..
-			"field[0.8,5.2;3.5,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
-			engine.setting_get("port") .."]"
-	end
+	menudata.worldlist:add_sort_mechanism("alphabetic",sort_worlds_alphabetic)
+	menudata.worldlist:set_sortmode("alphabetic")
 	
-	retval = retval ..
-		"textlist[4,0.25;7.5,3.7;srv_worlds;" ..
-		menu.render_world_list() ..
-		";" .. index .. "]"
-
-	return retval
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_settings()
-	tab_string =
-			"vertlabel[0,0;" .. fgettext("SETTINGS") .. "]" ..
-			"checkbox[1,0;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";"
-					.. dump(engine.setting_getbool("new_style_leaves")) .. "]"..
-			"checkbox[1,0.5;cb_smooth_lighting;".. fgettext("Smooth Lighting")
-					.. ";".. dump(engine.setting_getbool("smooth_lighting")) .. "]"..
-			"checkbox[1,1;cb_3d_clouds;".. fgettext("3D Clouds") .. ";"
-					.. dump(engine.setting_getbool("enable_3d_clouds")) .. "]"..
-			"checkbox[1,1.5;cb_opaque_water;".. fgettext("Opaque Water") .. ";"
-					.. dump(engine.setting_getbool("opaque_water")) .. "]"..
-			"checkbox[1,2.0;cb_pre_ivis;".. fgettext("Preload item visuals") .. ";"
-					.. dump(engine.setting_getbool("preload_item_visuals"))	.. "]"..
-			"checkbox[1,2.5;cb_particles;".. fgettext("Enable Particles") .. ";"
-					.. dump(engine.setting_getbool("enable_particles"))	.. "]"..
-			"checkbox[4.5,0;cb_mipmapping;".. fgettext("Mip-Mapping") .. ";"
-					.. dump(engine.setting_getbool("mip_map")) .. "]"..
-			"checkbox[4.5,0.5;cb_anisotrophic;".. fgettext("Anisotropic Filtering") .. ";"
-					.. dump(engine.setting_getbool("anisotropic_filter")) .. "]"..
-			"checkbox[4.5,1.0;cb_bilinear;".. fgettext("Bi-Linear Filtering") .. ";"
-					.. dump(engine.setting_getbool("bilinear_filter")) .. "]"..
-			"checkbox[4.5,1.5;cb_trilinear;".. fgettext("Tri-Linear Filtering") .. ";"
-					.. dump(engine.setting_getbool("trilinear_filter")) .. "]"..
-
-			"checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
-					.. dump(engine.setting_getbool("enable_shaders")) .. "]"..
-			"button[1,4.5;2.25,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
-
-	if engine.setting_getbool("enable_shaders") then
-		tab_string = tab_string ..
-			"checkbox[8,0.5;cb_bumpmapping;".. fgettext("Bumpmapping") .. ";"
-					.. dump(engine.setting_getbool("enable_bumpmapping")) .. "]"..
-			"checkbox[8,1.0;cb_parallax;".. fgettext("Parallax Occlusion") .. ";"
-					.. dump(engine.setting_getbool("enable_parallax_occlusion")) .. "]"..
-			"checkbox[8,1.5;cb_generate_normalmaps;".. fgettext("Generate Normalmaps") .. ";"
-					.. dump(engine.setting_getbool("generate_normalmaps")) .. "]"..
-			"checkbox[8,2.0;cb_waving_water;".. fgettext("Waving Water") .. ";"
-					.. dump(engine.setting_getbool("enable_waving_water")) .. "]"..
-			"checkbox[8,2.5;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
-					.. dump(engine.setting_getbool("enable_waving_leaves")) .. "]"..
-			"checkbox[8,3.0;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
-					.. dump(engine.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("Parallax Occlusion") .. ";0;true]" ..
-			"textlist[8.33,1.7;4,1;;#888888" .. fgettext("Generate Normalmaps") .. ";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]"
-	end
-	return tab_string
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_singleplayer()
-
-	local index = filterlist.get_current_index(worldlist,
-				tonumber(engine.setting_get("mainmenu_last_selected_world"))
-				)
-
-	return	"button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
-			"button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
-			"button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-			"button[8.5,4.95;3.25,0.5;play;".. fgettext("Play") .. "]" ..
-			"label[4,-0.25;".. fgettext("Select World:") .. "]"..
-			"vertlabel[0,-0.25;".. fgettext("SINGLE PLAYER") .. "]" ..
-			"checkbox[0.5,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
-			dump(engine.setting_getbool("creative_mode")) .. "]"..
-			"checkbox[0.5,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
-			dump(engine.setting_getbool("enable_damage")) .. "]"..
-			"textlist[4,0.25;7.5,3.7;sp_worlds;" ..
-			menu.render_world_list() ..
-			";" .. index .. "]" ..
-			menubar.formspec
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_texture_packs()
-	local retval = "label[4,-0.25;".. fgettext("Select texture pack:") .. "]"..
-			"vertlabel[0,-0.25;".. fgettext("TEXTURE PACKS") .. "]" ..
-			"textlist[4,0.25;7.5,5.0;TPs;"
-
-	local current_texture_path = engine.setting_get("texture_path")
-	local list = filter_texture_pack_list(engine.get_dirlist(engine.get_texturepath(), true))
-	local index = tonumber(engine.setting_get("mainmenu_last_selected_TP"))
-
-	if index == nil then index = 1 end
-
-	if current_texture_path == "" then
-		retval = retval ..
-			menu.render_texture_pack_list(list) ..
-			";" .. index .. "]"
-		return retval
-	end
-
-	local infofile = current_texture_path ..DIR_DELIM.."info.txt"
-	local infotext = ""
-	local f = io.open(infofile, "r")
-	if f==nil then
-		infotext = fgettext("No information available")
-	else
-		infotext = f:read("*all")
-		f:close()
-	end
-
-	local screenfile = current_texture_path..DIR_DELIM.."screenshot.png"
-	local no_screenshot = nil
-	if not file_exists(screenfile) then
-		screenfile = nil
-		no_screenshot = menu.defaulttexturedir .. "no_screenshot.png"
-	end
-
-	return	retval ..
-			menu.render_texture_pack_list(list) ..
-			";" .. index .. "]" ..
-			"image[0.65,0.25;4.0,3.7;"..engine.formspec_escape(screenfile or no_screenshot).."]"..
-			"textarea[1.0,3.25;3.7,1.5;;"..engine.formspec_escape(infotext or "")..";]"
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.tab_credits()
-	local logofile = menu.defaulttexturedir .. "logo.png"
-	return	"vertlabel[0,-0.5;CREDITS]" ..
-			"label[0.5,3;Minetest " .. engine.get_version() .. "]" ..
-			"label[0.5,3.3;http://minetest.net]" ..
-			"image[0.5,1;" .. engine.formspec_escape(logofile) .. "]" ..
-			"textlist[3.5,-0.25;8.5,5.8;list_credits;" ..
-			"#FFFF00" .. fgettext("Core Developers") .."," ..
-			"Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
-			"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
-			"PilzAdam <pilzadam@minetest.net>," ..
-			"Ilya Zhuravlev (xyz) <xyz@minetest.net>,"..
-			"Lisa Milne (darkrose) <lisa@ltmnet.com>,"..
-			"Maciej Kasatkin (RealBadAngel) <mk@realbadangel.pl>,"..
-			"proller <proler@gmail.com>,"..
-			"sfan5 <sfan5@live.de>,"..
-			"kahrl <kahrl@gmx.net>,"..
-			"sapier,"..
-			"ShadowNinja <shadowninja@minetest.net>,"..
-			"Nathanael Courant (Nore/Novatux) <nore@mesecons.net>,"..
-			"BlockMen,"..
-			","..
-			"#FFFF00" .. fgettext("Active Contributors") .. "," ..
-			"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
-			"Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
-			"Jeija <jeija@mesecons.net>,"..
-			"MirceaKitsune <mirceakitsune@gmail.com>,"..
-			"dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
-			"0gb.us <0gb.us@0gb.us>,"..
-			"," ..
-			"#FFFF00" .. fgettext("Previous Contributors") .. "," ..
-			"Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
-			"Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
-			"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
-			"Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>,"..
-			"matttpt <matttpt@gmail.com>,"..
-			"JacobF <queatz@gmail.com>,"..
-			";0;true]"
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.init()
-	tabbuilder.tabfuncs = {
-		singleplayer  = tabbuilder.tab_singleplayer,
-		multiplayer   = tabbuilder.tab_multiplayer,
-		server        = tabbuilder.tab_server,
-		settings      = tabbuilder.tab_settings,
-		texture_packs = tabbuilder.tab_texture_packs,
-		credits       = tabbuilder.tab_credits,
-		dialog_create_world = tabbuilder.dialog_create_world,
-		dialog_delete_world = tabbuilder.dialog_delete_world
-	}
-
-	tabbuilder.tabsizes = {
-		dialog_create_world = {width=12, height=7},
-		dialog_delete_world = {width=12, height=5.2}
-	}
-
-	tabbuilder.current_tab = engine.setting_get("main_menu_tab")
-
-	if tabbuilder.current_tab == nil or
-		tabbuilder.current_tab == "" then
-		tabbuilder.current_tab = "singleplayer"
-		engine.setting_set("main_menu_tab",tabbuilder.current_tab)
-	end
-
-	--initialize tab buttons
-	tabbuilder.last_tab = nil
-	tabbuilder.show_buttons = true
-
-	tabbuilder.current_buttons = {}
-	table.insert(tabbuilder.current_buttons,{name="singleplayer", caption=fgettext("Singleplayer")})
-	table.insert(tabbuilder.current_buttons,{name="multiplayer", caption=fgettext("Client")})
-	table.insert(tabbuilder.current_buttons,{name="server", caption=fgettext("Server")})
-	table.insert(tabbuilder.current_buttons,{name="settings", caption=fgettext("Settings")})
-	table.insert(tabbuilder.current_buttons,{name="texture_packs", caption=fgettext("Texture Packs")})
-
-	if engine.setting_getbool("main_menu_game_mgr") then
-		table.insert(tabbuilder.current_buttons,{name="game_mgr", caption=fgettext("Games")})
-	end
-
-	if engine.setting_getbool("main_menu_mod_mgr") then
-		table.insert(tabbuilder.current_buttons,{name="mod_mgr", caption=fgettext("Mods")})
-	end
-	table.insert(tabbuilder.current_buttons,{name="credits", caption=fgettext("Credits")})
-
-
-	for i=1,#tabbuilder.current_buttons,1 do
-		if tabbuilder.current_buttons[i].name == tabbuilder.current_tab then
-			tabbuilder.last_tab_index = i
-		end
-	end
-
-	if tabbuilder.current_tab ~= "singleplayer" then
-		menu.update_gametype(true)
-	else
-		menu.update_gametype()
-	end
-end
-
---------------------------------------------------------------------------------
-function tabbuilder.checkretval(retval)
-
-	if retval ~= nil then
-		if retval.current_tab ~= nil then
-			tabbuilder.current_tab = retval.current_tab
-		end
-
-		if retval.is_dialog ~= nil then
-			tabbuilder.is_dialog = retval.is_dialog
-		end
-
-		if retval.show_buttons ~= nil then
-			tabbuilder.show_buttons = retval.show_buttons
-		end
-
-		if retval.skipformupdate ~= nil then
-			tabbuilder.skipformupdate = retval.skipformupdate
-		end
-
-		if retval.ignore_menu_quit == true then
-			tabbuilder.ignore_menu_quit = true
-		else
-			tabbuilder.ignore_menu_quit = false
-		end
-	end
-end
-
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
--- initialize callbacks
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-engine.button_handler = function(fields)
-	--print("Buttonhandler: tab: " .. tabbuilder.current_tab .. " fields: " .. dump(fields))
-
-	if fields["btn_error_confirm"] then
-		gamedata.errormessage = nil
-	end
-
-	local retval = modmgr.handle_buttons(tabbuilder.current_tab,fields)
-	tabbuilder.checkretval(retval)
-
-	retval = gamemgr.handle_buttons(tabbuilder.current_tab,fields)
-	tabbuilder.checkretval(retval)
-
-	retval = modstore.handle_buttons(tabbuilder.current_tab,fields)
-	tabbuilder.checkretval(retval)
-
-	if tabbuilder.current_tab == "dialog_create_world" then
-		tabbuilder.handle_create_world_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "dialog_delete_world" then
-		tabbuilder.handle_delete_world_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "singleplayer" then
-		tabbuilder.handle_singleplayer_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "texture_packs" then
-		tabbuilder.handle_texture_pack_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "multiplayer" then
-		tabbuilder.handle_multiplayer_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "settings" then
-		tabbuilder.handle_settings_buttons(fields)
-	end
-
-	if tabbuilder.current_tab == "server" then
-		tabbuilder.handle_server_buttons(fields)
-	end
-
-	--tab buttons
-	tabbuilder.handle_tab_buttons(fields)
-
-	--menubar buttons
-	menubar.handle_buttons(fields)
-
-	if not tabbuilder.skipformupdate then
-		--update menu
-		update_menu()
-	else
-		tabbuilder.skipformupdate = false
-	end
-end
-
---------------------------------------------------------------------------------
-engine.event_handler = function(event)
-	if event == "MenuQuit" then
-		if tabbuilder.is_dialog then
-			if tabbuilder.ignore_menu_quit then
-				return
-			end
-
-			tabbuilder.is_dialog = false
-			tabbuilder.show_buttons = true
-			tabbuilder.current_tab = engine.setting_get("main_menu_tab")
-			menu.update_gametype()
-			update_menu()
-		else
-			engine.close()
-		end
-	end
-
-	if event == "Refresh" then
-		update_menu()
-	end
-end
+	mm_texture.init()
+	
+	--create main tabview
+	local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=-0.3,y=-0.99})
+	tv_main:set_autosave_tab(true)
+	tv_main:add(tab_singleplayer)
+	tv_main:add(tab_multiplayer)
+	tv_main:add(tab_server)
+	tv_main:add(tab_settings)
+	tv_main:add(tab_texturepacks)
+	tv_main:add(tab_mods)
+	tv_main:add(tab_credits)
+	
+	tv_main:set_global_event_handler(main_event_handler)
+	
+	tv_main:set_tab(core.setting_get("maintab_LAST"))
+	ui.set_default("maintab")
+	tv_main:show()
 
---------------------------------------------------------------------------------
-function menu.update_gametype(reset)
-	local game = menu.lastgame()
+	--create modstore ui
+	modstore.init({x=12,y=8},4,3)
 
-	if reset or game == nil then
-		mm_texture.reset()
-		engine.set_topleft_text("")
-		filterlist.set_filtercriteria(worldlist,nil)
-	else
-		mm_texture.update(tabbuilder.current_tab,game)
-		engine.set_topleft_text(game.name)
-		filterlist.set_filtercriteria(worldlist,game.id)
-	end
+	ui.update()
+	
+	core.sound_play("main_menu", true)
 end
 
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
--- menu startup
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
 init_globals()
-mm_texture.init()
-menu.init()
-tabbuilder.init()
-menubar.refresh()
-modstore.init()
-
-engine.sound_play("main_menu", true)
-
-update_menu()