Skip to content

Commit

Permalink
Rework main menu confirmation dialogs (minetest#12356)
Browse files Browse the repository at this point in the history
  • Loading branch information
rollerozxa authored Jun 3, 2022
1 parent b72932b commit 6d163b7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 23 deletions.
8 changes: 8 additions & 0 deletions builtin/mainmenu/common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,11 @@ function menu_worldmt_legacy(selected)
end
end
end

function confirmation_formspec(message, confirm_id, confirm_label, cancel_id, cancel_label)
return "size[10,2.5,true]" ..
"label[0.5,0.5;" .. message .. "]" ..
"style[" .. confirm_id .. ";bgcolor=red]" ..
"button[0.5,1.5;2.5,0.5;" .. confirm_id .. ";" .. confirm_label .. "]" ..
"button[7.0,1.5;2.5,0.5;" .. cancel_id .. ";" .. cancel_label .. "]"
end
10 changes: 4 additions & 6 deletions builtin/mainmenu/dlg_contentstore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -488,12 +488,10 @@ local confirm_overwrite = {}
function confirm_overwrite.get_formspec()
local package = confirm_overwrite.package

return "size[11.5,4.5,true]" ..
"label[2,2;" ..
fgettext("\"$1\" already exists. Would you like to overwrite it?", package.name) .. "]"..
"style[install;bgcolor=red]" ..
"button[3.25,3.5;2.5,0.5;install;" .. fgettext("Overwrite") .. "]" ..
"button[5.75,3.5;2.5,0.5;cancel;" .. fgettext("Cancel") .. "]"
return confirmation_formspec(
fgettext("\"$1\" already exists. Would you like to overwrite it?", package.name),
'install', fgettext("Overwrite"),
'cancel', fgettext("Cancel"))
end

function confirm_overwrite.handle_submit(this, fields)
Expand Down
13 changes: 4 additions & 9 deletions builtin/mainmenu/dlg_delete_content.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@
--------------------------------------------------------------------------------

local function delete_content_formspec(dialogdata)
local retval =
"size[11.5,4.5,true]" ..
"label[2,2;" ..
fgettext("Are you sure you want to delete \"$1\"?", dialogdata.content.name) .. "]"..
"style[dlg_delete_content_confirm;bgcolor=red]" ..
"button[3.25,3.5;2.5,0.5;dlg_delete_content_confirm;" .. fgettext("Delete") .. "]" ..
"button[5.75,3.5;2.5,0.5;dlg_delete_content_cancel;" .. fgettext("Cancel") .. "]"

return retval
return confirmation_formspec(
fgettext("Are you sure you want to delete \"$1\"?", dialogdata.content.name),
'dlg_delete_content_confirm', fgettext("Delete"),
'dlg_delete_content_cancel', fgettext("Cancel"))
end

--------------------------------------------------------------------------------
Expand Down
12 changes: 4 additions & 8 deletions builtin/mainmenu/dlg_delete_world.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@


local function delete_world_formspec(dialogdata)
local retval =
"size[10,2.5,true]" ..
"label[0.5,0.5;" ..
fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" ..
"style[world_delete_confirm;bgcolor=red]" ..
"button[0.5,1.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
"button[7.0,1.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]"
return retval
return confirmation_formspec(
fgettext("Delete World \"$1\"?", dialogdata.delete_name),
'world_delete_confirm', fgettext("Delete"),
'world_delete_cancel', fgettext("Cancel"))
end

local function delete_world_buttonhandler(this, fields)
Expand Down

0 comments on commit 6d163b7

Please sign in to comment.