[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43189] trunk/blender: Properties Window UI:

Thomas Dinges blender at dingto.org
Fri Jan 6 00:50:01 CET 2012


Revision: 43189
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43189
Author:   dingto
Date:     2012-01-05 23:49:57 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Properties Window UI:
* Some tweaks to the stamp panel to make it more compact. 
* Remove "Stamp" Prefix for the color values, redundant info. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-01-05 23:36:03 UTC (rev 43188)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-01-05 23:49:57 UTC (rev 43189)
@@ -418,6 +418,12 @@
         rd = context.scene.render
 
         layout.active = rd.use_stamp
+        
+        layout.prop(rd, "stamp_font_size", text="Font Size")
+        
+        row = layout.row()
+        row.column().prop(rd, "stamp_foreground", slider=True)
+        row.column().prop(rd, "stamp_background", slider=True)
 
         split = layout.split()
 
@@ -427,19 +433,14 @@
         col.prop(rd, "use_stamp_render_time", text="RenderTime")
         col.prop(rd, "use_stamp_frame", text="Frame")
         col.prop(rd, "use_stamp_scene", text="Scene")
+        
+        col = split.column()
         col.prop(rd, "use_stamp_camera", text="Camera")
         col.prop(rd, "use_stamp_lens", text="Lens")
         col.prop(rd, "use_stamp_filename", text="Filename")
         col.prop(rd, "use_stamp_marker", text="Marker")
         col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip")
 
-        col = split.column()
-        col.active = rd.use_stamp
-        col.prop(rd, "stamp_foreground", slider=True)
-        col.prop(rd, "stamp_background", slider=True)
-        col.separator()
-        col.prop(rd, "stamp_font_size", text="Font Size")
-
         row = layout.split(percentage=0.2)
         row.prop(rd, "use_stamp_note", text="Note")
         sub = row.row()

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-01-05 23:36:03 UTC (rev 43188)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-01-05 23:49:57 UTC (rev 43189)
@@ -3440,14 +3440,14 @@
 	RNA_def_property_float_sdna(prop, NULL, "fg_stamp");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_range(prop,0.0,1.0);
-	RNA_def_property_ui_text(prop, "Stamp Text Color", "Color to use for stamp text");
+	RNA_def_property_ui_text(prop, "Text Color", "Color to use for stamp text");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
 	prop= RNA_def_property(srna, "stamp_background", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "bg_stamp");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_range(prop,0.0,1.0);
-	RNA_def_property_ui_text(prop, "Stamp Background", "Color to use behind stamp text");
+	RNA_def_property_ui_text(prop, "Background", "Color to use behind stamp text");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
 	/* sequencer draw options */



More information about the Bf-blender-cvs mailing list