diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_sequencer.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 93 |
1 files changed, 75 insertions, 18 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 5bf095dc6b5..233145819e7 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -180,6 +180,7 @@ class SEQUENCER_MT_view(Menu): layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("sequencer.view_all", text="View all Sequences") layout.operator("sequencer.view_selected") + layout.operator("sequencer.view_frame") layout.operator_context = 'INVOKE_DEFAULT' if is_preview: layout.operator_context = 'INVOKE_REGION_PREVIEW' @@ -267,12 +268,23 @@ class SEQUENCER_MT_change(Menu): def draw(self, context): layout = self.layout + strip = act_strip(context) layout.operator_context = 'INVOKE_REGION_WIN' layout.operator_menu_enum("sequencer.change_effect_input", "swap") layout.operator_menu_enum("sequencer.change_effect_type", "type") - layout.operator("sequencer.change_path", text="Path/Files") + prop = layout.operator("sequencer.change_path", text="Path/Files") + + if strip: + stype = strip.type + + if stype == 'IMAGE': + prop.filter_image = True + elif stype == 'MOVIE': + prop.filter_movie = True + elif stype == 'SOUND': + prop.filter_sound = True class SEQUENCER_MT_frame(Menu): @@ -284,6 +296,24 @@ class SEQUENCER_MT_frame(Menu): layout.operator("anim.previewrange_clear") layout.operator("anim.previewrange_set") + layout.separator() + + props = layout.operator("sequencer.strip_jump", text="Jump to Previous Strip") + props.next = False + props.center = False + props = layout.operator("sequencer.strip_jump", text="Jump to Next Strip") + props.next = True + props.center = False + + layout.separator() + + props = layout.operator("sequencer.strip_jump", text="Jump to Previous Strip (Center)") + props.next = False + props.center = True + props = layout.operator("sequencer.strip_jump", text="Jump to Next Strip (Center)") + props.next = True + props.center = True + class SEQUENCER_MT_add(Menu): bl_label = "Add" @@ -551,6 +581,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if strip.input_count > 0: col = layout.column() + col.enabled = False col.prop(strip, "input_1") if strip.input_count > 1: col.prop(strip, "input_2") @@ -654,7 +685,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): elif strip.type == 'GAUSSIAN_BLUR': col.prop(strip, "size_x") col.prop(strip, "size_y") - + class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): bl_label = "Strip Input" @@ -699,7 +730,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): layout.prop(strip.colorspace_settings, "name") layout.prop(strip, "alpha_mode") - layout.operator("sequencer.change_path") + layout.operator("sequencer.change_path").filter_image = True elif seq_type == 'MOVIE': split = layout.split(percentage=0.2) @@ -771,13 +802,10 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): strip = act_strip(context) sound = strip.sound - # TODO: add support to handle SOUND datablock in sequencer soundstrips... For now, hide this useless thing! - # layout.template_ID(strip, "sound", open="sound.open") - - # layout.separator() - layout.prop(strip, "filepath", text="") - + layout.template_ID(strip, "sound", open="sound.open") if sound is not None: + layout.prop(sound, "filepath", text="") + row = layout.row() if sound.packed_file: row.operator("sound.unpack", icon='PACKAGE', text="Unpack") @@ -786,6 +814,8 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): row.prop(sound, "use_memory_cache") + layout.prop(sound, "use_mono") + if st.waveform_draw_type == 'DEFAULT_WAVEFORMS': layout.prop(strip, "show_waveform") @@ -826,15 +856,25 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): layout.template_ID(strip, "scene") scene = strip.scene + layout.prop(strip, "use_sequence") - layout.label(text="Camera Override") - layout.template_ID(strip, "scene_camera") + if not strip.use_sequence: + layout.label(text="Camera Override") + layout.template_ID(strip, "scene_camera") - layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil") + layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil") if scene: layout.prop(scene, "audio_volume", text="Audio Volume") + if not strip.use_sequence: + if scene: + # Warning, this is not a good convention to follow. + # Expose here because setting the alpha from the 'Render' menu is very inconvenient. + layout.label("Preview") + layout.prop(scene.render, "alpha_mode") + + if scene: sta = scene.frame_start end = scene.frame_end layout.label(text=iface_("Original frame range: %d-%d (%d)") % (sta, end, end - sta + 1), translate=False) @@ -965,11 +1005,11 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): if proxy.use_proxy_custom_file: flow.prop(proxy, "filepath") - row = layout.row() - row.prop(strip.proxy, "build_25") - row.prop(strip.proxy, "build_50") - row.prop(strip.proxy, "build_75") - row.prop(strip.proxy, "build_100") + row = layout.row(align=True) + row.prop(strip.proxy, "build_25", toggle=True) + row.prop(strip.proxy, "build_50", toggle=True) + row.prop(strip.proxy, "build_75", toggle=True) + row.prop(strip.proxy, "build_100", toggle=True) layout.prop(proxy, "use_overwrite") @@ -999,7 +1039,7 @@ class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, Panel): render = context.scene.render col = layout.column() - col.prop(render, "use_sequencer_gl_preview", text="Open GL Preview") + col.prop(render, "use_sequencer_gl_preview", text="OpenGL Preview") col = layout.column() #col.active = render.use_sequencer_gl_preview col.prop(render, "sequencer_gl_preview", text="") @@ -1099,6 +1139,8 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): box.prop_search(mod, "input_mask_strip", sequences_object, "sequences", text="Mask") else: box.prop(mod, "input_mask_id") + row = box.row() + row.prop(mod, "mask_time", expand=True) if mod.type == 'COLOR_BALANCE': box.prop(mod, "color_multiply") @@ -1111,6 +1153,21 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): col = box.column() col.prop(mod, "bright") col.prop(mod, "contrast") + elif mod.type == 'WHITE_BALANCE': + col = box.column() + col.prop(mod, "white_value") + elif mod.type == 'TONEMAP': + col = box.column() + col.prop(mod, "tonemap_type") + if mod.tonemap_type == 'RD_PHOTORECEPTOR': + col.prop(mod, "intensity") + col.prop(mod, "contrast") + col.prop(mod, "adaptation") + col.prop(mod, "correction") + elif mod.tonemap_type == 'RH_SIMPLE': + col.prop(mod, "key") + col.prop(mod, "offset") + col.prop(mod, "gamma") class SEQUENCER_PT_grease_pencil(GreasePencilDataPanel, SequencerButtonsPanel_Output, Panel): |