Followup to r59434 : py UI scripts edits.
[blender.git] / release / scripts / startup / bl_ui / properties_physics_common.py
index 20b76ec0a84fa616fff6e0062c6e50b587b1e15a..dcb47b9f0159dd6ab4bde95de1eaee091fa12f62 100644 (file)
@@ -20,7 +20,8 @@
 
 import bpy
 from bpy.types import Panel
-from blf import gettext as _
+from bpy.app.translations import contexts as i18n_contexts
+
 
 class PhysicButtonsPanel():
     bl_space_type = 'PROPERTIES'
@@ -34,15 +35,23 @@ class PhysicButtonsPanel():
 
 
 def physics_add(self, layout, md, name, type, typeicon, toggles):
-    sub = layout.row(align=True)
+    row = layout.row(align=True)
     if md:
-        sub.context_pointer_set("modifier", md)
-        sub.operator("object.modifier_remove", text=name, icon='X')
-        if(toggles):
-            sub.prop(md, "show_render", text="")
-            sub.prop(md, "show_viewport", text="")
+        row.context_pointer_set("modifier", md)
+        row.operator("object.modifier_remove", text=name, text_ctxt=i18n_contexts.default, icon='X')
+        if toggles:
+            row.prop(md, "show_render", text="")
+            row.prop(md, "show_viewport", text="")
+    else:
+        row.operator("object.modifier_add", text=name, text_ctxt=i18n_contexts.default, icon=typeicon).type = type
+
+
+def physics_add_special(self, layout, data, name, addop, removeop, typeicon):
+    row = layout.row(align=True)
+    if data:
+        row.operator(removeop, text=name, text_ctxt=i18n_contexts.default, icon='X')
     else:
-        sub.operator("object.modifier_add", text=name, icon=typeicon).type = type
+        row.operator(addop, text=name, text_ctxt=i18n_contexts.default, icon=typeicon)
 
 
 class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
@@ -50,85 +59,107 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
     bl_options = {'HIDE_HEADER'}
 
     def draw(self, context):
-        ob = context.object
+        obj = context.object
 
         layout = self.layout
-        layout.label(_("Enable physics for:"))
+        layout.label("Enable physics for:")
         split = layout.split()
         col = split.column()
 
-        if(context.object.field.type == 'NONE'):
-            col.operator("object.forcefield_toggle", text=_("Force Field"), icon='FORCE_FORCE')
+        if obj.field.type == 'NONE':
+            col.operator("object.forcefield_toggle", text="Force Field", icon='FORCE_FORCE')
         else:
-            col.operator("object.forcefield_toggle", text=_("Force Field"), icon='X')
+            col.operator("object.forcefield_toggle", text="Force Field", icon='X')
 
-        if(ob.type == 'MESH'):
-            physics_add(self, col, context.collision, _("Collision"), 'COLLISION', 'MOD_PHYSICS', False)
-            physics_add(self, col, context.cloth, _("Cloth"), 'CLOTH', 'MOD_CLOTH', True)
+        if obj.type == 'MESH':
+            physics_add(self, col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False)
+            physics_add(self, col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True)
+            physics_add(self, col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True)
 
         col = split.column()
 
