More improvements to worldedit_gui

diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua
index ac3a0ab6023168392b91f4bb12b6d2059399ccb6..37c1ddfd694b009d9b4e365526469d02c3ae5100 100644 (file)
--- a/worldedit_gui/functionality.lua
+++ b/worldedit_gui/functionality.lua
@@ -82,6 +82,7 @@ worldedit.register_gui_handler("worldedit_gui_fixedpos", function(name, fields)
                if x2 and y2 and z2 then\r
                        minetest.chatcommands["/fixedpos"].func(name, string.format("set2 %d %d %d", x2, y2, z2))\r
                end\r
+               worldedit.show_page(name, "worldedit_gui_fixedpos")\r
                return true\r
        end\r
        return false\r
@@ -110,6 +111,7 @@ worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
                return true\r
        elseif fields.worldedit_gui_set_submit then\r
                gui_nodename1[name] = fields.worldedit_gui_set_node\r
+               worldedit.show_page(name, "worldedit_gui_set")\r
                minetest.chatcommands["/set"].func(name, gui_nodename1[name])\r
                return true\r
        end\r
@@ -149,6 +151,7 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
        elseif fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then\r
                gui_nodename1[name] = fields.worldedit_gui_replace_search\r
                gui_nodename2[name] = fields.worldedit_gui_replace_replace\r
+               worldedit.show_page(name, "worldedit_gui_replace")\r
                if fields.worldedit_gui_replace_submit then\r
                        minetest.chatcommands["/replace"].func(name, string.format("%s %s", gui_nodename1[name], gui_nodename2[name]))\r
                else\r
@@ -159,36 +162,43 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
        return false\r
 end)\r
 \r
-worldedit.register_gui_function("worldedit_gui_sphere", {\r
-       name = "Sphere", privs = minetest.chatcommands["/sphere"].privs,\r
+worldedit.register_gui_function("worldedit_gui_sphere_dome", {\r
+       name = "Sphere/Dome", privs = minetest.chatcommands["/sphere"].privs,\r
        get_formspec = function(name)\r
                local value = gui_nodename1[name] or "Cobblestone"\r
                local radius = gui_radius[name] or "5"\r
                local nodename = worldedit.normalize_nodename(value)\r
-               return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_sphere") ..\r
-                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_node;Name;%s]", minetest.formspec_escape(value)) ..\r
-                       "button[4,1.18;1.5,0.8;worldedit_gui_sphere_search;Search]" ..\r
+               return "size[6.5,5]" .. worldedit.get_formspec_header("worldedit_gui_sphere_dome") ..\r
+                       string.format("field[0.5,1.5;4,0.8;worldedit_gui_sphere_dome_node;Name;%s]", minetest.formspec_escape(value)) ..\r
+                       "button[4,1.18;1.5,0.8;worldedit_gui_sphere_dome_search;Search]" ..\r
                        (nodename and string.format("item_image[5.5,1.1;1,1;%s]", nodename)\r
                                or "image[5.5,1.1;1,1;unknown_node.png]") ..\r
-                       string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_radius;Radius;%s]", minetest.formspec_escape(radius)) ..\r
-                       "button_exit[0,3.5;3,0.8;worldedit_gui_sphere_submit_hollow;Hollow Sphere]" ..\r
-                       "button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_submit_solid;Solid Sphere]"\r
+                       string.format("field[0.5,2.5;4,0.8;worldedit_gui_sphere_dome_radius;Radius;%s]", minetest.formspec_escape(radius)) ..\r
+                       "button_exit[0,3.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow;Hollow Sphere]" ..\r
+                       "button_exit[3.5,3.5;3,0.8;worldedit_gui_sphere_dome_submit_solid;Solid Sphere]" ..\r
+                       "button_exit[0,4.5;3,0.8;worldedit_gui_sphere_dome_submit_hollow_dome;Hollow Dome]" ..\r
+                       "button_exit[3.5,4.5;3,0.8;worldedit_gui_sphere_dome_submit_solid_dome;Solid Dome]"\r
        end,\r
 })\r
 \r
-worldedit.register_gui_handler("worldedit_gui_sphere", function(name, fields)\r
-       if fields.worldedit_gui_sphere_search then\r
-               gui_nodename1[name] = fields.worldedit_gui_sphere_node\r
-               worldedit.show_page(name, "worldedit_gui_sphere")\r
+worldedit.register_gui_handler("worldedit_gui_sphere_dome", function(name, fields)\r
+       if fields.worldedit_gui_sphere_dome_search then\r
+               gui_nodename1[name] = fields.worldedit_gui_sphere_dome_node\r
+               worldedit.show_page(name, "worldedit_gui_sphere_dome")\r
                return true\r
-       elseif fields.worldedit_gui_sphere_submit_hollow or fields.worldedit_gui_sphere_submit_solid then\r
-               gui_nodename1[name] = fields.worldedit_gui_sphere_node\r
-               gui_radius[name] = fields.worldedit_gui_sphere_radius\r
-               print(minetest.serialize(fields))\r
-               if fields.worldedit_gui_sphere_submit_hollow then\r
+       elseif fields.worldedit_gui_sphere_dome_submit_hollow or fields.worldedit_gui_sphere_dome_submit_solid\r
+       or fields.worldedit_gui_sphere_dome_submit_hollow_dome or fields.worldedit_gui_sphere_dome_submit_solid_dome then\r
+               gui_nodename1[name] = fields.worldedit_gui_sphere_dome_node\r
+               gui_radius[name] = fields.worldedit_gui_sphere_dome_radius\r
+               worldedit.show_page(name, "worldedit_gui_sphere_dome")\r
+               if fields.worldedit_gui_sphere_dome_submit_hollow then\r
                        minetest.chatcommands["/hollowsphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))\r
-               else\r
+               elseif fields.worldedit_gui_sphere_dome_submit_solid then\r
                        minetest.chatcommands["/sphere"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))\r
+               elseif fields.worldedit_gui_sphere_dome_submit_hollow_dome then\r
+                       minetest.chatcommands["/hollowdome"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))\r
+               else --fields.worldedit_gui_sphere_dome_submit_solid_dome\r
+                       minetest.chatcommands["/dome"].func(name, string.format("%s %s", gui_radius[name], gui_nodename1[name]))\r
                end\r
                return true\r
        end\r