Rework main menu confirmation dialogs (#12356)

diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 8db8bb8d17f19c0515d980c71da83c1efc2b7c87..dcccb2b2a9f7bda36abd69a8b703e2980c1589fd 100644 (file)
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -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

diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index 16ab1c3a7720c0299feae9045aa6c6af3de3b1f8..11eaceac3fdb1e8814596873ac9a52585894ef11 100644 (file)
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -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)

diff --git a/builtin/mainmenu/dlg_delete_content.lua b/builtin/mainmenu/dlg_delete_content.lua
index a24171541e3659e8b134a99a661ec1c670e7be73..4463825f7ff694b69ac662d7405fd73c863f43c1 100644 (file)
--- a/builtin/mainmenu/dlg_delete_content.lua
+++ b/builtin/mainmenu/dlg_delete_content.lua
@@ -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
 
 --------------------------------------------------------------------------------

diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua
index 33e7bc94548918a4ee6cb879150de5f2eda068ac..67c0612bdac65f8db754fe5ab485af7f1becaa2b 100644 (file)
--- a/builtin/mainmenu/dlg_delete_world.lua
+++ b/builtin/mainmenu/dlg_delete_world.lua
@@ -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)