[Bf-extensions-cvs] [a5d1a43] master: Dynamic Toolshelf Menu: Replace removed icons, cleanup
lijenstina
noreply at git.blender.org
Sat Nov 26 11:43:10 CET 2016
Commit: a5d1a43d0cc550f549f21a2ebfab8afa991e6058
Author: lijenstina
Date: Sat Nov 26 11:41:56 2016 +0100
Branches: master
https://developer.blender.org/rBACa5d1a43d0cc550f549f21a2ebfab8afa991e6058
Dynamic Toolshelf Menu: Replace removed icons, cleanup
Replace the removed EDIT_VEC icon
Pep8 cleanup
Remove the * import from bpy
===================================================================
M space_view3d_toolshelf_menu.py
===================================================================
diff --git a/space_view3d_toolshelf_menu.py b/space_view3d_toolshelf_menu.py
index 8da63d1..4aa6495 100644
--- a/space_view3d_toolshelf_menu.py
+++ b/space_view3d_toolshelf_menu.py
@@ -15,8 +15,8 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
-# some parts based on 3d_cursor_menu.py by Jonathan Smith (JayDez) & work by sim88 & sam.
-# view3d_advanced_dynamic_toolshelf_menu byBrendon Murphy (meta-androcto)
+# some parts based on 3d_cursor_menu.py by Jonathan Smith (JayDez) & work by sim88 & sam.
+# view3d_advanced_dynamic_toolshelf_menu by Brendon Murphy (meta-androcto)
bl_info = {
"name": "Dynamic Toolshelf Menu",
@@ -26,20 +26,27 @@ bl_info = {
"location": "View3D > Spacebar Key, Dynamic Tab",
"description": "Context Sensitive Toolshelf Menu",
"warning": "",
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+ "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
"Scripts/3D_interaction/Dynamic_Spacebar_Menu",
"tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
"category": "3D View",
}
import bpy
-from bpy import *
+from bpy.types import (
+ Menu,
+ Operator,
+ Panel,
+ AddonPreferences,
+ )
+
class View3DPanel():
bl_space_type = 'VIEW_3D'
bl_region_type = 'TOOLS'
-class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
+
+class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
bl_label = "Dynamic Toolshelf"
bl_category = "Dynamic"
@@ -85,14 +92,14 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
layout.menu("VIEW3D_MT_SelectMenu", icon='RESTRICT_SELECT_OFF')
# Toolshelf block
- layout.operator("view3d.toolshelf", text= 'hide toolshelf', icon='MENU_PANEL')
+ layout.operator("view3d.toolshelf", text="Tool Shelf", icon='MENU_PANEL')
# Properties block
layout.operator("view3d.properties", icon='MENU_PANEL')
- #TODO: Add if statement to test whether editmode switch needs to
- #be added to the menu, since certain object can't enter edit mode
- #In which case we don't need the toggle
+ # TODO: Add if statement to test whether editmode switch needs to
+ # be added to the menu, since certain object can't enter edit mode
+ # In which case we don't need the toggle
# Toggle Editmode
layout.operator("object.editmode_toggle", text="Enter Edit Mode",
icon='EDITMODE_HLT')
@@ -101,7 +108,6 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
layout.operator("object.delete", text="Delete Object",
icon='CANCEL')
-
elif ob.mode == 'EDIT_MESH':
# Edit mode
@@ -135,12 +141,12 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
layout.menu("VIEW3D_MT_edit_multi", icon='VERTEXSEL')
# Extrude block
- layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='EDIT_VEC')
+ layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='MOD_WIREFRAME')
# Tools block
layout.menu("VIEW3D_MT_edit_mesh_specials", icon='MODIFIER')
- # UV Map block
+ # UV Map block
layout.menu("VIEW3D_MT_uv_map", icon='MOD_UVPROJECT')
# Select block
@@ -195,9 +201,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
icon='MODIFIER')
# Select Curve Block
- #Could use: VIEW3D_MT_select_edit_curve
- #Which is the default, instead of a hand written one, left it alone
- #for now though.
+ # Could use: VIEW3D_MT_select_edit_curve
+ # Which is the default, instead of a hand written one, left it alone
+ # for now though.
layout.menu("VIEW3D_MT_SelectCurveMenu",
icon='RESTRICT_SELECT_OFF')
@@ -251,7 +257,6 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
# Toolshelf block
layout.operator("view3d.toolshelf", icon='MENU_PANEL')
-
# Properties block
layout.operator("view3d.properties", icon='MENU_PANEL')
@@ -266,12 +271,12 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
if ob.mode == 'EDIT_METABALL':
# Metaball menu
- #Search Menu
+ # Search Menu
layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
layout.separator()
# Add block
- #layout.menu("INFO_MT_metaball_add", text="Add Metaball",
+ # layout.menu("INFO_MT_metaball_add", text="Add Metaball",
# icon='OUTLINER_OB_META')
layout.operator_menu_enum("object.metaball_add", "type",
text="Add Metaball",
@@ -292,7 +297,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
layout.prop_menu_enum(settings, "proportional_edit_falloff",
icon="SMOOTHCURVE")
- #Select Metaball
+ # Select Metaball
layout.menu("VIEW3D_MT_SelectMetaball", icon='RESTRICT_SELECT_OFF')
# Toolshelf block
@@ -312,7 +317,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
elif ob.mode == 'EDIT_LATTICE':
# Lattice menu
- #Search Menu
+ # Search Menu
layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
layout.separator()
@@ -327,12 +332,12 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
# Proportional block
layout.prop_menu_enum(settings, "proportional_edit",
- icon= "PROP_CON")
+ icon="PROP_CON")
layout.prop_menu_enum(settings, "proportional_edit_falloff",
- icon= "SMOOTHCURVE")
+ icon="SMOOTHCURVE")
layout.operator("lattice.make_regular")
- #Select Lattice
+ # Select Lattice
layout.menu("VIEW3D_MT_select_edit_lattice",
icon='RESTRICT_SELECT_OFF')
@@ -347,13 +352,13 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
icon='OBJECT_DATA')
# Delete block - Can't delete any lattice stuff so not needed
- #layout.operator("object.delete", text="Delete Object",
+ # layout.operator("object.delete", text="Delete Object",
# icon='CANCEL')
- if context.mode == 'PARTICLE':
+ if context.mode == 'PARTICLE':
# Particle menu
- #Search Menu
+ # Search Menu
layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
layout.separator()
@@ -368,14 +373,14 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
# Proportional block
layout.prop_menu_enum(settings, "proportional_edit",
- icon= "PROP_CON")
+ icon="PROP_CON")
layout.prop_menu_enum(settings, "proportional_edit_falloff",
- icon= "SMOOTHCURVE")
+ icon="SMOOTHCURVE")
# Particle block
layout.menu("VIEW3D_MT_particle", icon='PARTICLEMODE')
- #Select Particle
+ # Select Particle
layout.menu("VIEW3D_MT_select_particle",
icon='RESTRICT_SELECT_OFF')
@@ -638,9 +643,10 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel,bpy.types.Panel):
icon='EDITMODE_HLT')
layout.operator("object.mode_set", text="Enter Object Mode",
- icon='OBJECT_DATA').mode='OBJECT'
+ icon='OBJECT_DATA').mode = 'OBJECT'
+
-class VIEW3D_MT_AddMenu(bpy.types.Menu):
+class VIEW3D_MT_AddMenu(Menu):
bl_label = "Add Object Menu"
def draw(self, context):
@@ -682,7 +688,7 @@ class VIEW3D_MT_AddMenu(bpy.types.Menu):
icon='OUTLINER_OB_EMPTY')
-class VIEW3D_MT_TransformMenu(bpy.types.Menu):
+class VIEW3D_MT_TransformMenu(Menu):
bl_label = "Transform Menu"
# TODO: get rid of the custom text strings?
@@ -720,7 +726,7 @@ class VIEW3D_MT_TransformMenu(bpy.types.Menu):
text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR'
-class VIEW3D_MT_MirrorMenu(bpy.types.Menu):
+class VIEW3D_MT_MirrorMenu(Menu):
bl_label = "Mirror Menu"
def draw(self, context):
@@ -759,7 +765,8 @@ class VIEW3D_MT_MirrorMenu(bpy.types.Menu):
layout.operator("object.vertex_group_mirror")
-class VIEW3D_MT_ParentMenu(bpy.types.Menu):
+
+class VIEW3D_MT_ParentMenu(Menu):
bl_label = "Parent Menu"
def draw(self, context):
@@ -768,7 +775,8 @@ class VIEW3D_MT_ParentMenu(bpy.types.Menu):
layout.operator("object.parent_set", text="Set")
layout.operator("object.parent_clear", text="Clear")
-class VIEW3D_MT_GroupMenu(bpy.types.Menu):
+
+class VIEW3D_MT_GroupMenu(Menu):
bl_label = "Group Menu"
def draw(self, context):
@@ -781,7 +789,8 @@ class VIEW3D_MT_GroupMenu(bpy.types.Menu):
layout.operator("group.objects_add_active")
layout.operator("group.objects_remove_active")
-class VIEW3D_MT_AlignMenu(bpy.types.Menu):
+
+class VIEW3D_MT_AlignMenu(Menu):
bl_label = "Align Menu"
def draw(self, context):
@@ -797,7 +806,8 @@ class VIEW3D_MT_AlignMenu(bpy.types.Menu):
layout.operator("view3d.view_selected")
layout.operator("view3d.view_center_cursor")
-class VIEW3D_MT_SelectMenu(bpy.types.Menu):
+
+class VIEW3D_MT_SelectMenu(Menu):
bl_label = "Select Menu"
def draw(self, context):
@@ -824,7 +834,8 @@ class VIEW3D_MT_SelectMenu(bpy.types.Menu):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list