viewport pies: re-order select menus

2 files changed, 35 insertions, 17 deletions

diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index a8eb7d00..8b741888 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -45,19 +45,19 @@ bl_info = {
     }
 
 sub_modules_names = (
-    "pie_align_menu",
-    "pie_animation_menu",
-    "pie_apply_transform_menu",
-    "pie_delete_menu",
-    "pie_editor_switch_menu",
-    "pie_manipulator_menu",
     "pie_modes_menu",
-    "pie_origin",
-    "pie_save_open_menu",
+    "pie_views_numpad_menu",
     "pie_sculpt_menu",
-    "pie_select_menu",
+    "pie_origin",
+    "pie_manipulator_menu",
     "pie_shading_menu",
-    "pie_views_numpad_menu",
+    "pie_align_menu",
+    "pie_delete_menu",
+    "pie_apply_transform_menu",
+    "pie_select_menu",
+    "pie_animation_menu",
+    "pie_save_open_menu",
+    "pie_editor_switch_menu",
     )
 
 
diff --git a/space_view3d_pie_menus/pie_select_menu.py b/space_view3d_pie_menus/pie_select_menu.py
index 2ec6a039..c1cdf2af 100644
--- a/space_view3d_pie_menus/pie_select_menu.py
+++ b/space_view3d_pie_menus/pie_select_menu.py
@@ -49,8 +49,28 @@ class PIE_MT_SelectionsMore(Menu):
         box = pie.split().column()
         box.operator("object.select_random", text="Select Random")
         box.operator("object.select_linked", text="Select Linked")
-        box.menu("VIEW3D_MT_select_object_more_less", text="More/Less")
+        box.separator()
 
+        box.operator("object.select_more", text="More")
+        box.operator("object.select_less", text="Less")
+        box.separator()
+
+        props = box.operator("object.select_hierarchy", text="Parent")
+        props.extend = False
+        props.direction = 'PARENT'
+
+        props = box.operator("object.select_hierarchy", text="Child")
+        props.extend = False
+        props.direction = 'CHILD'
+        box.separator()
+
+        props = box.operator("object.select_hierarchy", text="Extend Parent")
+        props.extend = True
+        props.direction = 'PARENT'
+
+        props = box.operator("object.select_hierarchy", text="Extend Child")
+        props.extend = True
+        props.direction = 'CHILD'
 
 # Pie Selection Object Mode - A
 class PIE_MT_SelectionsOM(Menu):
@@ -89,12 +109,11 @@ class PIE_MT_SelectionsEM(Menu):
         layout = self.layout
         pie = layout.menu_pie()
         # 4 - LEFT
-        pie.operator("mesh.select_all", text="Select All",
-                    icon='RESTRICT_SELECT_OFF').action = 'SELECT'
+        pie.operator("mesh.select_less", text="Select Less")
         # 6 - RIGHT
-        pie.menu("OBJECT_MT_selectloopselection", text="Select Loop Menu")
+        pie.operator("mesh.select_more", text="Select More")
         # 2 - BOTTOM
-        pie.operator("mesh.select_all", text="Invert Selection").action = 'INVERT'
+        pie.menu("OBJECT_MT_selectloopselection", text="Select Loop Menu")
         # 8 - TOP
         pie.operator("mesh.select_all", text="Select All Toggle").action = 'TOGGLE'
         # 7 - TOP - LEFT
@@ -102,8 +121,7 @@ class PIE_MT_SelectionsEM(Menu):
         # 9 - TOP - RIGHT
         pie.operator("view3d.select_box", text="Box Select")
         # 1 - BOTTOM - LEFT
-        pie.operator("mesh.select_all", text="Select None",
-                    icon='RESTRICT_SELECT_ON').action = 'DESELECT'
+        pie.operator("mesh.select_all", text="Invert Selection").action = 'INVERT'
         # 3 - BOTTOM - RIGHT
         pie.menu("PIE_MT_selectallbyselection", text="Edit Modes", icon='VERTEXSEL')