[Bf-extensions-cvs] [7347cec] master: Update space_view3d_pie_menus

meta-androcto noreply at git.blender.org
Fri Jul 22 16:35:17 CEST 2016


Commit: 7347cec0b143aa0af2394d508da8b1988425cfdc
Author: meta-androcto
Date:   Sat Jul 23 00:34:42 2016 +1000
Branches: master
https://developer.blender.org/rBAC7347cec0b143aa0af2394d508da8b1988425cfdc

Update space_view3d_pie_menus

===================================================================

M	space_view3d_pie_menus/__init__.py
M	space_view3d_pie_menus/pie_animation_menu/__init__.py
M	space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
M	space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
M	space_view3d_pie_menus/pie_origin_cursor/__init__.py
M	space_view3d_pie_menus/pie_select_menu/__init__.py
M	space_view3d_pie_menus/pie_shading_menu/__init__.py

===================================================================

diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index 548e057..6d51fa1 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -45,14 +45,13 @@ from . import pie_editor_switch_menu
 bl_info = {
     'name': '3D Viewport Pie Menu',
     'author': 'meta-androcto, pitiwazou',
-    'version': (1, 1, 2),
+    'version': (1, 1, 3),
     'blender': (2, 7, 7),
     'location': '',
     'description': 'Pie Menu Activate',
     'warning': '',
     'wiki_url': '',
-    "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
-    'category': 'User Interface'
+    'category': 'User interface'
 }
 
 
diff --git a/space_view3d_pie_menus/pie_animation_menu/__init__.py b/space_view3d_pie_menus/pie_animation_menu/__init__.py
index a236a9c..859b7b6 100644
--- a/space_view3d_pie_menus/pie_animation_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_animation_menu/__init__.py
@@ -25,24 +25,25 @@ class PieAnimation(Menu):
         layout = self.layout
         pie = layout.menu_pie()
         # 4 - LEFT
-        pie.operator("screen.animation_play", text="Reverse", icon='PLAY_REVERSE').reverse = True
+        pie.operator("screen.frame_jump", text="Jump REW", icon='REW').end = False
         # 6 - RIGHT
+        pie.operator("screen.frame_jump", text="Jump FF", icon='FF').end = True
+        # 2 - BOTTOM
+        pie.operator("screen.animation_play", text="Reverse", icon='PLAY_REVERSE').reverse = True
+        # 8 - TOP
         if not context.screen.is_animation_playing:  # Play / Pause
             pie.operator("screen.animation_play", text="Play", icon='PLAY')
         else:
             pie.operator("screen.animation_play", text="Stop", icon='PAUSE')
-        # 2 - BOTTOM
-        pie.operator("insert.autokeyframe", text="Auto Keyframe ", icon='REC')
-        # 8 - TOP
-        pie.menu("VIEW3D_MT_object_animation", icon="CLIP")
         # 7 - TOP - LEFT
-        pie.operator("screen.frame_jump", text="Jump REW", icon='REW').end = False
+        pie.operator("screen.keyframe_jump", text="Previous FR", icon='PREV_KEYFRAME').next = False
         # 9 - TOP - RIGHT
-        pie.operator("screen.frame_jump", text="Jump FF", icon='FF').end = True
+        pie.operator("screen.keyframe_jump", text="Next FR", icon='NEXT_KEYFRAME').next = True
         # 1 - BOTTOM - LEFT
-        pie.operator("screen.keyframe_jump", text="Previous FR", icon='PREV_KEYFRAME').next = False
+        pie.operator("insert.autokeyframe", text="Auto Keyframe ", icon='REC')
         # 3 - BOTTOM - RIGHT
-        pie.operator("screen.keyframe_jump", text="Next FR", icon='NEXT_KEYFRAME').next = True
+        pie.menu("VIEW3D_MT_object_animation", icon="CLIP")
+
 
 # Insert Auto Keyframe
 class InsertAutoKeyframe(bpy.types.Operator):
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
index ae14528..8d26898 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
@@ -25,22 +25,19 @@ class PieApplyTransforms(Menu):
         layout = self.layout
         pie = layout.menu_pie()
         # 4 - LEFT
-        pie.operator("apply.transformlocation", text="Location", icon='MAN_TRANS')
+        pie.operator("apply.transformall", text="Apply All", icon='FREEZE')
         # 6 - RIGHT
-        pie.operator("apply.transformscale", text="Scale", icon='MAN_SCALE')
+        pie.operator("clear.all", text="Clear All", icon='MANIPUL')
         # 2 - BOTTOM
-        pie.operator("apply.transformrotation", text="Rotation", icon='MAN_ROT')
+        pie.menu("applymore.menu", text="More")
         # 8 - TOP
-        pie.operator("apply.transformall", text="Transforms", icon='FREEZE')
+        pie.operator("apply.transformrotation", text="Rotation", icon='MAN_ROT')
         # 7 - TOP - LEFT
-        pie.operator("apply.transformrotationscale", text="Rotation/Scale")
+        pie.operator("apply.transformlocation", text="Location", icon='MAN_TRANS')
         # 9 - TOP - RIGHT
-        pie.operator("clear.all", text="Clear All", icon='MANIPUL')
+        pie.operator("apply.transformscale", text="Scale", icon='MAN_SCALE')
         # 1 - BOTTOM - LEFT
