* UI Improvements for the uiTemplateImageSettings.
authorThomas Dinges <blender@dingto.org>
Tue, 22 Nov 2011 17:14:47 +0000 (17:14 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 22 Nov 2011 17:14:47 +0000 (17:14 +0000)
release/scripts/startup/bl_ui/properties_render.py
source/blender/editors/space_image/image_buttons.c

index 100f5b1730fc29f8d7c3e39412da489137eddac1..2d731164713d6cf8f9620cbfd9f7a954d76df2ad 100644 (file)
@@ -456,16 +456,12 @@ class RENDER_PT_output(RenderButtonsPanel, Panel):
         file_format = rd.image_settings.file_format
 
         layout.prop(rd, "filepath", text="")
-
-        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")
+        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")
 
         if file_format == 'QUICKTIME_CARBON':
             layout.operator("scene.render_data_set_quicktime_codec")
index 11a9c0d8d40be16212247474b3ce862245e75f26..adedcde66a69e5c8cd2db50c28a893ac0342b147 100644 (file)
@@ -830,7 +830,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr)
        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 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr)
        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);