[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25918] trunk/blender: Renamed toolbar to Tool Shelf all over

[Matt Ebb]

Revision: 25918
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25918
Author:   broken
Date:     2010-01-12 08:50:14 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
Renamed toolbar to Tool Shelf all over

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
    trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
    trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2010-01-12 07:07:51 UTC (rev 25917)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2010-01-12 07:50:14 UTC (rev 25918)
@@ -231,7 +231,7 @@
         layout = self.layout
 
         layout.operator("view3d.properties", icon='MENU_PANEL')
-        layout.operator("view3d.toolbar", icon='MENU_PANEL')
+        layout.operator("view3d.toolshelf", icon='MENU_PANEL')
 
         layout.separator()
 

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-01-12 07:07:51 UTC (rev 25917)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-01-12 07:50:14 UTC (rev 25918)
@@ -221,8 +221,8 @@
 	ar->regiontype= RGN_TYPE_HEADER;
 	ar->alignment= RGN_ALIGN_BOTTOM;
 	
-	/* toolbar */
-	ar= MEM_callocN(sizeof(ARegion), "toolbar for view3d");
+	/* tool shelf */
+	ar= MEM_callocN(sizeof(ARegion), "toolshelf for view3d");
 	
 	BLI_addtail(&v3d->regionbase, ar);
 	ar->regiontype= RGN_TYPE_UI;
@@ -834,7 +834,7 @@
 	art->draw= view3d_tools_area_draw;
 	BLI_addhead(&st->regiontypes, art);
 	
-	view3d_toolbar_register(art);
+	view3d_toolshelf_register(art);
 
 	/* regions: tool properties */
 	art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h	2010-01-12 07:07:51 UTC (rev 25917)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h	2010-01-12 07:50:14 UTC (rev 25918)
@@ -161,8 +161,8 @@
 void view3d_buttons_register(struct ARegionType *art);
 
 /* view3d_toolbar.c */
-void VIEW3D_OT_toolbar(struct wmOperatorType *ot);
-void view3d_toolbar_register(struct ARegionType *art);
+void VIEW3D_OT_toolshelf(struct wmOperatorType *ot);
+void view3d_toolshelf_register(struct ARegionType *art);
 void view3d_tool_props_register(struct ARegionType *art);
 
 /* view3d_snap.c */

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2010-01-12 07:07:51 UTC (rev 25917)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2010-01-12 07:50:14 UTC (rev 25918)
@@ -90,7 +90,7 @@
 	WM_operatortype_append(VIEW3D_OT_layers);
 	
 	WM_operatortype_append(VIEW3D_OT_properties);
-	WM_operatortype_append(VIEW3D_OT_toolbar);
+	WM_operatortype_append(VIEW3D_OT_toolshelf);
 	
 	WM_operatortype_append(VIEW3D_OT_snap_selected_to_grid);
 	WM_operatortype_append(VIEW3D_OT_snap_selected_to_cursor);
@@ -110,7 +110,7 @@
 	keymap= WM_keymap_find(keyconf, "3D View Generic", SPACE_VIEW3D, 0);
 	
 	WM_keymap_add_item(keymap, "VIEW3D_OT_properties", NKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "VIEW3D_OT_toolbar", TKEY, 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);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c	2010-01-12 07:07:51 UTC (rev 25917)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c	2010-01-12 07:50:14 UTC (rev 25918)
@@ -282,7 +282,7 @@
 }
 
 
-void view3d_toolbar_register(ARegionType *art)
+void view3d_toolshelf_register(ARegionType *art)
 {
 	PanelType *pt;
 
@@ -305,9 +305,9 @@
 	BLI_addtail(&art->paneltypes, pt);
 }
 
-/* ********** operator to open/close toolbar region */
+/* ********** operator to open/close toolshelf region */
 
-static int view3d_toolbar(bContext *C, wmOperator *op)
+static int view3d_toolshelf(bContext *C, wmOperator *op)
 {
 	ScrArea *sa= CTX_wm_area(C);
 	ARegion *ar= view3d_has_tools_region(sa);
@@ -318,13 +318,13 @@
 	return OPERATOR_FINISHED;
 }
 
-void VIEW3D_OT_toolbar(wmOperatorType *ot)
+void VIEW3D_OT_toolshelf(wmOperatorType *ot)
 {
-	ot->name= "Toolbar";
-	ot->description= "Toggles toolbar display.";
-	ot->idname= "VIEW3D_OT_toolbar";
+	ot->name= "Tool Shelf";
+	ot->description= "Toggles tool shelf display.";
+	ot->idname= "VIEW3D_OT_toolshelf";
 	
-	ot->exec= view3d_toolbar;
+	ot->exec= view3d_toolshelf;
 	ot->poll= ED_operator_view3d_active;
 	
 	/* flags */