diff options
| author | William Reynish <william@reynish.com> | 2009-08-12 18:39:57 +0400 |
|---|---|---|
| committer | William Reynish <william@reynish.com> | 2009-08-12 18:39:57 +0400 |
| commit | 7ca23e0ef6dde05b94b4d026dc035f195f499304 (patch) | |
| tree | 741730ca5e5df347e03ddea5e2f01c3baa7d66b9 | |
| parent | 7ffbaa6631c459037923cb840bedfc99a211206e (diff) | |
Put back sequencer type icons, and moved the type menu, separating it from the menus.
| -rw-r--r-- | release/ui/space_sequencer.py | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py index cdb5337ef88..94f9685cd09 100644 --- a/release/ui/space_sequencer.py +++ b/release/ui/space_sequencer.py @@ -18,10 +18,9 @@ class SEQUENCER_HT_header(bpy.types.Header): 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 @@ class SEQUENCER_HT_header(bpy.types.Header): 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 @@ class SEQUENCER_MT_view(bpy.types.Menu): layout.itemO("sequencer.view_all") layout.itemO("sequencer.view_selected") layout.itemS() + layout.itemO("screen.screen_full_area", text="Toggle Full Screen") """ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d287261549c..1d9fac9cbb2 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -836,11 +836,11 @@ static void rna_def_space_sequencer(BlenderRNA *brna) 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"); |