diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_sequencer.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 122 |
1 files changed, 57 insertions, 65 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 1164ff82e3c..3f92fce81f6 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -262,7 +262,7 @@ class SEQUENCER_MT_view(Menu): if st.view_type == 'PREVIEW': # Specifying the REGION_PREVIEW context is needed in preview-only # mode, else the lookup for the shortcut will fail in - # wm_keymap_item_find_props() (see #32595). + # wm_keymap_item_find_props() (see T32595). layout.operator_context = 'INVOKE_REGION_PREVIEW' layout.prop(st, "show_region_ui") layout.prop(st, "show_region_toolbar") @@ -949,54 +949,28 @@ class SEQUENCER_PT_strip(SequencerButtonsPanel, Panel): row.prop(strip, "mute", toggle=True, icon_only=True, emboss=False) -class SEQUENCER_PT_adjust_transform_offset(SequencerButtonsPanel, Panel): - bl_label = "Offset" - bl_parent_id = "SEQUENCER_PT_adjust_transform" +class SEQUENCER_PT_adjust_crop(SequencerButtonsPanel, Panel): + bl_label = "Crop" bl_options = {'DEFAULT_CLOSED'} bl_category = "Strip" @classmethod def poll(cls, context): - strip = act_strip(context) - return strip.type != 'SOUND' - - def draw_header(self, context): - strip = act_strip(context) - self.layout.prop(strip, "use_translation", text="") + if not cls.has_sequencer(context): + return False - def draw(self, context): strip = act_strip(context) - layout = self.layout - layout.use_property_split = True - - layout.active = strip.use_translation and (not strip.mute) - - col = layout.column(align=True) - col.prop(strip.transform, "offset_x", text="Position X") - col.prop(strip.transform, "offset_y", text="Y") - - -class SEQUENCER_PT_adjust_transform_crop(SequencerButtonsPanel, Panel): - bl_label = "Crop" - bl_parent_id = "SEQUENCER_PT_adjust_transform" - bl_options = {'DEFAULT_CLOSED'} - bl_category = "Strip" + if not strip: + return False - @classmethod - def poll(cls, context): strip = act_strip(context) return strip.type != 'SOUND' - def draw_header(self, context): - strip = act_strip(context) - self.layout.prop(strip, "use_crop", text="") - def draw(self, context): strip = act_strip(context) layout = self.layout layout.use_property_split = True - - layout.active = strip.use_crop and (not strip.mute) + layout.active = not strip.mute col = layout.column(align=True) col.prop(strip.crop, "min_x") @@ -1071,7 +1045,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): flow.prop(strip, "use_only_boost") elif strip_type == 'SPEED': - layout.prop(strip, "use_default_fade", text="Stretch to input strip length") + layout.prop(strip, "use_default_fade", text="Stretch to Input Strip Length") if not strip.use_default_fade: layout.prop(strip, "use_as_speed") if strip.use_as_speed: @@ -1113,7 +1087,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): # The multicam strip needs at least 2 strips to be useful if strip_channel > 2: BT_ROW = 4 - col.label(text=" Cut to") + col.label(text="Cut To") row = col.row() for i in range(1, strip_channel): @@ -1150,10 +1124,10 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): col = layout.column(align=True) if strip_type == 'SPEED': col.prop(strip, "multiply_speed") - col.prop(strip, "frame_interpolation_mode") + col.prop(strip, "use_frame_interpolate") elif strip_type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}: - col.prop(strip, "use_default_fade", text="Default fade") + col.prop(strip, "use_default_fade", text="Default Fade") if not strip.use_default_fade: col.prop(strip, "effect_fader", text="Effect Fader") elif strip_type == 'GAUSSIAN_BLUR': @@ -1214,6 +1188,21 @@ class SEQUENCER_PT_effect_text_style(SequencerButtonsPanel, Panel): subsub.prop(strip, "shadow_color", text="") row.prop_decorator(strip, "shadow_color") + row = layout.row(align=True, heading="Box") + row.use_property_decorate = False + sub = row.row(align=True) + sub.prop(strip, "use_box", text="") + subsub = sub.row(align=True) + subsub.active = strip.use_box and (not strip.mute) + subsub.prop(strip, "box_color", text="") + row.prop_decorator(strip, "box_color") + + row = layout.row(align=True, heading="Box Margin") + row.use_property_decorate = False + sub = row.row(align=True) + sub.prop(strip, "box_margin") + sub.active = strip.use_box and (not strip.mute) + class SEQUENCER_PT_source(SequencerButtonsPanel, Panel): bl_label = "Source" @@ -1590,21 +1579,19 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.label(text="%d-%d (%d)" % (sta, end, end - sta + 1), translate=False) -class SEQUENCER_PT_adjust(SequencerButtonsPanel, Panel): - bl_label = "Adjust" - bl_category = "Strip" - - def draw(self, context): - pass - - class SEQUENCER_PT_adjust_sound(SequencerButtonsPanel, Panel): bl_label = "Sound" - bl_parent_id = "SEQUENCER_PT_adjust" bl_category = "Strip" @classmethod def poll(cls, context): + if not cls.has_sequencer(context): + return False + + strip = act_strip(context) + if not strip: + return False + strip = act_strip(context) return strip.type == 'SOUND' @@ -1636,11 +1623,17 @@ class SEQUENCER_PT_adjust_sound(SequencerButtonsPanel, Panel): class SEQUENCER_PT_adjust_comp(SequencerButtonsPanel, Panel): bl_label = "Compositing" - bl_parent_id = "SEQUENCER_PT_adjust" bl_category = "Strip" @classmethod def poll(cls, context): + if not cls.has_sequencer(context): + return False + + strip = act_strip(context) + if not strip: + return False + strip = act_strip(context) return strip.type != 'SOUND' @@ -1659,8 +1652,8 @@ class SEQUENCER_PT_adjust_comp(SequencerButtonsPanel, Panel): class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): bl_label = "Transform" - bl_parent_id = "SEQUENCER_PT_adjust" bl_category = "Strip" + bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): @@ -1671,23 +1664,26 @@ class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): if not strip: return False - return strip.type in { - 'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'MASK', - 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'TEXT', - 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', - 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', - 'MULTICAM', 'SPEED', 'ADJUSTMENT', 'COLORMIX' - } + strip = act_strip(context) + return strip.type != 'SOUND' def draw(self, context): - layout = self.layout strip = act_strip(context) - + layout = self.layout layout.use_property_split = True - layout.use_property_decorate = False - layout.active = not strip.mute + col = layout.column(align=True) + col.prop(strip.transform, "offset_x", text="Position X") + col.prop(strip.transform, "offset_y", text="Y") + + col = layout.column(align=True) + col.prop(strip.transform, "scale_x", text="Scale X") + col.prop(strip.transform, "scale_y", text="Y") + + col = layout.column(align=True) + col.prop(strip.transform, "rotation", text="Rotation") + row = layout.row(heading="Mirror") sub = row.row(align=True) sub.prop(strip, "use_flip_x", text="X", toggle=True) @@ -1696,7 +1692,6 @@ class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): class SEQUENCER_PT_adjust_video(SequencerButtonsPanel, Panel): bl_label = "Video" - bl_parent_id = "SEQUENCER_PT_adjust" bl_options = {'DEFAULT_CLOSED'} bl_category = "Strip" @@ -1745,7 +1740,6 @@ class SEQUENCER_PT_adjust_video(SequencerButtonsPanel, Panel): class SEQUENCER_PT_adjust_color(SequencerButtonsPanel, Panel): bl_label = "Color" - bl_parent_id = "SEQUENCER_PT_adjust" bl_options = {'DEFAULT_CLOSED'} bl_category = "Strip" @@ -2234,11 +2228,9 @@ classes = ( SEQUENCER_PT_effect_text_style, SEQUENCER_PT_effect_text_layout, - SEQUENCER_PT_adjust, SEQUENCER_PT_adjust_comp, SEQUENCER_PT_adjust_transform, - SEQUENCER_PT_adjust_transform_offset, - SEQUENCER_PT_adjust_transform_crop, + SEQUENCER_PT_adjust_crop, SEQUENCER_PT_adjust_video, SEQUENCER_PT_adjust_color, SEQUENCER_PT_adjust_sound, |