Minor fixes in translations

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

diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua
index e8aad42c31538b3a83043d8823516ce9c7703ce2..734cb5d3efd7cf1046b053adb68b5c130b0a564c 100644 (file)
--- a/builtin/mainmenu/tab_multiplayer.lua
+++ b/builtin/mainmenu/tab_multiplayer.lua
@@ -20,38 +20,54 @@ local function get_formspec(tabview, name, tabdata)
        local render_details = core.is_yes(core.setting_getbool("public_serverlist"))
        
        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;;" ..core.setting_get("address") .."]" ..
-               "field[6.75,5.25;2.25,0.5;te_port;;" ..core.setting_get("remote_port") .."]" ..
-               "checkbox[1,3.6;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" ..
+               "label[7.75,-0.15;" .. fgettext("Address / Port :") .. "]" ..
+               "label[7.75,1.05;" .. fgettext("Name / Password :") .. "]" ..
+               "field[8,0.75;3.4,0.5;te_address;;" ..
+               core.formspec_escape(core.setting_get("address")) .. "]" ..
+               "field[11.25,0.75;1.3,0.5;te_port;;" ..
+               core.formspec_escape(core.setting_get("remote_port")) .. "]" ..
+               "checkbox[0,4.85;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" ..
                dump(core.setting_getbool("public_serverlist")) .. "]"
 
        if not core.setting_getbool("public_serverlist") then
                retval = retval ..
-               "button[6.45,3.95;2.25,0.5;btn_delete_favorite;".. fgettext("Delete") .. "]"
+               "button[8,4.9;2,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;;" ..core.setting_get("name") .."]" ..
-               "pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" ..
-               "textarea[9.3,0.25;2.5,2.75;;"
+               "button[10,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" ..
+               "field[8,1.95;2.95,0.5;te_name;;" ..
+               core.formspec_escape(core.setting_get("name")) .. "]" ..
+               "pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" ..
+               "box[7.73,2.35;4.3,2.28;#999999]" ..
+               "textarea[8.1,2.4;4.26,2.6;;"
                
-       if menudata.fav_selected ~= nil and
-               menudata.favorites[menu.fav_selected].description ~= nil then
+       if tabdata.fav_selected ~= nil and
+               menudata.favorites[tabdata.fav_selected] ~= nil and
+               menudata.favorites[tabdata.fav_selected].description ~= nil then
                retval = retval ..
-                       core.formspec_escape(menu.favorites[menu.fav_selected].description,true)
+                       core.formspec_escape(menudata.favorites[tabdata.fav_selected].description,true)
        end
 
        retval = retval ..
                ";]"
-               
+
        --favourites
+       if render_details then
+               retval = retval .. "tablecolumns[" ..
+                       "color,span=3;" ..
+                       "text,align=right;" ..                -- clients
+                       "text,align=center,padding=0.25;" ..  -- "/"
+                       "text,align=right,padding=0.25;" ..   -- clients_max
+                       image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
+                       image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+                       image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
+                       "text,padding=1]"                               -- name
+       else
+               retval = retval .. "tablecolumns[text]"
+       end
        retval = retval ..
-               "textlist[1,0.35;7.5,3.35;favourites;"
+               "table[-0.15,-0.1;7.75,5;favourites;"
 
        if #menudata.favorites > 0 then
                retval = retval .. render_favorite(menudata.favorites[1],render_details)
@@ -79,11 +95,11 @@ local function main_button_handler(tabview, fields, name, tabdata)
        end
 
        if fields["favourites"] ~= nil then
-               local event = core.explode_textlist_event(fields["favourites"])
+               local event = core.explode_table_event(fields["favourites"])
                if event.type == "DCL" then
-                       if event.index <= #menudata.favorites then
-                               gamedata.address    = menudata.favorites[event.index].address
-                               gamedata.port       = menudata.favorites[event.index].port
+                       if event.row <= #menudata.favorites then
+                               gamedata.address    = menudata.favorites[event.row].address
+                               gamedata.port       = menudata.favorites[event.row].port
                                gamedata.playername = fields["te_name"]
                                if fields["te_pwd"] ~= nil then
                                        gamedata.password               = fields["te_pwd"]
@@ -91,8 +107,8 @@ local function main_button_handler(tabview, fields, name, tabdata)
                                gamedata.selected_world = 0
 
                                if menudata.favorites ~= nil then
-                                       gamedata.servername        = menudata.favorites[event.index].name
-                                       gamedata.serverdescription = menudata.favorites[event.index].description
+                                       gamedata.servername        = menudata.favorites[event.row].name
+                                       gamedata.serverdescription = menudata.favorites[event.row].description
                                end
 
                                if gamedata.address ~= nil and
@@ -106,9 +122,9 @@ local function main_button_handler(tabview, fields, name, tabdata)
                end
 
                if event.type == "CHG" then
-                       if event.index <= #menudata.favorites then
-                               local address = menudata.favorites[event.index].address
-                               local port    = menudata.favorites[event.index].port
+                       if event.row <= #menudata.favorites then
+                               local address = menudata.favorites[event.row].address
+                               local port    = menudata.favorites[event.row].port
 
                                if address ~= nil and
                                        port ~= nil then
@@ -116,7 +132,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
                                        core.setting_set("remote_port",port)
                                end
 
-                               tabdata.fav_selected = event.index
+                               tabdata.fav_selected = event.row
                        end
                        
                        return true
@@ -126,7 +142,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
        if fields["key_up"] ~= nil or
                fields["key_down"] ~= nil then
 
-               local fav_idx = core.get_textlist_index("favourites")
+               local fav_idx = core.get_table_index("favourites")
 
                if fav_idx ~= nil then
                        if fields["key_up"] ~= nil and fav_idx > 1 then
@@ -137,6 +153,12 @@ local function main_button_handler(tabview, fields, name, tabdata)
                else
                        fav_idx = 1
                end
+               
+               if menudata.favorites == nil or
+                       menudata.favorites[fav_idx] == nil then
+                       tabdata.fav_selected = 0
+                       return true
+               end
        
                local address = menudata.favorites[fav_idx].address
                local port    = menudata.favorites[fav_idx].port
@@ -164,7 +186,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
        end
 
        if fields["btn_delete_favorite"] ~= nil then
-               local current_favourite = core.get_textlist_index("favourites")
+               local current_favourite = core.get_table_index("favourites")
                if current_favourite == nil then return end
                core.delete_favorite(current_favourite)
                menudata.favorites   = core.get_favorites()
@@ -184,7 +206,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
                gamedata.address        = fields["te_address"]
                gamedata.port           = fields["te_port"]
 
-               local fav_idx = core.get_textlist_index("favourites")
+               local fav_idx = core.get_table_index("favourites")
 
                if fav_idx ~= nil and fav_idx <= #menudata.favorites and
                        menudata.favorites[fav_idx].address == fields["te_address"] and