Skip to content

Commit 30083d1

Browse files
SmallJokerparamat
SmallJoker
authored and
paramat
committedApr 28, 2016
Mainmenu: Standardize the menu button order and sizes
·
5.11.00.4.14
1 parent 6278da2 commit 30083d1

6 files changed

+38
-39
lines changed
 

‎builtin/mainmenu/dlg_config_world.lua

+19-19
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,34 @@ local function get_formspec(data)
2525
local mod = data.list:get_list()[data.selected_mod]
2626

2727
local retval =
28-
"size[11,6.5,true]" ..
29-
"label[0.5,-0.25;" .. fgettext("World:") .. "]" ..
30-
"label[1.75,-0.25;" .. data.worldspec.name .. "]"
28+
"size[11.5,7.5,true]" ..
29+
"label[0.5,0;" .. fgettext("World:") .. "]" ..
30+
"label[1.75,0;" .. data.worldspec.name .. "]"
3131

3232
if data.hide_gamemods then
33-
retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";true]"
33+
retval = retval .. "checkbox[1,6;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";true]"
3434
else
35-
retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";false]"
35+
retval = retval .. "checkbox[1,6;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";false]"
3636
end
3737

3838
if data.hide_modpackcontents then
39-
retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";true]"
39+
retval = retval .. "checkbox[6,6;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";true]"
4040
else
41-
retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";false]"
41+
retval = retval .. "checkbox[6,6;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";false]"
4242
end
4343

4444
if mod == nil then
4545
mod = {name=""}
4646
end
4747

4848
retval = retval ..
49-
"label[0,0.45;" .. fgettext("Mod:") .. "]" ..
50-
"label[0.75,0.45;" .. mod.name .. "]" ..
51-
"label[0,1;" .. fgettext("Depends:") .. "]" ..
52-
"textlist[0,1.5;5,4.25;world_config_depends;" ..
49+
"label[0,0.7;" .. fgettext("Mod:") .. "]" ..
50+
"label[0.75,0.7;" .. mod.name .. "]" ..
51+
"label[0,1.25;" .. fgettext("Depends:") .. "]" ..
52+
"textlist[0,1.75;5,4.25;world_config_depends;" ..
5353
modmgr.get_dependencies(mod.path) .. ";0]" ..
54-
"button[9.25,6.35;2,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" ..
55-
"button[7.4,6.35;2,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]"
54+
"button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" ..
55+
"button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]"
5656

5757
if mod ~= nil and mod.name ~= "" and mod.typ ~= "game_mod" then
5858
if mod.is_modpack then
@@ -68,22 +68,22 @@ local function get_formspec(data)
6868
end
6969

7070
if all_enabled == false then
71-
retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_enable;" .. fgettext("Enable MP") .. "]"
71+
retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_enable;" .. fgettext("Enable MP") .. "]"
7272
else
73-
retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_disable;" .. fgettext("Disable MP") .. "]"
73+
retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_disable;" .. fgettext("Disable MP") .. "]"
7474
end
7575
else
7676
if mod.enabled then
77-
retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";true]"
77+
retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" .. fgettext("enabled") .. ";true]"
7878
else
79-
retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";false]"
79+
retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" .. fgettext("enabled") .. ";false]"
8080
end
8181
end
8282
end
8383

8484
retval = retval ..
85-
"button[8.5,-0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" ..
86-
"textlist[5.5,0.5;5.5,5.75;world_config_modlist;"
85+
"button[8.75,0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" ..
86+
"textlist[5.5,0.75;5.75,5.25;world_config_modlist;"
8787

8888
retval = retval .. modmgr.render_modlist(data.list)
8989
retval = retval .. ";" .. data.selected_mod .."]"

‎builtin/mainmenu/dlg_create_world.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ local function create_world_formspec(dialogdata)
4646

4747
current_seed = core.formspec_escape(current_seed)
4848
local retval =
49-
"size[12,6,true]" ..
49+
"size[11.5,6.5,true]" ..
5050
"label[2,0;" .. fgettext("World name") .. "]"..
5151
"field[4.5,0.4;6,0.5;te_world_name;;]" ..
5252

