diff options
| author | Kahrl <kahrl@gmx.net> | 2014-12-07 22:09:21 +0100 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2014-12-13 00:33:38 +0100 |
| commit | 581efea60e8fad18b9a2fc9d544f014e2ac693f8 (patch) | |
| tree | d0b56fe5580ce851bffa076b2624d6d6044bcc71 /builtin/mainmenu/tab_multiplayer.lua | |
| parent | 733d3182bde69f949851970c08bf09b328deaa53 (diff) | |
| download | hax-minetest-server-581efea60e8fad18b9a2fc9d544f014e2ac693f8.tar.gz hax-minetest-server-581efea60e8fad18b9a2fc9d544f014e2ac693f8.zip | |
Remove vertlabels from main menu and relayout a bit
Diffstat (limited to 'builtin/mainmenu/tab_multiplayer.lua')
| -rw-r--r-- | builtin/mainmenu/tab_multiplayer.lua | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index 887568fae..1e41f68b1 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -20,28 +20,26 @@ 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.formspec_escape(core.setting_get("address")) .."]" .. - "field[6.75,5.25;2.25,0.5;te_port;;" .. - core.formspec_escape(core.setting_get("remote_port")) .."]" .. - "checkbox[1,3.6;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" .. + "label[0,4.25;" .. fgettext("Address/Port") .. "]" .. + "label[9,2.75;" .. fgettext("Name/Password") .. "]" .. + "field[0.25,5.25;5.5,0.5;te_address;;" .. + core.formspec_escape(core.setting_get("address")) .. "]" .. + "field[5.75,5.25;2.25,0.5;te_port;;" .. + core.formspec_escape(core.setting_get("remote_port")) .. "]" .. + "checkbox[0,3.6;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[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") .. "]" .. + "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.formspec_escape(core.setting_get("name")) .."]" .. + core.formspec_escape(core.setting_get("name")) .. "]" .. "pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" .. - "textarea[9.3,0.25;2.5,2.75;;" + "textarea[9.3,0;2.5,3.1;;" if tabdata.fav_selected ~= nil and menudata.favorites[tabdata.fav_selected] ~= nil and @@ -66,15 +64,15 @@ local function get_formspec(tabview, name, tabdata) "text,align=right;" .. -- clients "text,align=center,padding=0.25;" .. -- "/" "text,align=right,padding=0.25;" .. -- clients_max - image_column("Creative mode", "creative") .. ";" .. + image_column("Creative mode", "creative") .. ",padding=1;" .. image_column("Damage enabled", "damage") .. ",padding=0.25;" .. image_column("PvP enabled", "pvp") .. ",padding=0.25;" .. - "text]" -- name + "text,padding=1]" -- name else retval = retval .. "tablecolumns[text]" end retval = retval .. - "table[1,0.35;7.5,3.35;favourites;" + "table[0,0;8.5,3.7;favourites;" if #menudata.favorites > 0 then retval = retval .. render_favorite(menudata.favorites[1],render_details) |