[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22929] branches/blender2.5/blender: Added the old Edge settings to scene properties.

[William Reynish]

Revision: 22929
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22929
Author:   billrey
Date:     2009-09-01 14:41:06 +0200 (Tue, 01 Sep 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_scene.py
    branches/blender2.5/blender/release/ui/space_sequencer.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py	2009-09-01 12:18:17 UTC (rev 22928)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py	2009-09-01 12:41:06 UTC (rev 22929)
@@ -189,21 +189,29 @@
 		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"
 	COMPAT_ENGINES = set(['BLENDER_RENDER'])

Modified: branches/blender2.5/blender/release/ui/space_sequencer.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_sequencer.py	2009-09-01 12:18:17 UTC (rev 22928)
+++ branches/blender2.5/blender/release/ui/space_sequencer.py	2009-09-01 12:41:06 UTC (rev 22929)
@@ -303,6 +303,7 @@
 		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 @@
 		
 		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 @@
 		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"

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-09-01 12:18:17 UTC (rev 22928)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-09-01 12:41:06 UTC (rev 22929)
@@ -1621,10 +1621,10 @@
 	RNA_def_property_ui_text(prop, "Edge", "Create a toon outline around the edges of geometry");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "edge_intensity", PROP_INT, PROP_NONE);
+	prop= RNA_def_property(srna, "edge_threshold", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "edgeint");
 	RNA_def_property_range(prop, 0, 255);
-	RNA_def_property_ui_text(prop, "Edge Intensity", "Threshold for drawing outlines on geometry edges");
+	RNA_def_property_ui_text(prop, "Edge Threshold", "Threshold for drawing outlines on geometry edges");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
 	prop= RNA_def_property(srna, "edge_color", PROP_FLOAT, PROP_COLOR);