[Bf-extensions-cvs] [baaf5887] blender2.8: port "3D Viewport Pie Menus" to Blender 2.8

Jacques Lucke noreply at git.blender.org
Sun Nov 4 18:47:20 CET 2018


Commit: baaf58872bf83049637f2e4da9c444265846f2af
Author: Jacques Lucke
Date:   Sun Nov 4 18:44:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBAbaaf58872bf83049637f2e4da9c444265846f2af

port "3D Viewport Pie Menus" to Blender 2.8

I'm pretty sure that I did not find every thing that needs to be ported. At least the addon is usable again.
I replaced deprecated icons with NONE. Someone else, who is responsible for this addon, can choose some new icons.

Differential Revision: https://developer.blender.org/D3883

Reviewer: campbellbarton

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

M	sequencer_kinoraw_tools/ui.py
M	space_view3d_pie_menus/__init__.py
M	space_view3d_pie_menus/pie_align_menu.py
M	space_view3d_pie_menus/pie_animation_menu.py
M	space_view3d_pie_menus/pie_apply_transform_menu.py
M	space_view3d_pie_menus/pie_cursor.py
M	space_view3d_pie_menus/pie_delete_menu.py
M	space_view3d_pie_menus/pie_editor_switch_menu.py
M	space_view3d_pie_menus/pie_manipulator_menu.py
M	space_view3d_pie_menus/pie_modes_menu.py
M	space_view3d_pie_menus/pie_orientation_menu.py
M	space_view3d_pie_menus/pie_origin.py
M	space_view3d_pie_menus/pie_pivot_point_menu.py
M	space_view3d_pie_menus/pie_proportional_menu.py
M	space_view3d_pie_menus/pie_save_open_menu.py
M	space_view3d_pie_menus/pie_sculpt_menu.py
M	space_view3d_pie_menus/pie_select_menu.py
M	space_view3d_pie_menus/pie_shading_menu.py
M	space_view3d_pie_menus/pie_snap_menu.py
M	space_view3d_pie_menus/pie_views_numpad_menu.py

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

diff --git a/sequencer_kinoraw_tools/ui.py b/sequencer_kinoraw_tools/ui.py
index 9e7f2762..221f4f47 100644
--- a/sequencer_kinoraw_tools/ui.py
+++ b/sequencer_kinoraw_tools/ui.py
@@ -321,7 +321,7 @@ class JumptoCut(Panel):
             if prefs.kr_mini_ui:
                 row = layout.row(align=True)
                 row.operator("sequencerextra.extrasnap", text="", icon="SNAP_ON").align = 0
-                row.operator("sequencerextra.extrasnap", text="", icon="SNAP_SURFACE").align = 1
+                row.operator("sequencerextra.extrasnap", text="", icon="NONE").align = 1
                 row.operator("sequencerextra.extrasnap", text="", icon="SNAP_ON").align = 2
 
                 row.separator()
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index e725995f..26ac9958 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -162,6 +162,28 @@ class PieToolsPreferences(AddonPreferences):
         update=disable_all_modules
     )
 
+    for mod in sub_modules:
+        mod_name = mod.__name__.split('.')[-1]
+
+        def gen_update(mod, use_prop_name):
+            def update(self, context):
+                if getattr(self, use_prop_name):
+                    if not mod.__addon_enabled__:
+                        register_submodule(mod)
+                else:
+                    if mod.__addon_enabled__:
+                        unregister_submodule(mod)
+            return update
+
+        use_prop_name = 'use_' + mod_name
+        __annotations__[use_prop_name] = BoolProperty(
+            name=mod.bl_info['name'],
+            description=mod.bl_info.get('description', ''),
+            update=gen_update(mod, use_prop_name),
+        )
+
+        __annotations__['show_expanded_' + mod_name] = BoolProperty()
+
     def draw(self, context):
         layout = self.layout
         split = layout.split(factor=0.5, align=True)
@@ -259,29 +281,6 @@ class PieToolsPreferences(AddonPreferences):
                   icon="FILE_PARENT")
 
 
