Renamed toolbar to Tool Shelf all over
authorMatt Ebb <matt@mke3.net>
Tue, 12 Jan 2010 07:50:14 +0000 (07:50 +0000)
committerMatt Ebb <matt@mke3.net>
Tue, 12 Jan 2010 07:50:14 +0000 (07:50 +0000)
release/scripts/ui/space_view3d.py
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_toolbar.c

index 30ea8e34710b16c2c8d180405b86c0bd57912565..0c844440250a1602c3b77ebfd5bf93e6eeab447c 100644 (file)
@@ -231,7 +231,7 @@ class VIEW3D_MT_view(bpy.types.Menu):
         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()
 
index 31c02be66212ec387f3c6fb4c2bfa377290db81d..b23b1b38804c1950a9131e993d6b5fbe6f5291a8 100644 (file)
@@ -221,8 +221,8 @@ static SpaceLink *view3d_new(const bContext *C)
        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 @@ void ED_spacetype_view3d(void)
        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");
index a5d4c61bc01b0609fce1f19c71d885b8c5d9ea62..f6d77b1b63d7e0f13f8614ae1596c3c638c27a37 100644 (file)
@@ -161,8 +161,8 @@ void VIEW3D_OT_properties(struct wmOperatorType *ot);
 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 */
index 2e134da7e0253865c6db903870c91e939ff2ebab..ea9441ec64886bc1ecedbe2631cec96d8287563b 100644 (file)
@@ -90,7 +90,7 @@ void view3d_operatortypes(void)
        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 @@ void view3d_keymap(wmKeyConfig *keyconf)
        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);
index b05043cd76e3e4b379ac9131b279501ab75fe47e..a08413293a50dac4e6f3a1f5e65120f04cb2f815 100644 (file)
@@ -282,7 +282,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa)
 }
 
 
-void view3d_toolbar_register(ARegionType *art)
+void view3d_toolshelf_register(ARegionType *art)
 {
        PanelType *pt;
 
@@ -305,9 +305,9 @@ void view3d_tool_props_register(ARegionType *art)
        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 @@ static int view3d_toolbar(bContext *C, wmOperator *op)
        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 */