[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31774] trunk/blender/source/blender: rename '3D View' keymap, since its know as 'View 3D' for other areas of the keymap editor.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 6 07:20:08 CEST 2010
Revision: 31774
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31774
Author: campbellbarton
Date: 2010-09-06 07:20:05 +0200 (Mon, 06 Sep 2010)
Log Message:
-----------
rename '3D View' keymap, since its know as 'View 3D' for other areas of the keymap editor.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/editors/interface/resources.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -1384,9 +1384,9 @@
if (strcmp(km->idname, "Armature_Sketch")==0)
strcpy(km->idname, "Armature Sketch");
else if (strcmp(km->idname, "View3D")==0)
- strcpy(km->idname, "3D View");
+ strcpy(km->idname, "View 3D");
else if (strcmp(km->idname, "View3D Generic")==0)
- strcpy(km->idname, "3D View Generic");
+ strcpy(km->idname, "View 3D Generic");
else if (strcmp(km->idname, "EditMesh")==0)
strcpy(km->idname, "Mesh");
else if (strcmp(km->idname, "TimeLine")==0)
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -374,10 +374,10 @@
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* own keymap, last so modes can override it */
- keymap= WM_keymap_find(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(wm->defaultconf, "View 3D Generic", SPACE_VIEW3D, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
- keymap= WM_keymap_find(wm->defaultconf, "3D View", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(wm->defaultconf, "View 3D", SPACE_VIEW3D, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* add drop boxes */
@@ -704,7 +704,7 @@
/* add handlers, stuff you only do once or on area/region changes */
static void view3d_header_area_init(wmWindowManager *wm, ARegion *ar)
{
- wmKeyMap *keymap= WM_keymap_find(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0);
+ wmKeyMap *keymap= WM_keymap_find(wm->defaultconf, "View 3D Generic", SPACE_VIEW3D, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -747,7 +747,7 @@
ED_region_panels_init(wm, ar);
- keymap= WM_keymap_find(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(wm->defaultconf, "View 3D Generic", SPACE_VIEW3D, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
}
@@ -843,7 +843,7 @@
ED_region_panels_init(wm, ar);
- keymap= WM_keymap_find(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(wm->defaultconf, "View 3D Generic", SPACE_VIEW3D, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -103,13 +103,13 @@
wmKeyMap *keymap;
wmKeyMapItem *kmi;
- keymap= WM_keymap_find(keyconf, "3D View Generic", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(keyconf, "View 3D Generic", SPACE_VIEW3D, 0);
WM_keymap_add_item(keymap, "VIEW3D_OT_properties", NKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "VIEW3D_OT_toolshelf", TKEY, KM_PRESS, 0, 0);
/* only for region 3D window */
- keymap= WM_keymap_find(keyconf, "3D View", SPACE_VIEW3D, 0);
+ keymap= WM_keymap_find(keyconf, "View 3D", SPACE_VIEW3D, 0);
kmi = WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
RNA_boolean_set(kmi->ptr, "release_confirm", 1);
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -42,7 +42,7 @@
EnumPropertyItem space_type_items[] = {
{SPACE_EMPTY, "EMPTY", 0, "Empty", ""},
- {SPACE_VIEW3D, "VIEW_3D", 0, "3D View", ""},
+ {SPACE_VIEW3D, "VIEW_3D", 0, "View 3D", ""},
{SPACE_IPO, "GRAPH_EDITOR", 0, "Graph Editor", ""},
{SPACE_OUTLINER, "OUTLINER", 0, "Outliner", ""},
{SPACE_BUTS, "PROPERTIES", 0, "Properties", ""},
@@ -956,7 +956,7 @@
srna= RNA_def_struct(brna, "SpaceView3D", "Space");
RNA_def_struct_sdna(srna, "View3D");
- RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");
+ RNA_def_struct_ui_text(srna, "View 3D Space", "View 3D space data");
prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
@@ -967,12 +967,12 @@
prop= RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_pointer_sdna(prop, NULL, "ob_centre");
- RNA_def_property_ui_text(prop, "Lock Object", "3D View center is locked to this object's position");
+ RNA_def_property_ui_text(prop, "Lock Object", "View 3D center is locked to this object's position");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "lock_bone", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "ob_centre_bone");
- RNA_def_property_ui_text(prop, "Lock Bone", "3D View center is locked to this bone's position");
+ RNA_def_property_ui_text(prop, "Lock Bone", "View 3D center is locked to this bone's position");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "viewport_shade", PROP_ENUM, PROP_NONE);
@@ -1001,13 +1001,13 @@
prop= RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "near");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
- RNA_def_property_ui_text(prop, "Clip Start", "3D View near clipping distance");
+ RNA_def_property_ui_text(prop, "Clip Start", "View 3D near clipping distance");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "clip_end", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "far");
RNA_def_property_range(prop, 1.0f, FLT_MAX);
- RNA_def_property_ui_text(prop, "Clip End", "3D View far clipping distance");
+ RNA_def_property_ui_text(prop, "Clip End", "View 3D far clipping distance");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "grid_spacing", PROP_FLOAT, PROP_DISTANCE);
@@ -1172,7 +1172,7 @@
srna= RNA_def_struct(brna, "RegionView3D", NULL);
RNA_def_struct_sdna(srna, "RegionView3D");
- RNA_def_struct_ui_text(srna, "3D View Region", "3D View region data");
+ RNA_def_struct_ui_text(srna, "View 3D Region", "3D View region data");
prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "viewlock", RV3D_LOCKED);
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -1654,7 +1654,7 @@
static EnumPropertyItem active_theme_area[] = {
{0, "USER_INTERFACE", ICON_UI, "User Interface", ""},
- {1, "VIEW_3D", ICON_VIEW3D, "3D View", ""},
+ {1, "VIEW_3D", ICON_VIEW3D, "View 3D", ""},
{2, "TIMELINE", ICON_TIME, "Timeline", ""},
{3, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""},
{4, "DOPESHEET_EDITOR", ICON_ACTION, "Dopesheet", ""},
@@ -1695,7 +1695,7 @@
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "tv3d");
RNA_def_property_struct_type(prop, "ThemeView3D");
- RNA_def_property_ui_text(prop, "3D View", "");
+ RNA_def_property_ui_text(prop, "View 3D", "");
prop= RNA_def_property(srna, "graph_editor", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2010-09-06 00:33:08 UTC (rev 31773)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2010-09-06 05:20:05 UTC (rev 31774)
@@ -781,7 +781,7 @@
/* 3D View */
else if (strstr(opname, "VIEW3D_OT")) {
- km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0);
+ km = WM_keymap_find_all(C, "View 3D", sl->spacetype, 0);
}
else if (strstr(opname, "OBJECT_OT")) {
km = WM_keymap_find_all(C, "Object Mode", 0, 0);
@@ -894,7 +894,7 @@
/* check for relevant editor */
switch(sl->spacetype) {
case SPACE_VIEW3D:
- km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0);
+ km = WM_keymap_find_all(C, "View 3D", sl->spacetype, 0);
break;
case SPACE_IPO:
km = WM_keymap_find_all(C, "Graph Editor", sl->spacetype, 0);
More information about the Bf-blender-cvs
mailing list