[Bf-blender-cvs] [45b6f746a3f] temp-checkbox-layout-tweaks: Camera and Curve obdata properties layout updates

[William Reynish]

Commit: 45b6f746a3f586eaa6b8e445493b5311366449d2
Author: William Reynish
Date:   Wed Apr 8 23:19:48 2020 +0200
Branches: temp-checkbox-layout-tweaks
https://developer.blender.org/rB45b6f746a3f586eaa6b8e445493b5311366449d2

Camera and Curve obdata properties layout updates

===================================================================

M	release/scripts/startup/bl_ui/properties_data_camera.py
M	release/scripts/startup/bl_ui/properties_data_curve.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index aee909e3a6c..0071ea8870a 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -360,8 +360,9 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel):
                     col.prop(bg, "rotation")
                     col.prop(bg, "scale")
 
-                    col.prop(bg, "use_flip_x")
-                    col.prop(bg, "use_flip_y")
+                    col = box.column(heading = "Flip")
+                    col.prop(bg, "use_flip_x", text = "X")
+                    col.prop(bg, "use_flip_y", text = "Y")
 
 
 class DATA_PT_camera_display(CameraButtonsPanel, Panel):
@@ -377,21 +378,12 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel):
 
         col = layout.column(align=True)
 
-        col.separator()
-
         col.prop(cam, "display_size", text="Size")
 
-        col.separator()
-
-        flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False)
-
-        col = flow.column()
+        col = layout.column(heading = "Show")
         col.prop(cam, "show_limits", text="Limits")
-        col = flow.column()
         col.prop(cam, "show_mist", text="Mist")
-        col = flow.column()
         col.prop(cam, "show_sensor", text="Sensor")
-        col = flow.column()
         col.prop(cam, "show_name", text="Name")
 
 
@@ -407,24 +399,20 @@ class DATA_PT_camera_display_composition_guides(CameraButtonsPanel, Panel):
 
         cam = context.camera
 
-        flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False)
+        layout.prop(cam, "show_composition_thirds")
 
-        col = flow.column()
+        col = layout.column(heading = "Center", align = True)
         col.prop(cam, "show_composition_center")
-        col = flow.column()
-        col.prop(cam, "show_composition_center_diagonal")
-        col = flow.column()
-        col.prop(cam, "show_composition_thirds")
-        col = flow.column()
-        col.prop(cam, "show_composition_golden")
-        col = flow.column()
-        col.prop(cam, "show_composition_golden_tria_a")
-        col = flow.column()
-        col.prop(cam, "show_composition_golden_tria_b")
-        col = flow.column()
-        col.prop(cam, "show_composition_harmony_tri_a")
-        col = flow.column()
-        col.prop(cam, "show_composition_harmony_tri_b")
+        col.prop(cam, "show_composition_center_diagonal", text = "Diagonal")
+        
+        col = layout.column(heading = "Golden", align = True)
+        col.prop(cam, "show_composition_golden", text = "Ratio")
+        col.prop(cam, "show_composition_golden_tria_a", text = "Triangle A")
+        col.prop(cam, "show_composition_golden_tria_b", text = "Triangle B")
+
+        col = layout.column(heading = "Harmony", align = True)
+        col.prop(cam, "show_composition_harmony_tri_a", text = "Triangle A")
+        col.prop(cam, "show_composition_harmony_tri_b", text = "Triangle B")
 
 
 class DATA_PT_camera_display_passepartout(CameraButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index b694062dfc5..33b306ecf51 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -276,23 +276,23 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, Panel):
             col.prop(act_spline, "use_smooth")
         else:
 
-            sub = col.column(align=True)
-            sub.prop(act_spline, "use_cyclic_u")
+            sub = col.column(heading = "Cyclic", align=True)
+            sub.prop(act_spline, "use_cyclic_u", text="U")
             if is_surf:
                 sub.prop(act_spline, "use_cyclic_v", text="V")
 
             if act_spline.type == 'NURBS':
-                sub = col.column(align=True)
+                sub = col.column(heading = "Bezier", align=True)
                 # sub.active = (not act_spline.use_cyclic_u)
-                sub.prop(act_spline, "use_bezier_u", text="Bezier U")
+                sub.prop(act_spline, "use_bezier_u", text="U")
 
                 if is_surf:
                     subsub = sub.column()
                     subsub.active = (not act_spline.use_cyclic_v)
                     subsub.prop(act_spline, "use_bezier_v", text="V")
 
-                sub = col.column(align=True)
-                sub.prop(act_spline, "use_endpoint_u", text="Endpoint U")
+                sub = col.column(heading = "Endpoint", align=True)
+                sub.prop(act_spline, "use_endpoint_u", text="U")
 
                 if is_surf:
                     subsub = sub.column()