[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28184] trunk/blender: * Interaction Presets

Matt Ebb matt at mke3.net
Wed Apr 14 08:27:50 CEST 2010


Revision: 28184
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28184
Author:   broken
Date:     2010-04-14 08:27:50 +0200 (Wed, 14 Apr 2010)

Log Message:
-----------
* Interaction Presets

This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.

It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform 
manipulator keys, not much more than that.

To save an interaction preset, open the user preferences Input section, and press the 
[ + ] button next to the presets menu. It will save out a .py file containing any edited key 
maps and navigation preferences to the presets/interaction folder in your scripts folder.

---

Part of this commit changes the way that key maps are exported/displayed in 
preferences - now partial key configs are allowed. Previously it would export/import the 
entire key configuration, regardless of whether individual key maps were edited or not 
(which would make them more susceptible to conflicts in unexpected areas).

(note, in blender terminology, a key map is a category of key items, such as 
'Object Mode' or 'View 2d'.)

Now, the export and the UI display work in a similar way to how key maps are 
processed internally - Locally edited key maps (after pressing the 'Edit' button) are 
processed first, falling back to other key maps in the current key config, and then falling 
back to the default key config. So it's possible for a key config to only include a few 
key maps, and the rest just gets pulled from the default key config. The preferences 
UI display works like this too behind the scenes in deciding what to show users, 
however using it is just like it was before, the complexity is hidden.

Modified Paths:
--------------
    trunk/blender/release/datafiles/splash.png
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/release/scripts/op/presets.py
    trunk/blender/release/scripts/ui/properties_data_lamp.py
    trunk/blender/release/scripts/ui/properties_material.py
    trunk/blender/release/scripts/ui/properties_physics_cloth.py
    trunk/blender/release/scripts/ui/properties_render.py
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/datafiles/splash.png.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/release/datafiles/splash.png
===================================================================
(Binary files differ)

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -511,12 +511,16 @@
             if f.startswith("."):
                 continue
 
-            props = layout.operator(operator, text=bpy.utils.display_name(f))
+            preset_name = bpy.utils.display_name(f)
+            props = layout.operator(operator, text=preset_name)
 
             for attr, value in props_default.items():
                 setattr(props, attr, value)
 
             props.path = path