-for mod in sub_modules:
-    info = mod.bl_info
-    mod_name = mod.__name__.split('.')[-1]
-
-    def gen_update(mod):
-        def update(self, context):
-            if getattr(self, 'use_' + mod.__name__.split('.')[-1]):
-                if not mod.__addon_enabled__:
-                    register_submodule(mod)
-            else:
-                if mod.__addon_enabled__:
-                    unregister_submodule(mod)
-        return update
-
-    prop = BoolProperty(
-        name=info['name'],
-        description=info.get('description', ''),
-        update=gen_update(mod),
-    )
-    setattr(PieToolsPreferences, 'use_' + mod_name, prop)
-    prop = BoolProperty()
-    setattr(PieToolsPreferences, 'show_expanded_' + mod_name, prop)
-
 classes = (
     PieToolsPreferences,
 )
diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py
index 39315137..c59a7c97 100644
--- a/space_view3d_pie_menus/pie_align_menu.py
+++ b/space_view3d_pie_menus/pie_align_menu.py
@@ -23,7 +23,7 @@ bl_info = {
     "description": "V/E/F Align tools",
     "author": "pitiwazou, meta-androcto",
     "version": (0, 1, 2),
-    "blender": (2, 77, 0),
+    "blender": (2, 80, 0),
     "location": "Mesh Edit Mode",
     "warning": "",
     "wiki_url": "",
@@ -68,7 +68,7 @@ class PieAlign(Menu):
         box = pie.split().box().column()
 
         row = box.row(align=True)
-        row.label("X")
+        row.label(text="X")
         align_1 = row.operator("alignxyz.all", text="Neg")
         align_1.axis = '0'
         align_1.side = 'NEGATIVE'
@@ -77,7 +77,7 @@ class PieAlign(Menu):
         align_2.side = 'POSITIVE'
 
         row = box.row(align=True)
-        row.label("Y")
+        row.label(text="Y")
         align_3 = row.operator("alignxyz.all", text="Neg")
         align_3.axis = '1'
         align_3.side = 'NEGATIVE'
@@ -86,7 +86,7 @@ class PieAlign(Menu):
         align_4.side = 'POSITIVE'
 
         row = box.row(align=True)
-        row.label("Z")
+        row.label(text="Z")
         align_5 = row.operator("alignxyz.all", text="Neg")
         align_5.axis = '2'
         align_5.side = 'NEGATIVE'
diff --git a/space_view3d_pie_menus/pie_animation_menu.py b/space_view3d_pie_menus/pie_animation_menu.py
index d65891f9..774aa8e0 100644
--- a/space_view3d_pie_menus/pie_animation_menu.py
+++ b/space_view3d_pie_menus/pie_animation_menu.py
@@ -23,7 +23,7 @@ bl_info = {
     "description": "Pie menu for Timeline controls",
     "author": "pitiwazou, meta-androcto",
     "version": (0, 1, 1),
-    "blender": (2, 77, 0),
+    "blender": (2, 80, 0),
     "location": "3D View",
     "warning": "",
     "wiki_url": "",
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu.py b/space_view3d_pie_menus/pie_apply_transform_menu.py
index 268ee550..a92920db 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu.py
@@ -23,7 +23,7 @@ bl_info = {
     "description": "Apply Transform Menu",
     "author": "pitiwazou, meta-androcto",
     "version": (0, 1, 1),
-    "blender": (2, 77, 0),
+    "blender": (2, 80, 0),
     "location": "3D View",
     "warning": "",
     "wiki_url": "",
@@ -49,15 +49,15 @@ class PieApplyTransforms(Menu):
         # 4 - LEFT
         pie.operator("apply.transformall", text="Apply All", icon='FREEZE')
         # 6 - RIGHT
-        pie.operator("clear.all", text="Clear All", icon='MANIPUL')
+        pie.operator("clear.all", text="Clear All", icon='NONE')
         # 2 - BOTTOM
         pie.operator("object.duplicates_make_real", text="Make Duplicates Real")
         # 8 - TOP
-        pie.operator("apply.transformlocrotscale", text="Rotation", icon='MAN_ROT').option = 'ROT'
+        pie.operator("apply.transformlocrotscale", text="Rotation", icon='NONE').option = 'ROT'
         # 7 - TOP - LEFT
-        pie.operator("apply.transformlocrotscale", text="Location", icon='MAN_ROT').option = 'LOC'
+        pie.operator("apply.transformlocrotscale", text="Location", icon='NONE').option = 'LOC'
         # 9 - TOP - RIGHT
-        pie.operator("apply.transformlocrotscale", text="Scale", icon='MAN_ROT').option = 'SCALE'
+        pie.operator("apply.transformlocrotscale", text="Scale", icon='NONE').option = 'SCALE'
         # 1 - BOTTOM - LEFT
         pie.operator("object.visual_transform_apply", text="Visual Transforms")
         # 3 - BOTTOM - RIGHT
@@ -109,10 +109,10 @@ class ClearMenu(Menu):
 
     def draw(self, context):
         layout = self.layout
-        layout.operator("object.location_clear", text="Clear Location", icon='MAN_TRANS')
-        layout.operator("object.rotation_clear", text="Clear Rotation", icon='MAN_ROT')
-        layout.operator("object.scale_clear", text="Clear Scale", icon='MAN_SCALE')
-        layout.operator("object.origin_clear", text="Clear Origin", icon='MANIPUL')
+        layout.operator("object.location_clear", text="Clear Location", icon='NONE')
+        layout.operator("object.rotation_clear", text="Clear Rotation", icon='NONE')
+        layout.operator("object.scale_clear", text="Clear Scale", icon='NONE')
+        layout.operator("object.origin_clear", text="Clear Origin", icon='NONE')
 
 
 # Clear all
diff --git a/space_view3d_pie_menus/pie_cursor.py b/space_view3d_pie_menus/pie_cursor.py
index 80ef0c41..337c0c12 100644
--- a/space_view3d_pie_menus/pie_cursor.py
+++ b/space_view3d_pie_menus/pie_cursor.py
@@ -23,7 +23,7 @@ bl_info = {
     "description": "Cursor Menu",
     "author": "pitiwazou, meta-androcto",
     "version": (0, 1, 0),
-    "blender": (2, 77, 0),
+    "blender": (2, 80, 0),
     "location": "3D View",
     "warning": "",
     "wiki_url": "",
@@ -69,16 +69,16 @@ class Snap_CursorMenu(Menu):
                      icon='CLIPUV_HLT').use_offset = False
         # 6 - RIGHT
         pie.operator("view3d.snap_selected_to_cursor",
-                    text="Selection to Cursor (Keep Offset)", icon='CURSOR').use_offset = True
+                    text="Selection to Cursor (Keep Offset)", icon='PIVOT_CURSOR').use_offset = True
         # 2 - BOTTOM
         pie.operator("view3d.snap_cursor_selected_to_center1",
-                    text="Selected & Cursor to World Origin", icon='ALIGN')
+                    text="Selected & Cursor to Center", icon='NONE')
         # 8 - TOP
         pie.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CLIPUV_DEHLT')
         # 7 - TOP - LEFT
-        pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='ROTACTIVE')
+        pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='NONE')
         # 9 - TOP - RIGHT
