Revision: 22406
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22406
Author: billrey
Date: 2009-08-12 16:39:57 +0200 (Wed, 12 Aug 2009)
Log Message:
-----------
Put back sequencer type icons, and moved the type menu, separating it from the
menus.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_sequencer.py
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
Modified: branches/blender2.5/blender/release/ui/space_sequencer.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_sequencer.py 2009-08-12
14:21:43 UTC (rev 22405)
+++ branches/blender2.5/blender/release/ui/space_sequencer.py 2009-08-12
14:39:57 UTC (rev 22406)
@@ -18,10 +18,9 @@
if context.area.show_menus:
row = layout.row()
+ row.itemR(st, "display_mode", text="")
row.itemM("SEQUENCER_MT_view")
- row.itemR(st, "display_mode")
-
layout.itemS()
if st.display_mode == 'SEQUENCER':
@@ -32,11 +31,11 @@
layout.itemS()
row.itemO("sequencer.reload")
else:
- row.itemR(st, "display_channel") # text="Chan"
+ row.itemR(st, "display_channel", text="
Channel")
class SEQUENCER_MT_view(bpy.types.Menu):
__space_type__ = "SEQUENCE_EDITOR"
- __label__ = "View (TODO)"
+ __label__ = "View"
def draw(self, context):
layout = self.layout
@@ -76,6 +75,7 @@
layout.itemO("sequencer.view_all")
layout.itemO("sequencer.view_selected")
layout.itemS()
+ layout.itemO("screen.screen_full_area", text="Toggle Full
Screen")
"""
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-08-12 14:21:43 UTC (rev 22405)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-08-12 14:39:57 UTC (rev 22406)
@@ -836,11 +836,11 @@
PropertyRNA *prop;
static EnumPropertyItem display_mode_items[] = {
- {SEQ_DRAW_SEQUENCE, "SEQUENCER", 0, "Sequencer", ""},
- {SEQ_DRAW_IMG_IMBUF, "IMAGE", 0, "Image Preview", ""},
- {SEQ_DRAW_IMG_WAVEFORM, "WAVEFORM", 0, "Luma Waveform", ""},
- {SEQ_DRAW_IMG_VECTORSCOPE, "VECTOR_SCOPE", 0, "Chroma
Vectorscope", ""},
- {SEQ_DRAW_IMG_HISTOGRAM, "HISTOGRAM", 0, "Histogram", ""},
+ {SEQ_DRAW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER,
"Sequencer", ""},
+ {SEQ_DRAW_IMG_IMBUF, "IMAGE", ICON_SEQ_PREVIEW, "Image
Preview", ""},
+ {SEQ_DRAW_IMG_WAVEFORM, "WAVEFORM", ICON_SEQ_LUMA_WAVEFORM,
"Luma Waveform", ""},
+ {SEQ_DRAW_IMG_VECTORSCOPE, "VECTOR_SCOPE",
ICON_SEQ_CHROMA_SCOPE, "Chroma Vectorscope", ""},
+ {SEQ_DRAW_IMG_HISTOGRAM, "HISTOGRAM", ICON_SEQ_HISTOGRAM,
"Histogram", ""},
{0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "SpaceSequenceEditor", "Space");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
