From 0c7eee305b203fa261163285c00a2a279569ea6c Mon Sep 17 00:00:00 2001 From: Maksim Date: Tue, 21 May 2019 00:16:33 +0200 Subject: [PATCH] Small mainmenu update --- builtin/mainmenu/tab_credits.lua | 6 +++--- builtin/mainmenu/tab_local.lua | 2 +- builtin/mainmenu/tab_online.lua | 8 +++++--- textures/base/bg_local.png | Bin 5279 -> 5279 bytes textures/base/bg_online.png | Bin 1755 -> 2434 bytes 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 0633f5785..597e65035 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -96,10 +96,10 @@ return { caption = fgettext("Credits"), cbf_formspec = function(tabview, name, tabdata) local version = core.get_version() - return "label[0.1,0;MultiCraft Open Source Project, ver. " .. version.string .. "]" .. - "label[0.1,0.25;Copyright (c) 2014-2019 MultiCraft Developement Team]" .. + return "label[0.1,-0.1;MultiCraft Open Source Project, ver. " .. version.string .. "]" .. + "label[0.1,0.2;Copyright (c) 2014-2019 MultiCraft Developement Team]" .. "label[0.1,0.5;Home page: https://github.com/MultiCraftProject/MultiCraft]" .. - "label[0.1,0.75;Licence: LGPLv3.0+ and CC-BY-SA 3.0]" .. + "label[0.1,0.8;Licence: LGPLv3.0+ and CC-BY-SA 3.0]" .. "tablecolumns[color;text]" .. "tableoptions[background=#999999;highlight=#00000000;border=true]" .. "table[0,1.6;11.8,3.8;list_credits;" .. diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 2643815ba..75d7e79fd 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -49,7 +49,7 @@ local function get_formspec(tabview, name, tabdata) "local_creative_" .. tostring(creative_mode) .. "_btn.png") .. ";cb_creative_mode;;true;false]" .. - "textlist[0,0;6.24,4.6;sp_worlds;" .. + "textlist[-0.025,0.01;6.3,4.63;sp_worlds;" .. menu_render_worldlist() .. ";" .. index .. ";true]" return retval diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index dd6c19dbb..c1a945230 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -50,9 +50,9 @@ local function get_formspec(tabview, name, tabdata) -- Name / Password "label[7.1,0.85;" .. fgettext("Name:") .. "]" .. "label[10.22,0.85;" .. fgettext("Password:") .. "]" .. - "field[7.4,1.75;2.86,0.5;te_name;;" .. + "field[7.4,1.75;3.2,0.5;te_name;;" .. core.formspec_escape(core.settings:get("name")) .. "]" .. - "pwdfield[10.5,1.8;1.86,0.5;te_pwd;]" .. + "pwdfield[10.5,1.8;1.86,0.39;te_pwd;]" .. -- Description Background "box[7.1,2.1;4.8,2.65;#999999]".. @@ -72,7 +72,9 @@ local function get_formspec(tabview, name, tabdata) end --favourites - retval = retval .. "tablecolumns[" .. + retval = retval .. + "tableoptions[background=#00000000;border=false]" .. + "tablecolumns[" .. image_column(fgettext("")) .. ";" .. image_column(fgettext("Favorite"), "favorite") .. ";" .. image_column(fgettext("Ping")) .. ",padding=0.25;" .. diff --git a/textures/base/bg_local.png b/textures/base/bg_local.png index e296ba7ac5fbfbc064dd501a98b0afaa4b521f02..9dcb5d574ceb33845f93bec7a22acb63135b1aff 100644 GIT binary patch delta 22 ecmbQQIbU;vDYLq={X~mc7S`FaM>fu669E8FUk332 delta 22 ecmbQQIbU;vDf5h}%O+aHvMemCv)ee6O#}dC`Us5x diff --git a/textures/base/bg_online.png b/textures/base/bg_online.png index 58aa58d1fad2c1da20b441806307479f44aae9d5..d183cb920e4826a9abf43965a468ecf8787b7d66 100644 GIT binary patch literal 2434 zcmeAS@N?(olHy`uVBq!ia0y~y;3!~VVBW*R3>3L}{!BiQ;t%i%apmO}J96ifS6EH| z&U@<0_7UeUFJNHc)bn(445?szbElj0PykQcMFqVHtS-C$YpqkbtI+qLxm+VdS66qA z@sZ>6x$oTI2bu*2LJ!JXkngl_z{B+Uqb0l9hrush72`R{X`E)vn$9n6fhiO zV8O7QOF`y<-`wBv zO$@=89x=?(k_qf>1epLc2xub6Jh;K^5c45?!osM!aTtmu3^bjvp~z0a>CzlW3xAU=d^kj+OCCdze4 zei1;?jpSuyyJ%u4l3l<6MRF2}!HdfSG%=KBp^_{~gtw6biKuv^br6#r8aR_Jl1oW8 zl-8j#bb@+8J27Pwt-}jBArlkfLo1^~Y6Bvxfk6?}8N@^aRdU^lY;bi9t%Z;CxQCiB ztQEN2t^E1h^7P-Ojz=8?4g?smGOu3nAl|okO^cE7<+B|>^c%B#+WtNOwk{Y8Jbxc) zXS9fH&*S4^28+~$T4eDam>0Fbu8?6Ju))D_cg<7=nP45h1EGx2(4CYgmc%G|cmjMvTzR?0j@bDtK;MDSJo5n!M8_~~2jiqfzh$7eGaD)1d?wAf`WpYX&W z)3P8;fc?>m104s8d>*d>$^_nYjO_EABMMZa#U3y%SuVXbSM>N@upXdF2bm6LpcIq^ zF$yFGVc}39z>cP%umRNsOa%&jC{_SD3@BCrIp_);WRM*RQq2fOU6IEXO9aPY+caf}ccKFMro$G;(ZM#D%&1QiUPWCkhp@RTA1 zJx4|{LwWo+r;4%{cR~whtAY#DnA2GceU$q6-rOpButuRT^T@?U!RDt2A{}M^?0a6b z>cBc3_H$gI60>>tpRjFw5qx^bK5~G_jVwCspo-=HC2PiLtrTmMNuNMmPgg&ebxsLQ E06G^gtpET3