[Bf-blender-cvs] [0d085790d13] blender2.8: Python / Cleanup: rename INFO_MT to TOPBAR_MT/VIEW3D_MT to reflect actual location.
Brecht Van Lommel
noreply at git.blender.org
Wed Aug 29 16:27:40 CEST 2018
Commit: 0d085790d13b2c261210addb12fabc1fea82bdef
Author: Brecht Van Lommel
Date: Wed Aug 29 15:02:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0d085790d13b2c261210addb12fabc1fea82bdef
Python / Cleanup: rename INFO_MT to TOPBAR_MT/VIEW3D_MT to reflect actual location.
===================================================================
M doc/python_api/examples/bpy.types.Menu.2.py
M doc/python_api/examples/bpy.types.Operator.2.py
M release/scripts/presets/keyconfig/3dsmax.py
M release/scripts/presets/keyconfig/blender_27x.py
M release/scripts/presets/keyconfig/maya.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/templates_py/addon_add_object.py
M release/scripts/templates_py/operator_file_export.py
M release/scripts/templates_py/operator_file_import.py
M release/scripts/templates_py/operator_mesh_add.py
M source/blender/editors/armature/armature_ops.c
M source/blender/editors/curve/curve_ops.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/space_info/space_info.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/doc/python_api/examples/bpy.types.Menu.2.py b/doc/python_api/examples/bpy.types.Menu.2.py
index a1cce0c3ce2..fbdf747d472 100644
--- a/doc/python_api/examples/bpy.types.Menu.2.py
+++ b/doc/python_api/examples/bpy.types.Menu.2.py
@@ -15,4 +15,4 @@ def menu_draw(self, context):
self.layout.operator("wm.save_homefile")
-bpy.types.INFO_MT_file.append(menu_draw)
+bpy.types.TOPBAR_MT_file.append(menu_draw)
diff --git a/doc/python_api/examples/bpy.types.Operator.2.py b/doc/python_api/examples/bpy.types.Operator.2.py
index d1f0edf15aa..901bd7b21f8 100644
--- a/doc/python_api/examples/bpy.types.Operator.2.py
+++ b/doc/python_api/examples/bpy.types.Operator.2.py
@@ -45,7 +45,7 @@ def menu_func(self, context):
# Register and add to the file selector
bpy.utils.register_class(ExportSomeData)
-bpy.types.INFO_MT_file_export.append(menu_func)
+bpy.types.TOPBAR_MT_file_export.append(menu_func)
# test call
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py
index 8bce68a0a30..fa5d40b1868 100644
--- a/release/scripts/presets/keyconfig/3dsmax.py
+++ b/release/scripts/presets/keyconfig/3dsmax.py
@@ -11,7 +11,7 @@ kmi = km.keymap_items.new('wm.window_new', 'W', 'PRESS', ctrl=True, alt=True)
kmi = km.keymap_items.new('wm.read_homefile', 'N', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.save_homefile', 'U', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True)
-kmi.properties.name = 'INFO_MT_file_open_recent'
+kmi.properties.name = 'TOPBAR_MT_file_open_recent'
kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS')
kmi = km.keymap_items.new('wm.link', 'O', 'PRESS', ctrl=True, alt=True)
@@ -214,7 +214,7 @@ km = kc.keymaps.new('Pose', space_type='EMPTY', region_type='WINDOW', modal=Fals
kmi = km.keymap_items.new('object.parent_set', 'P', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_add'
+kmi.properties.name = 'VIEW3D_MT_add'
kmi = km.keymap_items.new('pose.hide', 'H', 'PRESS')
kmi.properties.unselected = False
kmi = km.keymap_items.new('pose.hide', 'H', 'PRESS', shift=True)
@@ -333,7 +333,7 @@ kmi = km.keymap_items.new('object.delete', 'DEL', 'PRESS')
kmi = km.keymap_items.new('object.delete', 'DEL', 'PRESS', shift=True)
kmi.properties.use_global = True
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_add'
+kmi.properties.name = 'VIEW3D_MT_add'
kmi = km.keymap_items.new('object.duplicates_make_real', 'A', 'PRESS', shift=True, ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True, ctrl=True)
kmi.properties.name = 'VIEW3D_MT_object_apply'
@@ -2157,7 +2157,7 @@ kmi = km.keymap_items.new('transform.shrink_fatten', 'S', 'PRESS', alt=True)
kmi = km.keymap_items.new('mesh.edge_face_add', 'F', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('mesh.duplicate_move', 'D', 'PRESS', shift=True)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_mesh_add'
+kmi.properties.name = 'VIEW3D_MT_mesh_add'
kmi = km.keymap_items.new('mesh.separate', 'P', 'PRESS')
kmi = km.keymap_items.new('mesh.split', 'Y', 'PRESS')
kmi = km.keymap_items.new('mesh.vert_connect', 'J', 'PRESS')
@@ -2227,7 +2227,7 @@ kmi.properties.value = '(False,False,True)'
km = kc.keymaps.new('Curve', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_edit_curve_add'
+kmi.properties.name = 'TOPBAR_MT_edit_curve_add'
kmi = km.keymap_items.new('curve.handle_type_set', 'V', 'PRESS')
kmi = km.keymap_items.new('curve.vertex_add', 'LEFTMOUSE', 'CLICK', ctrl=True)
kmi = km.keymap_items.new('curve.select_all', 'LEFTMOUSE', 'CLICK')
diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py
index c71b7456cff..cf736e1a5a5 100644
--- a/release/scripts/presets/keyconfig/blender_27x.py
+++ b/release/scripts/presets/keyconfig/blender_27x.py
@@ -8,7 +8,7 @@ keyconfig_data = \
("wm.call_menu",
{"type": 'O', "value": 'PRESS', "shift": True, "ctrl": True},
{"properties":
- [("name", 'INFO_MT_file_open_recent'),
+ [("name", 'TOPBAR_MT_file_open_recent'),
],
},
),
@@ -1020,7 +1020,7 @@ keyconfig_data = \
("wm.call_menu",
{"type": 'A', "value": 'PRESS', "shift": True},
{"properties":
- [("name", 'INFO_MT_add'),
+ [("name", 'VIEW3D_MT_add'),
],
},
),
@@ -1321,7 +1321,7 @@ keyconfig_data = \
("wm.call_menu",
{"type": 'A', "value": 'PRESS', "shift": True},
{"properties":
- [("name", 'INFO_MT_add'),
+ [("name", 'VIEW3D_MT_add'),
],
},
),
@@ -1460,7 +1460,7 @@ keyconfig_data = \
[("wm.call_menu",
{"type": 'A', "value": 'PRESS', "shift": True},
{"properties":
- [("name", 'INFO_MT_edit_curve_add'),
+ [("name", 'TOPBAR_MT_edit_curve_add'),
],
},
),
@@ -3249,7 +3249,7 @@ keyconfig_data = \
("wm.call_menu",
{"type": 'A', "value": 'PRESS', "shift": True},
{"properties":
- [("name", 'INFO_MT_mesh_add'),
+ [("name", 'VIEW3D_MT_mesh_add'),
],
},
),
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index da1446f6f43..676ccb8bec3 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -12,7 +12,7 @@ kmi = km.keymap_items.new('wm.window_new', 'W', 'PRESS', ctrl=True, alt=True)
kmi = km.keymap_items.new('wm.read_homefile', 'N', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.save_homefile', 'U', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True)
-kmi.properties.name = 'INFO_MT_file_open_recent'
+kmi.properties.name = 'TOPBAR_MT_file_open_recent'
kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS')
kmi = km.keymap_items.new('wm.link', 'O', 'PRESS', ctrl=True, alt=True)
@@ -274,7 +274,7 @@ km = kc.keymaps.new('Pose', space_type='EMPTY', region_type='WINDOW', modal=Fals
kmi = km.keymap_items.new('object.parent_set', 'P', 'PRESS')
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_add'
+kmi.properties.name = 'VIEW3D_MT_add'
kmi = km.keymap_items.new('pose.hide', 'H', 'PRESS', ctrl=True)
kmi.properties.unselected = False
kmi = km.keymap_items.new('pose.hide', 'H', 'PRESS', alt=True)
@@ -383,7 +383,7 @@ kmi.properties.unselected = True
kmi = km.keymap_items.new('object.delete', 'BACK_SPACE', 'PRESS')
kmi = km.keymap_items.new('object.delete', 'DEL', 'PRESS')
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_add'
+kmi.properties.name = 'VIEW3D_MT_add'
kmi = km.keymap_items.new('object.duplicates_make_real', 'A', 'PRESS', shift=True, ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', ctrl=True, alt=True)
kmi.properties.name = 'VIEW3D_MT_object_apply'
@@ -650,7 +650,7 @@ kmi = km.keymap_items.new('mesh.merge', 'M', 'PRESS', alt=True)
kmi = km.keymap_items.new('mesh.edge_face_add', 'F', 'PRESS', alt=True)
kmi = km.keymap_items.new('mesh.duplicate_move', 'D', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_mesh_add'
+kmi.properties.name = 'VIEW3D_MT_mesh_add'
kmi = km.keymap_items.new('mesh.dupli_extrude_cursor', 'MIDDLEMOUSE', 'CLICK', ctrl=True)
kmi = km.keymap_items.new('wm.call_menu', 'BACK_SPACE', 'PRESS')
kmi.properties.name = 'VIEW3D_MT_edit_mesh_delete'
@@ -720,7 +720,7 @@ kmi = km.keymap_items.new_modal('CUT_THROUGH_TOGGLE', 'Z', 'PRESS')
km = kc.keymaps.new('Curve', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True)
-kmi.properties.name = 'INFO_MT_edit_curve_add'
+kmi.properties.name = 'TOPBAR_MT_edit_curve_add'
kmi = km.keymap_items.new('curve.handle_type_set', 'RIGHTMOUSE', 'PRESS')
kmi = km.keymap_items.new('curve.vertex_add', 'MIDDLEMOUSE', 'CLICK', ctrl=True)
kmi = km.keymap_items.new('curve.select_all', 'A', 'PRESS', ctrl=True)
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index cc3d92547e3..b6a68f06785 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -40,7 +40,7 @@ class TOPBAR_HT_upper_bar(Header):
layout.operator("wm.splash", text="", icon='BLENDER', emboss=False)
- INFO_MT_editor_menus.draw_collapsible(context, layout)
+ TOPBAR_MT_editor_menus.draw_collapsible(context, layout)
layout.separator()
@@ -262,8 +262,8 @@ class _draw_left_context_mode:
layout.prop(brush, "use_puff_volume")
-class INFO_MT_editor_menus(Menu):
- bl_idname = "INFO_MT_editor_menus"
+class TOPBAR_MT_editor_menus(Menu):
+ bl_idname = "TOPBAR_MT_editor_menus"
bl_label = ""
def draw(self, context):
@@ -271,16 +271,16 @@ class INFO_MT_editor_menus(Menu):
@staticmethod
def draw_menus(layout, context):
- layout.menu("INFO_MT_file")
- layout.menu("INFO_MT_edit")
+ layout.menu("TOPBAR_MT_file")
+ layout.menu("TOPBAR_MT_edit")
- layout.menu("INFO_MT_render")
+ layout.menu("TOPBAR_MT_render")
- layout.menu("INFO_MT_window")
- layout.menu("INFO_MT_help")
+ layout.menu("TOPBAR_MT_window")
+ layout.menu("TOPBAR_MT_help")
-class INFO_MT_file(Menu):
+class TOPBAR_MT_file(Menu):
bl_label = "File"
def draw(self, context):
@@ -289,7 +289,7 @@ class INFO_MT_file(Menu):
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.read_homefile", text="New", icon='NEW')
layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER')
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list