diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_sequencer.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 41c220f7ee4..4f317a97b38 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -244,6 +244,20 @@ class SEQUENCER_MT_preview_zoom(Menu): layout.operator_context = 'INVOKE_DEFAULT' +class SEQUENCER_MT_proxy(Menu): + bl_label = "Proxy" + + def draw(self, context): + layout = self.layout + + st = context.space_data + col = layout.column() + col.operator("sequencer.enable_proxies", text="Setup") + col.operator("sequencer.rebuild_proxy", text="Rebuild") + col.enabled = selected_sequences_len(context) >= 1 + layout.prop(st, "proxy_render_size", text="") + + class SEQUENCER_MT_view(Menu): bl_label = "View" @@ -291,6 +305,10 @@ class SEQUENCER_MT_view(Menu): layout.operator("view2d.zoom_border", text="Zoom") layout.menu("SEQUENCER_MT_preview_zoom") + layout.separator() + + layout.menu("SEQUENCER_MT_proxy") + layout.operator_context = 'INVOKE_DEFAULT' if is_sequencer_view: @@ -376,12 +394,15 @@ class SEQUENCER_MT_select_linked(Menu): layout.operator("sequencer.select_more", text="More") -class SEQUENCER_MT_select_playhead(Menu): - bl_label = "Select Playhead" +class SEQUENCER_MT_select_side_of_frame(Menu): + bl_label = "Side of Current Frame" def draw(self, _context): layout = self.layout + props = layout.operator("sequencer.select", text="Overlap") + props.left_right = 'OVERLAP' + props.linked_time = True props = layout.operator("sequencer.select", text="Left") props.left_right = 'LEFT' props.linked_time = True @@ -408,7 +429,7 @@ class SEQUENCER_MT_select(Menu): layout.separator() - layout.menu("SEQUENCER_MT_select_playhead", text="Playhead") + layout.menu("SEQUENCER_MT_select_side_of_frame") layout.menu("SEQUENCER_MT_select_handle", text="Handle") layout.menu("SEQUENCER_MT_select_channel", text="Channel") layout.menu("SEQUENCER_MT_select_linked", text="Linked") @@ -770,9 +791,6 @@ class SEQUENCER_MT_strip(Menu): layout.separator() layout.menu("SEQUENCER_MT_strip_input") - layout.separator() - layout.operator("sequencer.rebuild_proxy") - class SEQUENCER_MT_context_menu(Menu): bl_label = "Sequencer Context Menu" @@ -1042,7 +1060,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): strip_type = strip.type if strip_type == 'COLOR': - layout.prop(strip, "color") + layout.template_color_picker(strip, "color", value_slider=True, cubic=True) + layout.prop(strip, "color", text="") elif strip_type == 'WIPE': col = layout.column() @@ -1133,9 +1152,13 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): elif strip_type == 'TEXT': layout = self.layout - layout.use_property_split = False - layout.prop(strip, "text", text="") - layout.use_property_split = True + col = layout.column() + col.scale_x = 1.3 + col.scale_y = 1.3 + col.use_property_split = False + col.prop(strip, "text", text="") + col.use_property_split = True + layout.prop(strip, "wrap_width", text="Wrap Width") col = layout.column(align=True) if strip_type == 'SPEED': @@ -1172,9 +1195,8 @@ class SEQUENCER_PT_effect_text_layout(SequencerButtonsPanel, Panel): layout.use_property_split = True col = layout.column() col.prop(strip, "location", text="Location") - col.prop(strip, "align_x", text="Alignment X") + col.prop(strip, "align_x", text="Anchor X") col.prop(strip, "align_y", text="Y") - col.prop(strip, "wrap_width", text="Wrap Width") class SEQUENCER_PT_effect_text_style(SequencerButtonsPanel, Panel): @@ -1563,10 +1585,10 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.alignment = 'RIGHT' split.label(text="Playhead") split = split.split(factor=0.8 + max_factor, align=True) - playhead = frame_current - frame_final_start - split.label(text="{:>14}".format(smpte_from_frame(playhead))) + frame_display = frame_current - frame_final_start + split.label(text="{:>14}".format(smpte_from_frame(frame_display))) split.alignment = 'RIGHT' - split.label(text=str(playhead) + " ") + split.label(text=str(frame_display) + " ") if strip.type == 'SCENE': scene = strip.scene @@ -1664,7 +1686,7 @@ class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): return strip.type in { 'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'MASK', - 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', + 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'TEXT', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'MULTICAM', 'SPEED', 'ADJUSTMENT', 'COLORMIX' @@ -2198,7 +2220,8 @@ classes = ( SEQUENCER_MT_view_cache, SEQUENCER_MT_view_toggle, SEQUENCER_MT_preview_zoom, - SEQUENCER_MT_select_playhead, + SEQUENCER_MT_proxy, + SEQUENCER_MT_select_side_of_frame, SEQUENCER_MT_select_handle, SEQUENCER_MT_select_channel, SEQUENCER_MT_select_linked, |