[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26386] trunk/blender: Speed up keymap editor a bit (less context changes)
Martin Poirier
theeth at yahoo.com
Fri Jan 29 03:01:03 CET 2010
Revision: 26386
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26386
Author: theeth
Date: 2010-01-29 03:01:02 +0100 (Fri, 29 Jan 2010)
Log Message:
-----------
Speed up keymap editor a bit (less context changes)
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-01-29 01:57:15 UTC (rev 26385)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-01-29 02:01:02 UTC (rev 26386)
@@ -1062,9 +1062,9 @@
if km.modal:
row.label(text="", icon='LINKED')
if km.user_defined:
- row.operator("wm.keymap_restore", text="Restore")
+ op = row.operator("wm.keymap_restore", text="Restore")
else:
- row.operator("wm.keymap_edit", text="Edit")
+ op = row.operator("wm.keymap_edit", text="Edit")
if km.children_expanded:
if children:
@@ -1086,7 +1086,7 @@
col = self.indented_layout(col, level + 1)
subcol = col.split(percentage=0.2).column()
subcol.active = km.user_defined
- subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+ op = subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
col.separator()
@@ -1099,9 +1099,7 @@
self.draw_entry(kc, entry, col, level + 1)
def draw_kmi(self, kc, km, kmi, layout, level):
- # reset keymap pointer, it might get changed by modal keymaps added after keymap items
- layout.set_context_pointer("keymap", km)
- layout.set_context_pointer("keyitem", kmi)
+ map_type = kmi.map_type
col = self.indented_layout(layout, level)
@@ -1127,27 +1125,30 @@
row = split.row()
row.prop(kmi, "map_type", text="")
- if kmi.map_type == 'KEYBOARD':
+ if map_type == 'KEYBOARD':
row.prop(kmi, "type", text="", full_event=True)
- elif kmi.map_type == 'MOUSE':
+ elif map_type == 'MOUSE':
row.prop(kmi, "type", text="", full_event=True)
- elif kmi.map_type == 'TWEAK':
+ elif map_type == 'TWEAK':
subrow = row.row()
subrow.prop(kmi, "type", text="")
subrow.prop(kmi, "value", text="")
- elif kmi.map_type == 'TIMER':
+ elif map_type == 'TIMER':
row.prop(kmi, "type", text="")
else:
row.label()
- row.operator("wm.keyitem_restore", text="", icon='BACK')
- row.operator("wm.keyitem_remove", text="", icon='X')
+ if kmi.id:
+ op = row.operator("wm.keyitem_restore", text="", icon='BACK')
+ op.item_id = kmi.id
+ op = row.operator("wm.keyitem_remove", text="", icon='X')
+ op.item_id = kmi.id
# Expanded, additional event settings
if kmi.expanded:
box = col.box()
- if kmi.map_type not in ('TEXTINPUT', 'TIMER'):
+ if map_type not in ('TEXTINPUT', 'TIMER'):
split = box.split(percentage=0.4)
sub = split.row()
@@ -1159,10 +1160,10 @@
sub = split.column()
subrow = sub.row(align=True)
- if kmi.map_type == 'KEYBOARD':
+ if map_type == 'KEYBOARD':
subrow.prop(kmi, "type", text="", event=True)
subrow.prop(kmi, "value", text="")
- elif kmi.map_type == 'MOUSE':
+ elif map_type == 'MOUSE':
subrow.prop(kmi, "type", text="")
subrow.prop(kmi, "value", text="")
@@ -1198,6 +1199,7 @@
kmm = kc.find_keymap_modal(kmi.idname)
if kmm:
self.draw_km(kc, kmm, None, layout, level + 1)
+ layout.set_context_pointer("keymap", km)
def draw_input_prefs(self, inputs, layout):
# General settings
@@ -1259,7 +1261,6 @@
filtered_items = [kmi for kmi in km.items if filter in kmi.name.lower()]
if len(filtered_items) != 0:
- layout.set_context_pointer("keymap", km)
col = layout.column()
row = col.row()
@@ -1269,9 +1270,11 @@
row.label()
if km.user_defined:
- row.operator("wm.keymap_restore", text="Restore")
+ op = row.operator("wm.keymap_restore", text="Restore")
+ op.keymap = km
else:
- row.operator("wm.keymap_edit", text="Edit")
+ op = row.operator("wm.keymap_edit", text="Edit")
+ op.keymap = km
for kmi in filtered_items:
self.draw_kmi(kc, km, kmi, col, 1)
@@ -1280,7 +1283,8 @@
col = self.indented_layout(layout, 1)
subcol = col.split(percentage=0.2).column()
subcol.active = km.user_defined
- subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+ op = subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+ op.keymap = km
def draw_hierarchy(self, defkc, layout):
for entry in KM_HIERARCHY:
@@ -1288,6 +1292,10 @@
def draw(self, context):
layout = self.layout
+
+ #import time
+
+ #start = time.time()
userpref = context.user_preferences
wm = context.manager
@@ -1322,6 +1330,8 @@
self.draw_filtered(kc, col)
else:
self.draw_hierarchy(kc, col)
+
+ #print("runtime", time.time() - start)
bpy.types.register(USERPREF_HT_header)
bpy.types.register(USERPREF_PT_tabs)
@@ -1651,15 +1661,12 @@
bl_idname = "wm.keyitem_restore"
bl_label = "Restore Key Map Item"
- def poll(self, context):
- kmi = context.keyitem
- km = context.keymap
- return km and kmi and kmi.id != 0
+ item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove")
def execute(self, context):
wm = context.manager
- kmi = context.keyitem
km = context.keymap
+ kmi = km.item_from_id(self.properties.item_id)
km.restore_item_to_default(kmi)
@@ -1695,10 +1702,12 @@
bl_idname = "wm.keyitem_remove"
bl_label = "Remove Key Map Item"
+ item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove")
+
def execute(self, context):
wm = context.manager
- kmi = context.keyitem
km = context.keymap
+ kmi = km.item_from_id(self.properties.item_id)
km.remove_item(kmi)
return {'FINISHED'}
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2010-01-29 01:57:15 UTC (rev 26385)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2010-01-29 02:01:02 UTC (rev 26386)
@@ -365,6 +365,12 @@
parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
RNA_def_property_flag(parm, PROP_REQUIRED);
+ func= RNA_def_function(srna, "item_from_id", "WM_keymap_item_find_id");
+ parm= RNA_def_property(func, "id", PROP_INT, PROP_NONE);
+ RNA_def_property_ui_text(parm, "id", "ID of the item.");
+ parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
+ RNA_def_function_return(func, parm);
+
func= RNA_def_function(srna, "copy_to_user", "WM_keymap_copy_to_user");
parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "User editable key map.");
RNA_def_function_return(func, parm);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2010-01-29 01:57:15 UTC (rev 26385)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2010-01-29 02:01:02 UTC (rev 26386)
@@ -688,13 +688,8 @@
}
if (km) {
- wmKeyMapItem *orig;
+ wmKeyMapItem *orig = WM_keymap_item_find_id(km, kmi->id);
- for (orig = km->items.first; orig; orig = orig->next) {
- if (orig->id == kmi->id)
- break;
- }
-
if (orig) {
if(strcmp(orig->idname, kmi->idname) != 0) {
BLI_strncpy(kmi->idname, orig->idname, sizeof(kmi->idname));
More information about the Bf-blender-cvs
mailing list