@@ -60,8 +60,8 @@ local function create_world_formspec(dialogdata)
6060
"textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() ..
6161
";" .. gameidx .. ";true]" ..
6262

63-
"button[5,5.5;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
64-
"button[7.5,5.5;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
63+
"button[3.25,6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
64+
"button[5.75,6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
6565

6666
if #gamemgr.games == 0 then
6767
retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..

‎builtin/mainmenu/dlg_delete_mod.lua

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ local function delete_mod_formspec(dialogdata)
2222
dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected]
2323

2424
local retval =
25-
"size[12.4,5,true]" ..
26-
"field[1.75,1;10,3;;" .. fgettext("Are you sure you want to delete \"$1\"?", dialogdata.mod.name) .. ";]"..
27-
"button[4,4.2;1,0.5;dlg_delete_mod_confirm;" .. fgettext("Yes") .. "]" ..
28-
"button[6.5,4.2;3,0.5;dlg_delete_mod_cancel;" .. fgettext("No of course not!") .. "]"
25+
"size[11.5,4.5,true]" ..
26+
"label[2,2;" ..
27+
fgettext("Are you sure you want to delete \"$1\"?", dialogdata.mod.name) .. "]"..
28+
"button[3.25,3.5;2.5,0.5;dlg_delete_mod_confirm;" .. fgettext("Delete") .. "]" ..
29+
"button[5.75,3.5;2.5,0.5;dlg_delete_mod_cancel;" .. fgettext("Cancel") .. "]"
2930

3031
return retval
3132
end

‎builtin/mainmenu/dlg_delete_world.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
local function delete_world_formspec(dialogdata)
2020

2121
local retval =
22-
"size[12,6,true]" ..
22+
"size[11.5,4.5,true]" ..
2323
"label[2,2;" ..
24-
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]"..
25-
"button[3.5,4.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes").. "]" ..
26-
"button[6,4.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]"
24+
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" ..
25+
"button[3.25,3.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
26+
"button[5.75,3.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]"
2727
return retval
2828
end
2929

‎builtin/mainmenu/dlg_rename_modpack.lua

+5-7
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ local function rename_modpack_formspec(dialogdata)
2222
dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected]
2323

2424
local retval =
25-
"size[12.4,5,true]" ..
26-
"label[1.75,1;".. fgettext("Rename Modpack:") .. "]"..
27-
"field[4.5,1.4;6,0.5;te_modpack_name;;" ..
28-
dialogdata.mod.name ..
29-
"]" ..
30-
"button[5,4.2;2.6,0.5;dlg_rename_modpack_confirm;"..
25+
"size[11.5,4.5,true]" ..
26+
"field[2.5,2;7,0.5;te_modpack_name;".. fgettext("Rename Modpack:") .. ";" ..
27+
dialogdata.mod.name .. "]" ..
28+
"button[3.25,3.5;2.5,0.5;dlg_rename_modpack_confirm;"..
3129
fgettext("Accept") .. "]" ..
32-
"button[7.5,4.2;2.8,0.5;dlg_rename_modpack_cancel;"..
30+
"button[5.75,3.5;2.5,0.5;dlg_rename_modpack_cancel;"..
3331
fgettext("Cancel") .. "]"
3432

3533
return retval

‎src/guiKeyChangeMenu.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
187187

188188
{
189189
core::rect < s32 > rect(0, 0, 100, 30);
190-
rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
190+
rect += topleft + v2s32(size.X / 2 - 105, size.Y - 40);
191191
const wchar_t *text = wgettext("Save");
192192
Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
193193
text);
194194
delete[] text;
195195
}
196196
{
197197
core::rect < s32 > rect(0, 0, 100, 30);
198-
rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
198+
rect += topleft + v2s32(size.X / 2 + 5, size.Y - 40);
199199
const wchar_t *text = wgettext("Cancel");
200200
Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
201201
text);

0 commit comments

Comments
 (0)
Please sign in to comment.