-        pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='BBOX')
+        pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='NONE')
         # 1 - BOTTOM - LEFT
         pie.operator("view3d.snap_selected_to_grid", text="Selection to Grid", icon='GRID')
         # 3 - BOTTOM - RIGHT
diff --git a/space_view3d_pie_menus/pie_delete_menu.py b/space_view3d_pie_menus/pie_delete_menu.py
index 4a8e002c..0632877e 100644
--- a/space_view3d_pie_menus/pie_delete_menu.py
+++ b/space_view3d_pie_menus/pie_delete_menu.py
@@ -23,7 +23,7 @@ bl_info = {
     "description": "Edit mode V/E/F Delete Modes",
     "author": "pitiwazou, meta-androcto",
     "version": (0, 1, 0),
-    "blender": (2, 77, 0),
+    "blender": (2, 80, 0),
     "location": "Mesh Edit Mode",
     "warning": "",
     "wiki_url": "",
@@ -57,13 +57,13 @@ class PieDelete(Menu):
         # 1 - BOTTOM - LEFT
         box = pie.split().column()
         box.operator("mesh.dissolve_limited", text="Limited Dissolve", icon='STICKY_UVS_LOC')
-        box.operator("mesh.delete_edgeloop", text="Delete Edge Loops", icon='BORDER_LASSO')
+        box.operator("mesh.delete_edgeloop", text="Delete Edge Loops", icon='NONE')
         box.operator("mesh.edge_collapse", text="Edge Collapse", icon='UV_EDGESEL')
         # 3 - BOTTOM - RIGHT
         box = pie.split().column()
-        box.operator("mesh.delete", text="Only Edge & Faces", icon='SPACE2').type = 'EDGE_FACE'
+        box.operator("mesh.d

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list