space_view3d_spacebar_menu: large commit, rewrite: T68591

1 files changed, 12 insertions, 51 deletions

diff --git a/space_view3d_spacebar_menu/curve_menus.py b/space_view3d_spacebar_menu/curve_menus.py
index d06d7bb5..c9e72ff0 100644
--- a/space_view3d_spacebar_menu/curve_menus.py
+++ b/space_view3d_spacebar_menu/curve_menus.py
@@ -27,6 +27,7 @@ from bpy.props import (
         BoolProperty,
         StringProperty,
         )
+
 from .object_menus import *
 
 
@@ -39,73 +40,33 @@ class VIEW3D_MT_Edit_Curve(Menu):
 
         toolsettings = context.tool_settings
 
-        layout.operator("curve.extrude_move")
-        layout.operator("curve.spin")
+        layout.operator_menu_enum("curve.spline_type_set", "type")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.operator("curve.make_segment")
+        layout.menu("VIEW3D_MT_edit_curve_segments")
+        layout.separator()
+
         layout.operator("curve.duplicate_move")
         layout.operator("curve.split")
         layout.operator("curve.separate")
-        layout.operator("curve.make_segment")
         layout.operator("curve.cyclic_toggle")
+        layout.operator("curve.spin")
         layout.separator()
-        layout.operator("curve.delete", text="Delete...")
+
+        layout.menu("VIEW3D_MT_edit_curve_showhide")
+        layout.menu("VIEW3D_MT_edit_curve_clean")
         layout.separator()
-        layout.menu("VIEW3D_MT_edit_curve_segments")
+
 #        layout.prop_menu_enum(toolsettings, "proportional_edit",
 #                              icon="PROP_CON")
         layout.prop_menu_enum(toolsettings, "proportional_edit_falloff",
                               icon="SMOOTHCURVE")
-        layout.menu("VIEW3D_MT_edit_curve_showhide")
-
-
-class VIEW3D_MT_EditCurveCtrlpoints(Menu):
-    bl_label = "Control Points"
-
-    def draw(self, context):
-        layout = self.layout
-
-        edit_object = context.edit_object
-
-        if edit_object.type == 'CURVE':
-            layout.operator("transform.transform").mode = 'TILT'
-            layout.operator("curve.tilt_clear")
-            layout.operator("curve.separate")
-            layout.operator_menu_enum("curve.handle_type_set", "type")
-            layout.menu("VIEW3D_MT_hook")
-
-
-class VIEW3D_MT_EditCurveSegments(Menu):
-    bl_label = "Curve Segments"
-
-    def draw(self, context):
-        layout = self.layout
-        layout.operator("curve.subdivide")
-        layout.operator("curve.switch_direction")
-
-
-class VIEW3D_MT_EditCurveSpecials(Menu):
-    bl_label = "Specials"
-
-    def draw(self, context):
-        layout = self.layout
-        layout.operator("curve.subdivide")
-        layout.separator()
-        layout.operator("curve.switch_direction")
-        layout.operator("curve.spline_weight_set")
-        layout.operator("curve.radius_set")
-        layout.separator()
-        layout.operator("curve.smooth")
-        layout.operator("curve.smooth_weight")
-        layout.operator("curve.smooth_radius")
-        layout.operator("curve.smooth_tilt")
 
 
 # List The Classes #
 
 classes = (
     VIEW3D_MT_Edit_Curve,
-    VIEW3D_MT_EditCurveCtrlpoints,
-    VIEW3D_MT_EditCurveSegments,
-    VIEW3D_MT_EditCurveSpecials,
 )