[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42072] trunk/blender: * UI Improvements for the uiTemplateImageSettings.

[Thomas Dinges]

Revision: 42072
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42072
Author:   dingto
Date:     2011-11-22 17:14:47 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
* UI Improvements for the uiTemplateImageSettings.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/source/blender/editors/space_image/image_buttons.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2011-11-22 16:38:58 UTC (rev 42071)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2011-11-22 17:14:47 UTC (rev 42072)
@@ -456,17 +456,13 @@
         file_format = rd.image_settings.file_format
 
         layout.prop(rd, "filepath", text="")
+        layout.template_image_settings(rd.image_settings)
+        
+        flow = layout.column_flow()
+        flow.prop(rd, "use_overwrite")
+        flow.prop(rd, "use_placeholder")
+        flow.prop(rd, "use_file_extension")
 
-        split = layout.split()
-
-        col = split.column()
-        col.template_image_settings(rd.image_settings)
-
-        col = split.column()
-        col.prop(rd, "use_file_extension")
-        col.prop(rd, "use_overwrite")
-        col.prop(rd, "use_placeholder")
-
         if file_format == 'QUICKTIME_CARBON':
             layout.operator("scene.render_data_set_quicktime_codec")
 

Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c	2011-11-22 16:38:58 UTC (rev 42071)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c	2011-11-22 17:14:47 UTC (rev 42072)
@@ -830,7 +830,7 @@
 	col= uiLayoutColumn(layout, 0);
 
 	uiItemR(col, imfptr, "file_format", 0, "", ICON_NONE);
-
+	
 	row= uiLayoutRow(col, 0);
 	uiItemR(row, imfptr, "color_mode", UI_ITEM_R_EXPAND, "Color", ICON_NONE);
 
@@ -858,24 +858,27 @@
 	if (ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
 		uiItemR(col, imfptr, "exr_codec", 0, NULL, ICON_NONE);
 	}
-
+	
+	row= uiLayoutRow(col, 0);
 	if (BKE_imtype_supports_zbuf(imf->imtype)) {
-		uiItemR(col, imfptr, "use_zbuffer", 0, NULL, ICON_NONE);
+		uiItemR(row, imfptr, "use_zbuffer", 0, NULL, ICON_NONE);
 	}
 
 	if (is_render_out && (imf->imtype == R_IMF_IMTYPE_OPENEXR)) {
-		uiItemR(col, imfptr, "use_preview", 0, NULL, ICON_NONE);
+		uiItemR(row, imfptr, "use_preview", 0, NULL, ICON_NONE);
 	}
 
 	if (imf->imtype == R_IMF_IMTYPE_JP2) {
+		row= uiLayoutRow(col, 0);
+		uiItemR(row, imfptr, "use_jpeg2k_cinema_preset", 0, NULL, ICON_NONE);
+		uiItemR(row, imfptr, "use_jpeg2k_cinema_48", 0, NULL, ICON_NONE);
+		
 		uiItemR(col, imfptr, "use_jpeg2k_ycc", 0, NULL, ICON_NONE);
-		uiItemR(col, imfptr, "use_jpeg2k_cinema_preset", 0, NULL, ICON_NONE);
-		uiItemR(col, imfptr, "use_jpeg2k_cinema_48", 0, NULL, ICON_NONE);
 	}
 
 	if (imf->imtype == R_IMF_IMTYPE_CINEON) {
 #if 1
-		uiItemL(col, "FIXME: hard coded Non-Linear, Gamma:1.0", ICON_NONE);
+		uiItemL(col, "Hard coded Non-Linear, Gamma:1.0", ICON_NONE);
 #else
 		uiItemR(col, imfptr, "use_cineon_log", 0, NULL, ICON_NONE);
 		uiItemR(col, imfptr, "cineon_black", 0, NULL, ICON_NONE);