+            if operator == "script.execute_preset":
+                props.menu_idname = self.bl_idname
+                props.preset_name = preset_name      
 
     def draw_preset(self, context):
         """Define these on the subclass

Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/op/presets.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -46,7 +46,13 @@
 
         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')
+        path = os.path.join(target_path, filename)
+        if getattr(self, "save_keyconfig", True):
+            bpy.ops.wm.keyconfig_export(path=path, kc_name=self.properties.name)
+            file_preset = open(path, 'a')
+            file_preset.write("wm.active_keyconfig = kc\n\n")
+        else:
+            file_preset = open(path, 'w')
 
         for rna_path in self.preset_values:
             value = eval(rna_path)
@@ -68,6 +74,24 @@
         return {'RUNNING_MODAL'}
 
 
+class ExecutePreset(bpy.types.Operator):
+    ''' Executes a preset '''
+    bl_idname = "script.execute_preset"
+    bl_label = "Execute a Python Preset"
+
+    path = bpy.props.StringProperty(name="Path", description="Path of the Python file to execute", maxlen=512, default="")
+    preset_name = bpy.props.StringProperty(name="Preset Name", description="Name of the Preset being executed", default="")
+    menu_idname = bpy.props.StringProperty(name="Menu ID Name", description="ID name of the menu this was called from", default="")
+
+    def execute(self, context):
+        # change the menu title to the most recently chosen option
+        exec("bpy.types.%s.bl_label=\'%s\'" % (self.properties.menu_idname, self.properties.preset_name))
+ 
+        # execute the preset using script.python_file_run
+        bpy.ops.script.python_file_run(path=self.properties.path)
+        return {'FINISHED'}
+
+
 class AddPresetRender(AddPresetBase):
     '''Add a Render Preset'''
     bl_idname = "render.preset_add"
@@ -157,12 +181,32 @@
 
     preset_subdir = "sunsky"
 
+class AddPresetInteraction(AddPresetBase):
+    '''Add an Application Interaction Preset'''
+    bl_idname = "wm.interaction_preset_add"
+    bl_label = "Add Interaction Preset"
+    name = AddPresetBase.name
+    save_keyconfig = True
+    
+    preset_values = [
+        "bpy.context.user_preferences.edit.drag_immediately",
+        "bpy.context.user_preferences.edit.insertkey_xyz_to_rgb",
+        "bpy.context.user_preferences.inputs.select_mouse",
+        "bpy.context.user_preferences.inputs.zoom_style",
+        "bpy.context.user_preferences.inputs.zoom_axis",
+        "bpy.context.user_preferences.inputs.view_rotation",
+        "bpy.context.user_preferences.inputs.invert_zoom_direction",
+    ]
 
+    preset_subdir = "interaction"
+
 classes = [
+    ExecutePreset,
     AddPresetRender,
     AddPresetSSS,
     AddPresetCloth,
-    AddPresetSunSky]
+    AddPresetSunSky,
+    AddPresetInteraction]
 
 
 def register():

Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lamp.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/ui/properties_data_lamp.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -26,7 +26,7 @@
 class LAMP_MT_sunsky_presets(bpy.types.Menu):
     bl_label = "Render Presets"
     preset_subdir = "sunsky"
-    preset_operator = "script.python_file_run"
+    preset_operator = "script.execute_preset"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     draw = bpy.types.Menu.draw_preset
 
@@ -146,8 +146,8 @@
 
         row = layout.row(align=True)
         row.prop(lamp, "use_sky")
-        row.menu("LAMP_MT_sunsky_presets", text="Presets")
-        row.operator("lamp.sunsky_preset_add", text="Add")
+        row.menu("LAMP_MT_sunsky_presets", text=bpy.types.LAMP_MT_sunsky_presets.bl_label)
+        row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMIN")
 
         row = layout.row()
         row.active = lamp.use_sky or lamp.use_atmosphere

Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/ui/properties_material.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -39,7 +39,7 @@
 class MATERIAL_MT_sss_presets(bpy.types.Menu):
     bl_label = "SSS Presets"
     preset_subdir = "sss"
-    preset_operator = "script.python_file_run"
+    preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset
 
 
@@ -505,8 +505,8 @@
 
         row = layout.row().split()
         sub = row.row(align=True).split(percentage=0.75)
-        sub.menu("MATERIAL_MT_sss_presets", text="Presets")
-        sub.operator("material.sss_preset_add", text="Add")
+        sub.menu("MATERIAL_MT_sss_presets", text=bpy.types.MATERIAL_MT_sss_presets.bl_label)
+        sub.operator("material.sss_preset_add", text="", icon="ZOOMIN")
 
         split = layout.split()
 

Modified: trunk/blender/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_cloth.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/ui/properties_physics_cloth.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -36,7 +36,7 @@
     '''
     bl_label = "Cloth Presets"
     preset_subdir = "cloth"
-    preset_operator = "script.python_file_run"
+    preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset
 
 
@@ -91,8 +91,8 @@
 
             col.label(text="Presets:")
             sub = col.row(align=True).split(percentage=0.75)
-            sub.menu("CLOTH_MT_presets", text="Presets")
-            sub.operator("cloth.preset_add", text="Add")
+            sub.menu("CLOTH_MT_presets", text=bpy.types.CLOTH_MT_presets.bl_label)
+            sub.operator("cloth.preset_add", text="", icon="ZOOMIN")
 
             col.label(text="Quality:")
             col.prop(cloth, "quality", text="Steps", slider=True)

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/ui/properties_render.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -25,7 +25,7 @@
 class RENDER_MT_presets(bpy.types.Menu):
     bl_label = "Render Presets"
     preset_subdir = "render"
-    preset_operator = "script.python_file_run"
+    preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset
 
 
@@ -530,8 +530,8 @@
 
         row = layout.row().split()
         sub = row.row(align=True).split(percentage=0.75)
-        sub.menu("RENDER_MT_presets", text="Presets")
-        sub.operator("render.preset_add", text="Add")
+        sub.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
+        sub.operator("render.preset_add", text="", icon="ZOOMIN")
 
         split = layout.split()
 

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-04-13 22:52:28 UTC (rev 28183)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-04-14 06:27:50 UTC (rev 28184)
@@ -19,7 +19,6 @@
 # <pep8 compliant>
 import bpy
 import os
-import re
 import shutil
 
 
@@ -67,92 +66,6 @@
     col.active = lamp.enabled
     col.prop(lamp, "direction", text="")
 
-KM_HIERARCHY = [
-                    ('Window', 'EMPTY', 'WINDOW', []), # file save, window change, exit
-                    ('Screen', 'EMPTY', 'WINDOW', [    # full screen, undo, screenshot
-                        ('Screen Editing', 'EMPTY', 'WINDOW', []),    # resizing, action corners
-                        ]),
-
-                    ('View2D', 'EMPTY', 'WINDOW', []),    # view 2d navigation (per region)
-                    ('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation
-                    ('Header', 'EMPTY', 'WINDOW', []),    # header stuff (per region)
-                    ('Grease Pencil', 'EMPTY', 'WINDOW', []), # grease pencil stuff (per region)
-
-                    ('3D View', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff (select, transform)
-                        ('Object Mode', 'EMPTY', 'WINDOW', []),
-                        ('Mesh', 'EMPTY', 'WINDOW', []),
-                        ('Curve', 'EMPTY', 'WINDOW', []),
-                        ('Armature', 'EMPTY', 'WINDOW', []),
-                        ('Metaball', 'EMPTY', 'WINDOW', []),
-                        ('Lattice', 'EMPTY', 'WINDOW', []),
-                        ('Font', 'EMPTY', 'WINDOW', []),
-
-                        ('Pose', 'EMPTY', 'WINDOW', []),
-
-                        ('Vertex Paint', 'EMPTY', 'WINDOW', []),
-                        ('Weight Paint', 'EMPTY', 'WINDOW', []),
-                        ('Face Mask', 'EMPTY', 'WINDOW', []),
-                        ('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
-                        ('Sculpt', 'EMPTY', 'WINDOW', []),
-

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list