Merging trunk up to r39447.
[blender-staging.git] / release / scripts / startup / bl_ui / space_sequencer.py
index 84cc365425ebe59d4e7aec3e819d5ac132dcc797..f796ce8da5f54b20984bfe40f8b611d0ea414072 100644 (file)
@@ -112,7 +112,11 @@ class SEQUENCER_MT_view(Menu):
 
         layout.operator("sequencer.view_selected")
 
-        layout.prop(st, "show_frames")
+        if st.show_frames:
+            layout.operator("anim.time_toggle", text="Show Seconds")
+        else:
+            layout.operator("anim.time_toggle", text="Show Frames")
+
         layout.prop(st, "show_frame_indicator")
         if st.display_mode == 'IMAGE':
             layout.prop(st, "show_safe_margin")
@@ -221,6 +225,7 @@ class SEQUENCER_MT_add_effect(Menu):
         layout.operator("sequencer.effect_strip_add", text="Speed Control").type = 'SPEED'
         layout.operator("sequencer.effect_strip_add", text="Multicam Selector").type = 'MULTICAM'
         layout.operator("sequencer.effect_strip_add", text="Adjustment Layer").type = 'ADJUSTMENT'
+        layout.operator("sequencer.effect_strip_add", text="Title Card").type = 'TITLE_CARD'
 
 
 class SEQUENCER_MT_strip(Menu):
@@ -402,7 +407,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
                               'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
                               'PLUGIN',
                               'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED',
-                              'MULTICAM', 'ADJUSTMENT'}
+                              'MULTICAM', 'ADJUSTMENT', 'TITLE_CARD'}
 
     def draw(self, context):
         layout = self.layout
@@ -470,6 +475,11 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
             row.label("Cut To")
             for i in range(1, strip.channel):
                 row.operator("sequencer.cut_multicam", text=str(i)).camera = i
+        elif strip.type == "TITLE_CARD":
+            layout.prop(strip, "title")
+            layout.prop(strip, "subtitle")
+            layout.prop(strip, "color_foreground")
+            layout.prop(strip, "color_background")
 
         col = layout.column(align=True)
         if strip.type == 'SPEED':
@@ -541,7 +551,8 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel):
                               'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
                               'PLUGIN',
                               'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
-                              'MULTICAM', 'SPEED', 'ADJUSTMENT'}
+                              'MULTICAM', 'SPEED', 'ADJUSTMENT',
+                              'TITLE_CARD'}
 
     def draw(self, context):
         layout = self.layout
@@ -640,8 +651,11 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel):
 
         row.prop(strip.sound, "use_memory_cache")
 
+        layout.prop(strip, "waveform")
         layout.prop(strip, "volume")
         layout.prop(strip, "attenuation")
+        layout.prop(strip, "pitch")
+        layout.prop(strip, "pan")
 
         col = layout.column(align=True)
         col.label(text="Trim Duration:")
@@ -700,7 +714,8 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
                               'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
                               'PLUGIN',
                               'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
-                              'MULTICAM', 'SPEED', 'ADJUSTMENT'}
+                              'MULTICAM', 'SPEED', 'ADJUSTMENT',
+                              'TITLE_CARD'}
 
     def draw(self, context):
         layout = self.layout