-        if(ob.type == 'MESH' or ob.type == 'LATTICE'or ob.type == 'CURVE'):
-            physics_add(self, col, context.soft_body, _("Soft Body"), 'SOFT_BODY', 'MOD_SOFT', True)
+        if obj.type in {'MESH', 'LATTICE', 'CURVE'}:
+            physics_add(self, col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True)
+
+        if obj.type == 'MESH':
+            physics_add(self, col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
+            physics_add(self, col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True)
+
+            physics_add_special(self, col, obj.rigid_body, "Rigid Body",
+                                "rigidbody.object_add",
+                                "rigidbody.object_remove",
+                                'MESH_ICOSPHERE')  # XXX: need dedicated icon
 
-        if(ob.type == 'MESH'):
-            physics_add(self, col, context.fluid, _("Fluid"), 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
-            physics_add(self, col, context.smoke, _("Smoke"), 'SMOKE', 'MOD_SMOKE', True)
+        # all types of objects can have rigid body constraint
+        physics_add_special(self, col, obj.rigid_body_constraint, "Rigid Body Constraint",
+                            "rigidbody.constraint_add",
+                            "rigidbody.constraint_remove",
+                            'CONSTRAINT')  # RB_TODO needs better icon
 
 
-#cachetype can be 'PSYS' 'HAIR' 'SMOKE' etc
+# cache-type can be 'PSYS' 'HAIR' 'SMOKE' etc
 
 def point_cache_ui(self, context, cache, enabled, cachetype):
     layout = self.layout
 
     layout.context_pointer_set("point_cache", cache)
 
-    row = layout.row()
-    row.template_list(cache, "point_caches", cache.point_caches, "active_index", rows=2)
-    col = row.column(align=True)
-    col.operator("ptcache.add", icon='ZOOMIN', text="")
-    col.operator("ptcache.remove", icon='ZOOMOUT', text="")
+    if not cachetype == 'RIGID_BODY':
+        row = layout.row()
+        row.template_list("UI_UL_list", "point_caches", cache, "point_caches",
+                          cache.point_caches, "active_index", rows=2)
+        col = row.column(align=True)
+        col.operator("ptcache.add", icon='ZOOMIN', text="")
+        col.operator("ptcache.remove", icon='ZOOMOUT', text="")
 
     row = layout.row()
     if cachetype in {'PSYS', 'HAIR', 'SMOKE'}:
         row.prop(cache, "use_external")
 
-    if cache.use_external:
-        split = layout.split(percentage=0.80)
-        split.prop(cache, "name", text=_("File Name"))
-        split.prop(cache, "index", text="")
-
-        row = layout.row()
-        row.label(text=_("File Path:"))
-        row.prop(cache, "use_library_path", "Use Lib Path")
+        if cachetype == 'SMOKE':
+            row.prop(cache, "use_library_path", "Use Lib Path")
 
-        layout.prop(cache, "filepath", text="")
+    if cache.use_external:
+        split = layout.split(percentage=0.35)
+        col = split.column()
+        col.label(text="File Name:")
+        if cache.use_external:
+            col.label(text="File Path:")
 
-        layout.label(text=cache.info)
+        col = split.column()
+        sub = col.split(percentage=0.70, align=True)
+        sub.prop(cache, "name", text="")
+        sub.prop(cache, "index", text="")
+        col.prop(cache, "filepath", text="")
+
+        cache_info = cache.info
+        if cache_info:
+            layout.label(text=cache_info)
     else:
-        if cachetype == 'SMOKE':
+        if cachetype in {'SMOKE', 'DYNAMIC_PAINT'}:
             if not bpy.data.is_saved:
-                layout.label(text=_("Cache is disabled until the file is saved"))
+                layout.label(text="Cache is disabled until the file is saved")
                 layout.enabled = False
 
         if cache.use_disk_cache:
-            layout.prop(cache, "name", text=_("File Name"))
+            layout.prop(cache, "name", text="File Name")
         else:
-            layout.prop(cache, "name", text=_("Cache Name"))
+            layout.prop(cache, "name", text="Cache Name")
 
+    if not cache.use_external or cachetype == 'SMOKE':
         row = layout.row(align=True)
 
-        if cachetype != 'PSYS':
+        if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}:
             row.enabled = enabled
             row.prop(cache, "frame_start")
             row.prop(cache, "frame_end")
-        if cachetype not in {'SMOKE', 'CLOTH'}:
+        if cachetype not in {'SMOKE', 'CLOTH', 'DYNAMIC_PAINT', 'RIGID_BODY'}:
             row.prop(cache, "frame_step")
-            row.prop(cache, "use_quick_cache")
+
         if cachetype != 'SMOKE':
             layout.label(text=cache.info)
 
-        if cachetype != 'SMOKE':
+        if cachetype not in {'SMOKE', 'DYNAMIC_PAINT', 'RIGID_BODY'}:
             split = layout.split()
             split.enabled = enabled and bpy.data.is_saved
 
@@ -142,7 +173,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
             row = layout.row()
             row.enabled = enabled and bpy.data.is_saved
             row.active = cache.use_disk_cache
-            row.label(text=_("Compression:"))
+            row.label(text="Compression:")
             row.prop(cache, "compression", expand=True)
 
         layout.separator()
@@ -151,37 +182,34 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
 
         col = split.column()
 
-        if cache.is_baked == True:
-            col.operator("ptcache.free_bake", text=_("Free Bake"))
+        if cache.is_baked is True:
+            col.operator("ptcache.free_bake", text="Free Bake")
         else:
-            col.operator("ptcache.bake", text=_("Bake")).bake = True
+            col.operator("ptcache.bake", text="Bake").bake = True
 
         sub = col.row()
         sub.enabled = (cache.frames_skipped or cache.is_outdated) and enabled
-        sub.operator("ptcache.bake", text=_("Calculate To Frame")).bake = False
+        sub.operator("ptcache.bake", text="Calculate To Frame").bake = False
 
         sub = col.column()
         sub.enabled = enabled
-        sub.operator("ptcache.bake_from_cache", text=_("Current Cache to Bake"))
+        sub.operator("ptcache.bake_from_cache", text="Current Cache to Bake")
 
         col = split.column()
-        col.operator("ptcache.bake_all", text=_("Bake All Dynamics")).bake = True
-        col.operator("ptcache.free_bake_all", text=_("Free All Bakes"))
-        col.operator("ptcache.bake_all", text=_("Update All To Frame")).bake = False
+        col.operator("ptcache.bake_all", text="Bake All Dynamics").bake = True
+        col.operator("ptcache.free_bake_all", text="Free All Bakes")
+        col.operator("ptcache.bake_all", text="Update All To Frame").bake = False
 
 
-def effector_weights_ui(self, context, weights):
+def effector_weights_ui(self, context, weights, weight_type):
     layout = self.layout
 
     layout.prop(weights, "group")
 
     split = layout.split()
 
-    col = split.column()
-    col.prop(weights, "gravity", slider=True)
-
-    col = split.column()
-    col.prop(weights, "all", slider=True)
+    split.prop(weights, "gravity", slider=True)
+    split.prop(weights, "all", slider=True)
 
     layout.separator()
 
@@ -194,6 +222,8 @@ def effector_weights_ui(self, context, weights):
     col.prop(weights, "wind", slider=True)
     col.prop(weights, "curve_guide", slider=True)
     col.prop(weights, "texture", slider=True)
+    if weight_type != 'SMOKE':
+        col.prop(weights, "smokeflow", slider=True)
 
     col = split.column()
     col.prop(weights, "harmonic", slider=True)
@@ -215,7 +245,7 @@ def basic_force_field_settings_ui(self, context, field):
     col = split.column()
 
     if field.type == 'DRAG':
-        col.prop(field, "linear_drag", text=_("Linear"))
+        col.prop(field, "linear_drag", text="Linear")
     else:
         col.prop(field, "strength")
 
@@ -223,12 +253,12 @@ def basic_force_field_settings_ui(self, context, field):
         col.prop(field, "size")
         col.prop(field, "flow")
     elif field.type == 'HARMONIC':
-        col.prop(field, "harmonic_damping", text=_("Damping"))
+        col.prop(field, "harmonic_damping", text="Damping")
         col.prop(field, "rest_length")
     elif field.type == 'VORTEX' and field.shape != 'POINT':
         col.prop(field, "inflow")
     elif field.type == 'DRAG':
-        col.prop(field, "quadratic_drag", text=_("Quadratic"))
+        col.prop(field, "quadratic_drag", text="Quadratic")
     else:
         col.prop(field, "flow")
 
@@ -237,19 +267,19 @@ def basic_force_field_settings_ui(self, context, field):
     sub.prop(field, "noise")
     sub.prop(field, "seed")
     if field.type == 'TURBULENCE':
-        col.prop(field, "use_global_coords", text=_("Global"))
+        col.prop(field, "use_global_coords", text="Global")
     elif field.type == 'HARMONIC':
         col.prop(field, "use_multiple_springs")
 
     split = layout.split()
 
     col = split.column()
-    col.label(text=_("Effect point:"))
+    col.label(text="Effect point:")
     col.prop(field, "apply_to_location")
     col.prop(field, "apply_to_rotation")
 
     col = split.column()
-    col.label(text=_("Collision:"))
+    col.label(text="Collision:")
     col.prop(field, "use_absorption")
 
 
@@ -265,22 +295,22 @@ def basic_force_field_falloff_ui(self, context, field):
     col.prop(field, "z_direction", text="")
 
     col = split.column()
-    col.prop(field, "falloff_power", text=_("Power"))
+    col.prop(field, "falloff_power", text="Power")
 
     split = layout.split()
     col = split.column()
     row = col.row(align=True)
     row.prop(field, "use_min_distance", text="")
-    sub = row.row()
+    sub = row.row(align=True)
     sub.active = field.use_min_distance
-    sub.prop(field, "distance_min", text=_("Minimum"))
+    sub.prop(field, "distance_min", text="Minimum")
 
     col = split.column()
     row = col.row(align=True)
     row.prop(field, "use_max_distance", text="")
-    sub = row.row()
+    sub = row.row(align=True)
     sub.active = field.use_max_distance
-    sub.prop(field, "distance_max", text=_("Maximum"))
+    sub.prop(field, "distance_max", text="Maximum")
 
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)