[Bf-blender-cvs] [56b29df5cbf] soc-2019-npr: LANPR: UI refactor: collection usage panel.

[YimingWu]

Commit: 56b29df5cbff1587a5f94672c4d7380c68a4aac5
Author: YimingWu
Date:   Fri Jul 26 15:59:38 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB56b29df5cbff1587a5f94672c4d7380c68a4aac5

LANPR: UI refactor: collection usage panel.

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

M	release/scripts/startup/bl_ui/properties_collection.py

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

diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index a47c5d89e57..94b2a1aabd8 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -72,43 +72,40 @@ class COLLECTION_PT_lanpr_collection(CollectionButtonsPanel, Panel):
 
     def draw(self,context):
         layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
         collection = context.collection
         lanpr = collection.lanpr
         row = layout.row()
-        row.prop(lanpr,"usage",expand=True)
+        row.prop(lanpr,"usage")
         if lanpr.usage!='INCLUDE':
             layout.prop(lanpr,"force")
         else:
-            row = layout.row()
-            row.prop(lanpr,"target")
+            layout.prop(lanpr,"target")
             
             if lanpr.target:
 
                 if not is_unit_transformation(lanpr.target):
-                    row = layout.row()
-                    row.label(text = "Target GP has self transformations.")
-                    row = layout.row()
-                    row.operator("lanpr.reset_object_transfromations").obj=lanpr.target.name
-
-                row = layout.row(align=True)
-                row.prop(lanpr,'enable_contour',toggle=True)
-                row.prop(lanpr,'enable_crease',toggle=True)
-                row.prop(lanpr,'enable_mark',toggle=True)
-                row.prop(lanpr,'enable_material',toggle=True)
-                row.prop(lanpr,'enable_intersection',toggle=True)
-
-                row = layout.row(align=True)
-                row.prop(lanpr,'use_multiple_levels', icon='GP_MULTIFRAME_EDITING', icon_only=True)
-                row.prop(lanpr,'level_begin')
-                if lanpr.use_multiple_levels:
-                    row.prop(lanpr,'level_end')
+                    layout.label(text = "Target GP has self transformations.")
+                    layout.operator("lanpr.reset_object_transfromations").obj=lanpr.target.name
+
+                layout.prop(lanpr,'use_multiple_levels', text="Multiple Levels")
                 
-                row = layout.row()
-                row.prop(lanpr,'replace', text='Replace existing frames')
+                if lanpr.use_multiple_levels:
+                    col = layout.column(align=True)
+                    col.prop(lanpr,'level_begin',text="Level Begin")
+                    col.prop(lanpr,'level_end',text="End")
+                else:
+                    layout.prop(lanpr,'level_begin',text="Level")
+
+                layout.prop(lanpr,'enable_contour')
+                layout.prop(lanpr,'enable_crease')
+                layout.prop(lanpr,'enable_mark')
+                layout.prop(lanpr,'enable_material')
+                layout.prop(lanpr,'enable_intersection')
                 
-                row = layout.row()
-                row.prop(lanpr,'layer')
-                row.prop(lanpr,'material')
+                layout.prop(lanpr,'layer')
+                layout.prop(lanpr,'material')
 
 
 classes = (