diff options
author | William Reynish <william@reynish.com> | 2009-09-01 16:41:06 +0400 |
---|---|---|
committer | William Reynish <william@reynish.com> | 2009-09-01 16:41:06 +0400 |
commit | 9965e8915d9121fae88aaa98990f714b3c2670bf (patch) | |
tree | bb100a90a61ff5616cb13c4ffc16b9549ea26ef3 /release | |
parent | a44b9482603daaec9fa012714ddf4a1558c283fe (diff) |
Added the old Edge settings to scene properties. This old feature is really quite terrible as it isn't even resolution independent - the edge width should be relative to the image dimensions.
Adjusted layout for sound in sequencer and a few other minor tweaks.
Diffstat (limited to 'release')
-rw-r--r-- | release/ui/buttons_scene.py | 30 | ||||
-rw-r--r-- | release/ui/space_sequencer.py | 25 |
2 files changed, 35 insertions, 20 deletions
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 126afc4ef23..d8b2b51751b 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -189,20 +189,28 @@ class SCENE_PT_post_processing(RenderButtonsPanel): col = split.column() col.itemR(rd, "use_compositing") col.itemR(rd, "use_sequencer") - + col = split.column() - row = col.row() - row.itemR(rd, "fields", text="Fields") - sub = row.row() + col.itemR(rd, "dither_intensity", text="Dither", slider=True) + + layout.itemS() + + split = layout.split() + + col = split.column() + col.itemR(rd, "fields", text="Fields") + sub = col.column() sub.active = rd.fields + sub.row().itemR(rd, "field_order", expand=True) sub.itemR(rd, "fields_still", text="Still") - sub = col.row() - sub.active = rd.fields - sub.itemR(rd, "field_order", expand=True) - - split = layout.split() - split.itemL() - split.itemR(rd, "dither_intensity", text="Dither", slider=True) + + col = split.column() + + col.itemR(rd, "edge") + sub = col.column() + sub.active = rd.edge + sub.itemR(rd, "edge_threshold", text="Threshold", slider=True) + sub.itemR(rd, "edge_color", text="") class SCENE_PT_output(RenderButtonsPanel): __label__ = "Output" diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py index 87111b2925f..bef48f5ebdb 100644 --- a/release/ui/space_sequencer.py +++ b/release/ui/space_sequencer.py @@ -303,6 +303,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): row.itemR(strip, "frame_locked", text="Frame Lock") col = layout.column() + col.enabled = not strip.lock col.itemR(strip, "channel") col.itemR(strip, "start_frame") col.itemR(strip, "length") @@ -422,16 +423,21 @@ class SEQUENCER_PT_input(SequencerButtonsPanel): strip = act_strip(context) - layout.itemR(strip, "directory", text="") - - # Current element for the filename - split = layout.split(percentage=0.3) + split = layout.split(percentage=0.2) col = split.column() - col.itemL(text="File Name:") + col.itemL(text="Path:") col = split.column() + col.itemR(strip, "directory", text="") + + # Current element for the filename + elem = strip.getStripElem(context.scene.current_frame) if elem: + split = layout.split(percentage=0.2) + col = split.column() + col.itemL(text="File:") + col = split.column() col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback if strip.type != 'SOUND': @@ -477,14 +483,15 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel): layout.template_ID(strip, "sound", new="sound.open") layout.itemS() + layout.itemR(strip.sound, "filename", text="") + row = layout.row() if strip.sound.packed_file: - layout.itemO("sound.unpack") + row.itemO("sound.unpack", icon='ICON_PACKAGE', text="Unpack") else: - layout.itemO("sound.pack") + row.itemO("sound.pack", icon='ICON_UGLYPACKAGE', text="Pack") - layout.itemR(strip.sound, "filename") - layout.itemR(strip.sound, "caching") + row.itemR(strip.sound, "caching") class SEQUENCER_PT_filter(SequencerButtonsPanel): __label__ = "Filter" |