Main menu: Change tabs to 'Start Game' and 'Join Game' (#6955)

[minetest.git] / builtin / mainmenu / tab_online.lua

diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index ab23a4b7cd89a3551a41ac922491fe9c2d1099eb..e3c583614b7f09ac1e85a81e23078efa15806b39 100644 (file)
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -33,8 +33,8 @@ local function get_formspec(tabview, name, tabdata)
 
        local retval =
                -- Search
-               "field[0.15,0.35;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
-               "button[5.8,0.1;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" ..
+               "field[0.15,0.075;6.05,1;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
+               "button[5.8,-0.25;2,1;btn_mp_search;" .. fgettext("Search") .. "]" ..
 
                -- Address / Port
                "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" ..
@@ -53,16 +53,16 @@ local function get_formspec(tabview, name, tabdata)
                "box[7.73,2.25;4.25,2.6;#999999]"..
 
                -- Connect
-               "button[10.1,5.15;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
+               "button[9.88,4.9;2.3,1;btn_mp_connect;" .. fgettext("Connect") .. "]"
 
        if tabdata.fav_selected and fav_selected then
                if gamedata.fav then
-                       retval = retval .. "button[7.75,5.15;2.3,0.5;btn_delete_favorite;" ..
+                       retval = retval .. "button[7.73,4.9;2.3,1;btn_delete_favorite;" ..
                                fgettext("Del. Favorite") .. "]"
                end
                if fav_selected.description then
-                       retval = retval .. "textarea[8.1,2.3;4.23,2.9;;" ..
-                               core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]"
+                       retval = retval .. "textarea[8.1,2.3;4.23,2.9;;;" ..
+                               core.formspec_escape((gamedata.serverdescription or ""), true) .. "]"
                end
        end
 
@@ -295,6 +295,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
                        local first_server = search_result[1]
                        core.settings:set("address",     first_server.address)
                        core.settings:set("remote_port", first_server.port)
+                       gamedata.serverdescription = first_server.description
                end
                return true
        end
@@ -343,7 +344,7 @@ end
 --------------------------------------------------------------------------------
 return {
        name = "online",
-       caption = fgettext("Play Online"),
+       caption = fgettext("Join Game"),
        cbf_formspec = get_formspec,
        cbf_button_handler = main_button_handler,
        on_change = on_change