Fixed dropdown menus in the WorldEdit GUI (closes #78, thanks to @sponce)

diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua
index c131612d063a8e2b16cc3e59d175e27b53b4e292..c358a8caa7feaf6213ae45ee6e06f29af5d433e5 100644 (file)
--- a/worldedit_gui/functionality.lua
+++ b/worldedit_gui/functionality.lua
@@ -280,6 +280,11 @@ worldedit.register_gui_handler("worldedit_gui_cylinder", function(name, fields)
                end\r
                return true\r
        end\r
+       if fields.worldedit_gui_cylinder_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_cylinder_axis]\r
+               worldedit.show_page(name, "worldedit_gui_cylinder")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
@@ -310,6 +315,11 @@ worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields)
                end\r
                return true\r
        end\r
+       if fields.worldedit_gui_pyramid_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_pyramid_axis]\r
+               worldedit.show_page(name, "worldedit_gui_pyramid")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
@@ -370,6 +380,11 @@ worldedit.register_gui_handler("worldedit_gui_copy_move", function(name, fields)
                end\r
                return true\r
        end\r
+       if fields.worldedit_gui_copy_move_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_copy_move_axis] or 4\r
+               worldedit.show_page(name, "worldedit_gui_copy_move")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
@@ -392,6 +407,11 @@ worldedit.register_gui_handler("worldedit_gui_stack", function(name, fields)
                minetest.chatcommands["/stack"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], gui_count1[name]))\r
                return true\r
        end\r
+       if fields.worldedit_gui_stack_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_stack_axis]\r
+               worldedit.show_page(name, "worldedit_gui_stack")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
@@ -438,13 +458,23 @@ worldedit.register_gui_handler("worldedit_gui_transpose", function(name, fields)
                minetest.chatcommands["/transpose"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], axis_values[gui_axis2[name]]))\r
                return true\r
        end\r
+       if fields.worldedit_gui_transpose_axis1 then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_transpose_axis1]\r
+               worldedit.show_page(name, "worldedit_gui_transpose")\r
+               return true\r
+       end\r
+       if fields.worldedit_gui_transpose_axis2 then\r
+               gui_axis2[name] = axis_indices[fields.worldedit_gui_transpose_axis2]\r
+               worldedit.show_page(name, "worldedit_gui_transpose")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_flip", {\r
        name = "Flip", privs = minetest.chatcommands["/flip"].privs,\r
        get_formspec = function(name)\r
-               local axis = gui_axis2[name]\r
+               local axis = gui_axis1[name]\r
                return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_flip") ..\r
                        string.format("dropdown[0,1;2.5;worldedit_gui_flip_axis;X axis,Y axis,Z axis,Look direction;%d]", axis) ..\r
                        "button_exit[0,2.5;3,0.8;worldedit_gui_flip_submit;Flip]"\r
@@ -453,9 +483,14 @@ worldedit.register_gui_function("worldedit_gui_flip", {
 \r
 worldedit.register_gui_handler("worldedit_gui_flip", function(name, fields)\r
        if fields.worldedit_gui_flip_submit then\r
-               gui_axis2[name] = axis_indices[fields.worldedit_gui_flip_axis]\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_flip_axis]\r
+               worldedit.show_page(name, "worldedit_gui_flip")\r
+               minetest.chatcommands["/flip"].func(name, axis_values[gui_axis1[name]])\r
+               return true\r
+       end\r
+       if fields.worldedit_gui_flip_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_flip_axis]\r
                worldedit.show_page(name, "worldedit_gui_flip")\r
-               minetest.chatcommands["/flip"].func(name, axis_values[gui_axis2[name]])\r
                return true\r
        end\r
        return false\r
@@ -480,6 +515,16 @@ worldedit.register_gui_handler("worldedit_gui_rotate", function(name, fields)
                minetest.chatcommands["/rotate"].func(name, string.format("%s %s", axis_values[gui_axis1[name]], angle_values[gui_angle[name]]))\r
                return true\r
        end\r
+       if fields.worldedit_gui_rotate_axis then\r
+               gui_axis1[name] = axis_indices[fields.worldedit_gui_rotate_axis]\r
+               worldedit.show_page(name, "worldedit_gui_rotate")\r
+               return true\r
+       end\r
+       if fields.worldedit_gui_rotate_angle then\r
+               gui_angle[name] = angle_indices[fields.worldedit_gui_rotate_angle]\r
+               worldedit.show_page(name, "worldedit_gui_rotate")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r
@@ -500,6 +545,11 @@ worldedit.register_gui_handler("worldedit_gui_orient", function(name, fields)
                minetest.chatcommands["/orient"].func(name, tostring(angle_values[gui_angle[name]]))\r
                return true\r
        end\r
+       if fields.worldedit_gui_orient_angle then\r
+               gui_angle[name] = angle_indices[fields.worldedit_gui_orient_angle]\r
+               worldedit.show_page(name, "worldedit_gui_orient")\r
+               return true\r
+       end\r
        return false\r
 end)\r
 \r