[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23724] trunk/blender: menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared.
Campbell Barton
ideasman42 at gmail.com
Thu Oct 8 21:06:33 CEST 2009
Revision: 23724
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23724
Author: campbellbarton
Date: 2009-10-08 21:06:32 +0200 (Thu, 08 Oct 2009)
Log Message:
-----------
menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_buttons.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_outliner.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/blenkernel/BKE_screen.h
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_intern.h
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/makesrna/intern/rna_ui.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_window.h
Modified: trunk/blender/release/scripts/ui/space_buttons.py
===================================================================
--- trunk/blender/release/scripts/ui/space_buttons.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_buttons.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -22,7 +22,6 @@
row.itemR(scene, "current_frame")
class Buttons_MT_view(bpy.types.Menu):
- __space_type__ = 'PROPERTIES'
__label__ = "View"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_console.py
===================================================================
--- trunk/blender/release/scripts/ui/space_console.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_console.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -38,7 +38,6 @@
row.itemO("console.autocomplete", text="Autocomplete")
class CONSOLE_MT_console(bpy.types.Menu):
- __space_type__ = 'CONSOLE'
__label__ = "Console"
def draw(self, context):
@@ -51,7 +50,6 @@
layout.itemO("console.paste")
class CONSOLE_MT_report(bpy.types.Menu):
- __space_type__ = 'CONSOLE'
__label__ = "Report"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_image.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -2,7 +2,6 @@
import bpy
class IMAGE_MT_view(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "View"
def draw(self, context):
@@ -44,7 +43,6 @@
layout.itemO("screen.screen_full_area")
class IMAGE_MT_select(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Select"
def draw(self, context):
@@ -65,7 +63,6 @@
layout.itemO("uv.select_linked")
class IMAGE_MT_image(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Image"
def draw(self, context):
@@ -109,7 +106,6 @@
layout.itemR(sima, "image_painting")
class IMAGE_MT_uvs_showhide(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Show/Hide Faces"
def draw(self, context):
@@ -120,7 +116,6 @@
layout.item_booleanO("uv.hide", "unselected", True)
class IMAGE_MT_uvs_transform(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Transform"
def draw(self, context):
@@ -131,7 +126,6 @@
layout.itemO("tfm.resize")
class IMAGE_MT_uvs_mirror(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Mirror"
def draw(self, context):
@@ -145,7 +139,6 @@
props.constraint_axis[1]= True
class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Weld/Align"
def draw(self, context):
@@ -155,7 +148,6 @@
layout.items_enumO("uv.align", "axis") # W, 2/3/4
class IMAGE_MT_uvs(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "UVs"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_info.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -38,7 +38,6 @@
layout.itemL(text=scene.statistics())
class INFO_MT_file(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "File"
def draw(self, context):
@@ -78,7 +77,6 @@
layout.itemO("wm.exit_blender", text="Quit")
class INFO_MT_file_import(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Import"
def draw(self, context):
@@ -89,7 +87,6 @@
class INFO_MT_file_export(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Export"
def draw(self, context):
@@ -104,7 +101,6 @@
class INFO_MT_file_external_data(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "External Data"
def draw(self, context):
@@ -121,7 +117,6 @@
layout.itemO("file.find_missing_files")
class INFO_MT_add(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Add"
def draw(self, context):
@@ -151,7 +146,6 @@
layout.item_menu_enumO("object.effector_add", "type", 'EMPTY', text="Force Field", icon='ICON_OUTLINER_OB_EMPTY')
class INFO_MT_game(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Game"
def draw(self, context):
@@ -169,7 +163,6 @@
layout.itemR(gs, "deprecation_warnings")
class INFO_MT_render(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Render"
def draw(self, context):
@@ -185,7 +178,6 @@
layout.itemO("screen.render_view_show")
class INFO_MT_help(bpy.types.Menu):
- __space_type__ = 'INFO'
__label__ = "Help"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/ui/space_node.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_node.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -48,7 +48,6 @@
layout.itemR(snode, "backdrop")
class NODE_MT_view(bpy.types.Menu):
- __space_type__ = 'NODE_EDITOR'
__label__ = "View"
def draw(self, context):
@@ -66,7 +65,6 @@
layout.itemO("screen.screen_full_area")
class NODE_MT_select(bpy.types.Menu):
- __space_type__ = 'NODE_EDITOR'
__label__ = "Select"
def draw(self, context):
@@ -80,7 +78,6 @@
layout.itemO("node.select_linked_to")
class NODE_MT_node(bpy.types.Menu):
- __space_type__ = 'NODE_EDITOR'
__label__ = "Node"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_outliner.py
===================================================================
--- trunk/blender/release/scripts/ui/space_outliner.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_outliner.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -36,7 +36,6 @@
class OUTLINER_MT_view(bpy.types.Menu):
- __space_type__ = 'OUTLINER'
__label__ = "View"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -38,7 +38,6 @@
layout.itemR(st, "display_channel", text="Channel")
class SEQUENCER_MT_view(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "View"
def draw(self, context):
@@ -106,7 +105,6 @@
"""
class SEQUENCER_MT_select(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "Select"
def draw(self, context):
@@ -127,7 +125,6 @@
layout.itemO("sequencer.select_inverse")
class SEQUENCER_MT_marker(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "Marker (TODO)"
def draw(self, context):
@@ -146,7 +143,6 @@
#layout.itemO("sequencer.sound_strip_add", text="Transform Markers") # toggle, will be rna - (sseq->flag & SEQ_MARKER_TRANS)
class SEQUENCER_MT_add(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "Add"
def draw(self, context):
@@ -163,7 +159,6 @@
layout.itemM("SEQUENCER_MT_add_effect")
class SEQUENCER_MT_add_effect(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "Effect Strip..."
def draw(self, context):
@@ -187,7 +182,6 @@
layout.item_enumO("sequencer.effect_strip_add", 'type', 'SPEED')
class SEQUENCER_MT_strip(bpy.types.Menu):
- __space_type__ = 'SEQUENCE_EDITOR'
__label__ = "Strip"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_text.py
===================================================================
--- trunk/blender/release/scripts/ui/space_text.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_text.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -98,7 +98,6 @@
row.itemR(st, "find_all", text="All")
class TEXT_MT_text(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Text"
def draw(self, context):
@@ -140,7 +139,6 @@
#endif
class TEXT_MT_edit_view(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "View"
def draw(self, context):
@@ -150,7 +148,6 @@
layout.item_enumO("text.move", "type", 'FILE_BOTTOM', text="Bottom of File")
class TEXT_MT_edit_select(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Select"
def draw(self, context):
@@ -160,7 +157,6 @@
layout.itemO("text.select_line")
class TEXT_MT_edit_markers(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Markers"
def draw(self, context):
@@ -171,7 +167,6 @@
layout.itemO("text.previous_marker")
class TEXT_MT_format(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Format"
def draw(self, context):
@@ -190,7 +185,6 @@
layout.item_menu_enumO("text.convert_whitespace", "type")
class TEXT_MT_edit_to3d(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Text To 3D Object"
def draw(self, context):
@@ -200,7 +194,6 @@
layout.item_booleanO("text.to_3d_object", "split_lines", True, text="One Object Per Line");
class TEXT_MT_edit(bpy.types.Menu):
- __space_type__ = 'TEXT_EDITOR'
__label__ = "Edit"
def poll(self, context):
Modified: trunk/blender/release/scripts/ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/ui/space_time.py 2009-10-08 18:40:03 UTC (rev 23723)
+++ trunk/blender/release/scripts/ui/space_time.py 2009-10-08 19:06:32 UTC (rev 23724)
@@ -64,7 +64,6 @@
row.itemO("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT')
class TIME_MT_view(bpy.types.Menu):
- __space_type__ = 'TIMELINE'
__label__ = "View"
def draw(self, context):
@@ -79,7 +78,6 @@
layout.itemR(st, "only_selected")
class TIME_MT_frame(bpy.types.Menu):
- __space_type__ = 'TIMELINE'
__label__ = "Frame"
def draw(self, context):
@@ -104,7 +102,6 @@
sub.itemM("TIME_MT_autokey")
class TIME_MT_playback(bpy.types.Menu):
- __space_type__ = 'TIMELINE'
__label__ = "Playback"
def draw(self, context):
@@ -132,7 +129,6 @@
layout.itemR(scene, "scrub_audio")
class TIME_MT_autokey(bpy.types.Menu):
- __space_type__ = 'TIMELINE'
__label__ = "Auto-Keyframing Mode"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list