Mainmenu: Brighter text colours for readability

[dragonfireclient.git] / builtin / mainmenu / init.lua

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index e5820833619e576d685079e1c9ee9bf900ac9600..79e6d5c029a3911c42b71a18098f9966006ca46c 100644 (file)
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -16,9 +16,9 @@
 --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"
+mt_color_blue  = "#6389FF"
+mt_color_green = "#72FF63"
+mt_color_dark_green = "#25C191"
 
 --for all other colors ask sfan5 to complete his work!
 
@@ -37,22 +37,29 @@ 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 .. "textures.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")
 if PLATFORM ~= "Android" then
        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_multiplayer.lua")
-       dofile(menupath .. DIR_DELIM .. "tab_server.lua")
-       dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
-       dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
-       dofile(menupath .. DIR_DELIM .. "textures.lua")
+end
+
+local tabs = {}
+
+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
-       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
 
 --------------------------------------------------------------------------------
@@ -68,8 +75,34 @@ local function init_globals()
        -- Init gamedata
        gamedata.worldindex = 0
 
+       if PLATFORM == "Android" then
+               local world_list = core.get_worlds()
+               local world_index
 
-       if PLATFORM ~= "Android" then
+               local found_singleplayerworld = false
+               for i, world in ipairs(world_list) do
+                       if world.name == "singleplayerworld" then
+                               found_singleplayerworld = true
+                               world_index = i
+                               break
+                       end
+               end
+
+               if not found_singleplayerworld then
+                       core.create_world("singleplayerworld", 1)
+
+                       world_list = core.get_worlds()
+
+                       for i, world in ipairs(world_list) do
+                               if world.name == "singleplayerworld" then
+                                       world_index = i
+                                       break
+                               end
+                       end
+               end
+
+               gamedata.worldindex = world_index
+       else
                menudata.worldlist = filterlist.create(
                        core.get_worlds,
                        compare_worlds,
@@ -88,61 +121,34 @@ local function init_globals()
 
                if not core.setting_get("menu_last_game") then
                        local default_game = core.setting_get("default_game") or "minetest"
-                       core.setting_set("menu_last_game", default_game )
+                       core.setting_set("menu_last_game", default_game)
                end
 
                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
 
        -- Create main tabview
-       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)
-       end
-       if PLATFORM ~= "Android" then
-               tv_main:add(tab_singleplayer)
-               tv_main:add(tab_multiplayer)
-               tv_main:add(tab_server)
+       local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
+
+       if PLATFORM == "Android" then
+               tv_main:add(tabs.simple_main)
+               tv_main:add(tabs.settings)
        else
-               tv_main:add(tab_simple_main)
-       end
-       tv_main:add(tab_settings)
-       if PLATFORM ~= "Android" then
-               tv_main:add(tab_texturepacks)
+               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
-       tv_main:add(tab_mods)
-       tv_main:add(tab_credits)
+
+       tv_main:add(tabs.mods)
+       tv_main:add(tabs.credits)
 
        tv_main:set_global_event_handler(main_event_handler)
+       tv_main:set_fixed_size(false)
 
-       if PLATFORM == "Android" then
-               tv_main:set_fixed_size(false)
-       else
+       if PLATFORM ~= "Android" then
                tv_main:set_tab(core.setting_get("maintab_LAST"))
        end
        ui.set_default("maintab")
@@ -150,9 +156,9 @@ local function init_globals()
 
        -- Create modstore ui
        if PLATFORM == "Android" then
-               modstore.init({x=12, y=6}, 3, 2)
+               modstore.init({x = 12, y = 6}, 3, 2)
        else
-               modstore.init({x=12, y=8}, 4, 3)
+               modstore.init({x = 12, y = 8}, 4, 3)
        end
 
        ui.update()