-        box = pie.split().column()
-        row = box.row(align=True)
-        box.operator("object.visual_transform_apply", text="Visual Transforms")
-        box.operator("object.duplicates_make_real", text="Make Duplicates Real")
+        pie.operator("apply.transformrotationscale", text="Rotation/Scale")
         # 3 - BOTTOM - RIGHT
         pie.menu("clear.menu", text="Clear Transforms")
 
@@ -75,8 +72,6 @@ class ApplyTransformScale(bpy.types.Operator):
         return {'FINISHED'}
 
 # Apply Transforms
-
-
 class ApplyTransformRotationScale(bpy.types.Operator):
     bl_idname = "apply.transformrotationscale"
     bl_label = "Apply Transform Rotation Scale"
@@ -96,6 +91,15 @@ class ApplyTransformAll(bpy.types.Operator):
         bpy.ops.object.transform_apply(location=True, rotation=True, scale=True)
         return {'FINISHED'}
 
+# More Menu
+class TransformApplyMore(bpy.types.Menu):
+    bl_idname = "applymore.menu"
+    bl_label = "More Menu"
+
+    def draw(self, context):
+        layout = self.layout
+        layout.operator("object.visual_transform_apply", text="Visual Transforms")
+        layout.operator("object.duplicates_make_real", text="Make Duplicates Real")
 
 # Clear Menu
 class ClearMenu(bpy.types.Menu):
@@ -132,6 +136,7 @@ classes = [
     ApplyTransformAll,
     ClearMenu,
     ClearAll,
+    TransformApplyMore,
     ]
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
index 6ae7ee7..35ad231 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
@@ -16,7 +16,7 @@ from ..utils import AddonPreferences, SpaceProperty
 from bpy.types import Menu, Header
 from bpy.props import IntProperty, FloatProperty, BoolProperty, StringProperty
 
-class PieMenu(bpy.types.Menu):
+class AreaPieMenu(bpy.types.Menu):
     bl_idname = "INFO_MT_window_pie"
     bl_label = "Pie Menu"
     bl_description = "Window Pie Menus"
@@ -36,19 +36,28 @@ class AreaTypePieOperator(bpy.types.Operator):
         return {'FINISHED'}
 
 
-class PieEditor(Menu):
+class AreaPieEditor(Menu):
     bl_idname = "pie.editor"
     bl_label = "Editor Switch"
 
     def draw(self, context):
+        # 4 - LEFT 
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Text Editor", icon="TEXT").type = "TEXT_EDITOR"
+        # 6 - RIGHT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Outliner", icon="OOPS").type = "OUTLINER"
+        # 2 - BOTTOM
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Property", icon="BUTS").type = "PROPERTIES"
+        # 8 - TOP
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").type = "VIEW_3D"
+        # 7 - TOP - LEFT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="IMAGE_COL").type = "IMAGE_EDITOR"
+        # 9 - TOP - RIGHT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").type = "NODE_EDITOR"
-        self.layout.menu_pie().operator("wm.call_menu_pie", text="Anime", icon="ACTION").name = AreaTypePieAnim.bl_idname
-        self.layout.menu_pie().operator("wm.call_menu_pie", text="Other", icon="QUESTION").name = AreaTypePieOther.bl_idname
+        # 1 - BOTTOM - LEFT
+        self.layout.menu_pie().operator("wm.call_menu_pie", text="Animation Pie", icon="ACTION").name = AreaTypePieAnim.bl_idname
+        # 3 - BOTTOM - RIGHT
+        self.layout.menu_pie().operator("wm.call_menu_pie", text="More Types", icon="QUESTION").name = AreaTypePieOther.bl_idname
+
 
 class AreaTypePieOther(bpy.types.Menu):
     bl_idname = "INFO_MT_window_pie_area_type_other"
@@ -56,12 +65,20 @@ class AreaTypePieOther(bpy.types.Menu):
     bl_description = "Is pie menu change editor type (other)"
 
     def draw(self, context):
+        # 4 - LEFT 
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Logic Editor", icon="LOGIC").type = "LOGIC_EDITOR"
+        # 6 - RIGHT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="File Browser", icon="FILESEL").type = "FILE_BROWSER"
+        # 2 - BOTTOM
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").type = "CONSOLE"
+        # 8 - TOP
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO"
+        # 7 - TOP - LEFT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="User Setting", icon="PREFERENCES").type = "USER_PREFERENCES"
-        self.layout.menu_pie().operator("wm.call_menu_pie", text="Back", icon="BACK").name = PieEditor.bl_idname
+        # 9 - TOP - RIGHT
+        self.layout.menu_pie().operator("wm.call_menu_pie", text="Back", icon="BACK").name = AreaPieEditor.bl_idname
+        # 1 - BOTTOM - LEFT
+        # 3 - BOTTOM - RIGHT
 
 class SetAreaType(bpy.types.Operator):
     bl_idname = "wm.set_area_type"
@@ -82,18 +99,26 @@ class AreaTypePieAnim(bpy.types.Menu):
     bl_description = "Is pie menu change editor type (animation related)"
 
     def draw(self, context):
+        # 4 - LEFT 
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="NLA Editor", icon="NLA").type = "NLA_EDITOR"
+        # 6 - RIGHT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="DopeSheet", icon="ACTION").type = "DOPESHEET_EDITOR"
+        # 2 - BOTTOM
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Graph Editor", icon="IPO").type = "GRAPH_EDITOR"
+        # 8 - TOP
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Timeline", icon="TIME").type = "TIMELINE"
+        # 7 - TOP - LEFT
         self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Video Sequence Editor", icon="SEQUENCE").type = "SEQUENCE_EDI

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list