diff options
author | Mal Duffin <mal_cando> | 2019-05-27 14:05:27 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-27 14:31:27 +0300 |
commit | 118ac491d2043cf3fc78cc99034b78666523b865 (patch) | |
tree | a6e4819b7e83ae21fde2bdcbf32f91b80e969209 /release | |
parent | af4feee61cefc2196f7be0f28f85c986d9082f4d (diff) |
Fix poor display of time codes in sequencer Info panel
Allow using : in labels inside buttons.
Differential Revision: https://developer.blender.org/D4944
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index dae7c13082f..62ae500d3a0 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1320,15 +1320,15 @@ class SEQUENCER_PT_info_timecodes(SequencerButtonsPanel, Panel): split = sub.split(factor=0.5 + max_factor) split.alignment = 'RIGHT' split.label(text="Start") - split.prop(strip, "frame_start", text=str(bpy.utils.smpte_from_frame(strip.frame_start)).replace(':', ' ')) + split.prop(strip, "frame_start", text=str(bpy.utils.smpte_from_frame(strip.frame_start))) split = sub.split(factor=0.5 + max_factor) split.alignment = 'RIGHT' split.label(text="End") - split.prop(strip, "frame_final_end", text=str(bpy.utils.smpte_from_frame(strip.frame_final_end)).replace(':', ' ')) + split.prop(strip, "frame_final_end", text=str(bpy.utils.smpte_from_frame(strip.frame_final_end))) split = sub.split(factor=0.5 + max_factor) split.alignment = 'RIGHT' split.label(text="Duration") - split.prop(strip, "frame_final_duration", text=str(bpy.utils.smpte_from_frame(strip.frame_final_duration)).replace(':', ' ')) + split.prop(strip, "frame_final_duration", text=str(bpy.utils.smpte_from_frame(strip.frame_final_duration))) if not isinstance(strip, bpy.types.EffectSequence): layout.alignment = 'RIGHT' @@ -1336,22 +1336,22 @@ class SEQUENCER_PT_info_timecodes(SequencerButtonsPanel, Panel): split = sub.split(factor=0.5 + max_factor, align=True) split.alignment = 'RIGHT' split.label(text="Soft Trim Start") - split.prop(strip, "frame_offset_start", text=str(bpy.utils.smpte_from_frame(strip.frame_offset_start)).replace(':', ' ')) + split.prop(strip, "frame_offset_start", text=str(bpy.utils.smpte_from_frame(strip.frame_offset_start))) split = sub.split(factor=0.5 + max_factor, align=True) split.alignment = 'RIGHT' split.label(text='End') - split.prop(strip, "frame_offset_end", text=str(bpy.utils.smpte_from_frame(strip.frame_offset_end)).replace(':', ' ')) + split.prop(strip, "frame_offset_end", text=str(bpy.utils.smpte_from_frame(strip.frame_offset_end))) layout.alignment = 'RIGHT' sub = layout.column(align=True) split = sub.split(factor=0.5 + max_factor) split.alignment = 'RIGHT' split.label(text="Hard Trim Start") - split.prop(strip, "animation_offset_start", text=str(bpy.utils.smpte_from_frame(strip.animation_offset_start)).replace(':', ' ')) + split.prop(strip, "animation_offset_start", text=str(bpy.utils.smpte_from_frame(strip.animation_offset_start))) split = sub.split(factor=0.5 + max_factor, align=True) split.alignment = 'RIGHT' split.label(text='End') - split.prop(strip, "animation_offset_end", text=str(bpy.utils.smpte_from_frame(strip.animation_offset_end)).replace(':', ' ')) + split.prop(strip, "animation_offset_end", text=str(bpy.utils.smpte_from_frame(strip.animation_offset_end))) playhead = frame_current - strip.frame_start col = layout.column(align=True) @@ -1363,7 +1363,7 @@ class SEQUENCER_PT_info_timecodes(SequencerButtonsPanel, Panel): split = col.split(factor=0.5 + max_factor) split.alignment = 'RIGHT' split.label(text="Playhead") - split.label(text="%s: %s" % ((bpy.utils.smpte_from_frame(playhead).replace(':', ' ')), (str(playhead)))) + split.label(text="%s: %s" % ((bpy.utils.smpte_from_frame(playhead)), (str(playhead)))) ''' Old data - anyone missing this data? col.label(text=iface_("Frame Offset %d:%d") % (strip.frame_offset_start, strip.frame_offset_end), |