[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24762] trunk/blender/release/scripts: - add cloth button wasnt working because it was set to execute the operator .

[Campbell Barton]

Revision: 24762
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24762
Author:   campbellbarton
Date:     2009-11-22 14:15:21 +0100 (Sun, 22 Nov 2009)

Log Message:
-----------
- add cloth button wasnt working because it was set to execute the operator.
- for adding an operator, start with a blank name and dont write the default one. (still writes each name you type in, will need to fix this properly)
- move the AddPresetBase class into presets.py since all the presets are defined there.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/presets.py
    trunk/blender/release/scripts/op/wm.py
    trunk/blender/release/scripts/ui/properties_physics_cloth.py

Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py	2009-11-22 12:45:37 UTC (rev 24761)
+++ trunk/blender/release/scripts/op/presets.py	2009-11-22 13:15:21 UTC (rev 24762)
@@ -19,9 +19,59 @@
 import bpy
 import os
 
-from wm import AddPresetBase
+class AddPresetBase(bpy.types.Operator):
+    '''Base preset class, only for subclassing
+    subclasses must define 
+     - preset_values
+     - preset_path '''
+    bl_idname = "render.preset_add"
+    bl_label = "Add Render Preset"
 
+    name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen= 64, default= "")
 
+    '''
+    preset_values = [
+        "bpy.context.scene.render_data.resolution_x",
+        "bpy.context.scene.render_data.resolution_y",
+        "bpy.context.scene.render_data.pixel_aspect_x",
+        "bpy.context.scene.render_data.pixel_aspect_y",
+        "bpy.context.scene.render_data.fps",
+        "bpy.context.scene.render_data.fps_base",
+        "bpy.context.scene.render_data.resolution_percentage",
+    ]
+
+    preset_subdir = "render"
+    '''
+    
+    def _as_filename(self, name): # could reuse for other presets
+        for char in " !@#$%^&*(){}:\";'[]<>,./?":
+            name = name.replace('.', '_')
+        return name.lower()
+
+    def execute(self, context):
+
+        if not self.properties.name:
+            return ('FINISHED',)
+
+        filename = self._as_filename(self.properties.name) + ".py"
+
+        target_path = bpy.utils.preset_paths(self.preset_subdir)[0] # we need some way to tell the user and system preset path
+
+        file_preset = open(os.path.join(target_path, filename), 'w')
+        
+        for rna_path in self.preset_values:
+            file_preset.write("%s = %s\n" % (rna_path, eval(rna_path)))
+
+        file_preset.close()
+
+        return ('FINISHED',)
+
+    def invoke(self, context, event):
+        wm = context.manager
+        wm.invoke_props_popup(self, event)
+        return ('RUNNING_MODAL',)
+
+
 class AddPresetRender(AddPresetBase):
     '''Add a Render Preset.'''
     bl_idname = "render.preset_add"
@@ -38,7 +88,7 @@
         "bpy.context.scene.render_data.resolution_percentage",
     ]
 
-    preset_path = os.path.join("presets", "render")
+    preset_subdir = "render"
 
 
 class AddPresetSSS(AddPresetBase):
@@ -63,7 +113,7 @@
         "bpy.context.material.subsurface_scattering.texture_factor",
     ]
 
-    preset_path = os.path.join("presets", "sss")
+    preset_subdir = "sss"
     
 class AddPresetCloth(AddPresetBase):
     '''Add a Cloth Preset.'''
@@ -80,7 +130,7 @@
         "bpy.context.cloth.settings.air_damping",
     ]
     
-    preset_path = os.path.join("presets", "cloth")
+    preset_subdir = "cloth"
 
 bpy.ops.add(AddPresetRender)
 bpy.ops.add(AddPresetSSS)

Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py	2009-11-22 12:45:37 UTC (rev 24761)
+++ trunk/blender/release/scripts/op/wm.py	2009-11-22 13:15:21 UTC (rev 24762)
@@ -392,54 +392,7 @@
         '''
         return ('FINISHED',)
 
-class AddPresetBase(bpy.types.Operator):
-    '''Base preset class, only for subclassing
-    subclasses must define 
-     - preset_values
-     - preset_path '''
-    bl_idname = "render.preset_add"
-    bl_label = "Add Render Preset"
-    
-    name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen= 64, default= "New Preset")
-    
-    '''
-    preset_values = [
-        "bpy.context.scene.render_data.resolution_x",
-        "bpy.context.scene.render_data.resolution_y",
-        "bpy.context.scene.render_data.pixel_aspect_x",
-        "bpy.context.scene.render_data.pixel_aspect_y",
-        "bpy.context.scene.render_data.fps",
-        "bpy.context.scene.render_data.fps_base",
-        "bpy.context.scene.render_data.resolution_percentage",
-    ]
-    
-    preset_path = os.path.join("presets", "render")
-    '''
-    
-    def _as_filename(self, name): # could reuse for other presets
-        for char in " !@#$%^&*(){}:\";'[]<>,./?":
-            name = name.replace('.', '_')
-        return name.lower()
 
-    def execute(self, context):
-        filename = self._as_filename(self.properties.name) + ".py"
-        
-        target_path = os.path.join(os.path.dirname(__file__), os.path.pardir, self.preset_path, filename)
-
-        file_preset = open(target_path, 'w')
-        
-        for rna_path in self.preset_values:
-            file_preset.write("%s = %s\n" % (rna_path, eval(rna_path)))
-        
-        file_preset.close()
-        
-        return ('FINISHED',)
-
-    def invoke(self, context, event):
-        wm = context.manager
-        wm.invoke_props_popup(self, event)
-        return ('RUNNING_MODAL',)
-
 bpy.ops.add(MESH_OT_delete_edgeloop)
 
 bpy.ops.add(WM_OT_context_set_boolean)

Modified: trunk/blender/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_cloth.py	2009-11-22 12:45:37 UTC (rev 24761)
+++ trunk/blender/release/scripts/ui/properties_physics_cloth.py	2009-11-22 13:15:21 UTC (rev 24762)
@@ -78,6 +78,8 @@
             if wide_ui:
                 split.column()
 
+        split.operator_context = 'INVOKE_DEFAULT'
+
         if md:
             cloth = md.settings