batch remove .'s used with RNA_def_struct_ui_text
[blender.git] / source / blender / editors / space_view3d / view3d_toolbar.c
index 67d8bc3e5ee5dec48a89539310fe2f4fd6d8845a..a45c291820ae91b398e3d8168e52b00518b1c076 100644 (file)
@@ -51,7 +51,7 @@
 
 #include "MEM_guardedalloc.h"
 
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
@@ -108,16 +108,31 @@ static void redo_cb(bContext *C, void *arg_op, void *arg2)
        if(lastop) {
                int retval;
                
        if(lastop) {
                int retval;
                
-               printf("operator redo %s\n", lastop->type->name);
+               if (G.f & G_DEBUG)
+                       printf("operator redo %s\n", lastop->type->name);
                ED_undo_pop_op(C, lastop);
                retval= WM_operator_repeat(C, lastop);
                if((retval & OPERATOR_FINISHED)==0) {
                ED_undo_pop_op(C, lastop);
                retval= WM_operator_repeat(C, lastop);
                if((retval & OPERATOR_FINISHED)==0) {
-                       printf("operator redo failed %s\n", lastop->type->name);
+                       if (G.f & G_DEBUG)
+                               printf("operator redo failed %s\n", lastop->type->name);
                        ED_undo_redo(C);
                }
        }
 }
 
                        ED_undo_redo(C);
                }
        }
 }
 
+static wmOperator *view3d_last_operator(const bContext *C)
+{
+       wmWindowManager *wm= CTX_wm_manager(C);
+       wmOperator *op;
+
+       /* only for operators that are registered and did an undo push */
+       for(op= wm->operators.last; op; op= op->prev)
+               if((op->type->flag & OPTYPE_REGISTER) && (op->type->flag & OPTYPE_UNDO))
+                       break;
+
+       return op;
+}
+
 static void view3d_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOperator *op)
 {
        wmWindowManager *wm= CTX_wm_manager(C);
 static void view3d_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOperator *op)
 {
        wmWindowManager *wm= CTX_wm_manager(C);
@@ -129,77 +144,55 @@ static void view3d_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOper
        }
        
        RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
        }
        
        RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
-       uiDefAutoButsRNA(C, pa->layout, &ptr, 1);
-       
+       if(op->type->ui) {
+               op->layout= pa->layout;
+               op->type->ui((bContext*)C, op);
+               op->layout= NULL;
+       }
+       else
+               uiDefAutoButsRNA(C, pa->layout, &ptr, 1);
+}
+
+static void view3d_panel_operator_redo_header(const bContext *C, Panel *pa)
+{
+       wmOperator *op= view3d_last_operator(C);
+
+       if(op) BLI_strncpy(pa->drawname, op->type->name, sizeof(pa->drawname));
+       else BLI_strncpy(pa->drawname, "Operator", sizeof(pa->drawname));
+}
+
+static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op)
+{
+       if(op->type->flag & OPTYPE_MACRO) {
+               for(op= op->macro.first; op; op= op->next) {
+                       uiItemL(pa->layout, op->idname, 0);
+                       view3d_panel_operator_redo_operator(C, pa, op);
+               }
+       }
+       else {
+               view3d_panel_operator_redo_buts(C, pa, op);
+       }
 }
 
 static void view3d_panel_operator_redo(const bContext *C, Panel *pa)
 {
 }
 
 static void view3d_panel_operator_redo(const bContext *C, Panel *pa)
 {
-       wmWindowManager *wm= CTX_wm_manager(C);
-       wmOperator *op;
+       wmOperator *op= view3d_last_operator(C);
        uiBlock *block;
        
        uiBlock *block;
        
-       block= uiLayoutGetBlock(pa->layout);
-
-       /* only for operators that are registered and did an undo push */
-       for(op= wm->operators.last; op; op= op->prev)
-               if((op->type->flag & OPTYPE_REGISTER) && (op->type->flag & OPTYPE_UNDO))
-                       break;
-       
        if(op==NULL)
                return;
        if(op==NULL)
                return;
-       if(op->type->poll && op->type->poll((bContext *)C)==0)
+       if(WM_operator_poll((bContext*)C, op->type) == 0)
                return;
        
                return;
        
+       block= uiLayoutGetBlock(pa->layout);
+
        uiBlockSetFunc(block, redo_cb, op, NULL);
        
        uiBlockSetFunc(block, redo_cb, op, NULL);
        
-       if(op->macro.first) {
-               for(op= op->macro.first; op; op= op->next)
-                       view3d_panel_operator_redo_buts(C, pa, op);
-       }
-       else {
-               view3d_panel_operator_redo_buts(C, pa, op);
-       }
+       view3d_panel_operator_redo_operator(C, pa, op);
 }
 
 /* ******************* */
 
 }
 
 /* ******************* */
 
-char *view3d_context_string(const bContext *C)
-{
-       Object *obedit= CTX_data_edit_object(C);
-
-       if(obedit) {
-               switch(obedit->type) {
-                       case OB_MESH:
-                               return "editmode_mesh";
-                       case OB_CURVE:
-                               return "editmode_curve";
-                       case OB_SURF:
-                               return "editmode_surface";
-                       case OB_FONT:
-                               return "editmode_text";
-                       case OB_ARMATURE:
-                               return "editmode_armature";
-                       case OB_MBALL:
-                               return "editmode_mball";
-                       case OB_LATTICE:
-                               return "editmode_lattice";
-               }
-       }
-       else {
-               Object *ob = CTX_data_active_object(C);
-               
-               if(ob && (ob->flag & OB_POSEMODE)) return "pose_mode";
-               else if (G.f & G_SCULPTMODE)  return "sculpt_mode";
-               else if (G.f & G_WEIGHTPAINT) return "weight_paint";
-               else if (G.f & G_VERTEXPAINT) return "vertex_paint";
-               else if (G.f & G_TEXTUREPAINT) return "texture_paint";
-               else if(G.f & G_PARTICLEEDIT) return "particle_mode";
-       }
-       
-       return "objectmode";
-}
-
 typedef struct CustomTool {
        struct CustomTool *next, *prev;
        char opname[OP_MAX_TYPENAME];
 typedef struct CustomTool {
        struct CustomTool *next, *prev;
        char opname[OP_MAX_TYPENAME];
@@ -215,7 +208,7 @@ static void operator_call_cb(struct bContext *C, void *arg_listbase, void *arg2)
                
                BLI_addtail(arg_listbase, ct);
                BLI_strncpy(ct->opname, ot->idname, OP_MAX_TYPENAME);
                
                BLI_addtail(arg_listbase, ct);
                BLI_strncpy(ct->opname, ot->idname, OP_MAX_TYPENAME);
-               BLI_strncpy(ct->context, view3d_context_string(C), OP_MAX_TYPENAME);
+               BLI_strncpy(ct->context, CTX_data_mode_string(C), OP_MAX_TYPENAME);
        }
                
 }
        }
                
 }
@@ -227,7 +220,7 @@ static void operator_search_cb(const struct bContext *C, void *arg, char *str, u
        for(; ot; ot= ot->next) {
                
                if(BLI_strcasestr(ot->name, str)) {
        for(; ot; ot= ot->next) {
                
                if(BLI_strcasestr(ot->name, str)) {
-                       if(ot->poll==NULL || ot->poll((bContext *)C)) {
+                       if(WM_operator_poll((bContext*)C, ot)) {
                                
                                if(0==uiSearchItemAdd(items, ot->name, ot, 0))
                                        break;
                                
                                if(0==uiSearchItemAdd(items, ot->name, ot, 0))
                                        break;
@@ -255,7 +248,7 @@ static uiBlock *tool_search_menu(bContext *C, ARegion *ar, void *arg_listbase)
        /* fake button, it holds space for search items */
        uiDefBut(block, LABEL, 0, "", 10, 15, 150, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
        
        /* fake button, it holds space for search items */
        uiDefBut(block, LABEL, 0, "", 10, 15, 150, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
        
-       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, OP_MAX_TYPENAME, 10, 0, 150, 19, "");
+       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, OP_MAX_TYPENAME, 10, 0, 150, 19, 0, 0, "");
        uiButSetSearchFunc(but, operator_search_cb, arg_listbase, operator_call_cb, NULL);
        
        uiBoundsBlock(block, 6);
        uiButSetSearchFunc(but, operator_search_cb, arg_listbase, operator_call_cb, NULL);
        
        uiBoundsBlock(block, 6);
@@ -278,7 +271,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa)
        SpaceLink *sl= CTX_wm_space_data(C);
        SpaceType *st= NULL;
        uiLayout *col;
        SpaceLink *sl= CTX_wm_space_data(C);
        SpaceType *st= NULL;
        uiLayout *col;
-       const char *context= view3d_context_string(C);
+       const char *context= CTX_data_mode_string(C);
        
        if(sl)
                st= BKE_spacetype_from_id(sl->spacetype);
        
        if(sl)
                st= BKE_spacetype_from_id(sl->spacetype);
@@ -289,7 +282,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa)
                for(ct= st->toolshelf.first; ct; ct= ct->next) {
                        if(0==strncmp(context, ct->context, OP_MAX_TYPENAME)) {
                                col= uiLayoutColumn(pa->layout, 1);
                for(ct= st->toolshelf.first; ct; ct= ct->next) {
                        if(0==strncmp(context, ct->context, OP_MAX_TYPENAME)) {
                                col= uiLayoutColumn(pa->layout, 1);
-                               uiItemFullO(col, NULL, 0, ct->opname, NULL, WM_OP_INVOKE_REGION_WIN);
+                               uiItemFullO(col, NULL, 0, ct->opname, NULL, WM_OP_INVOKE_REGION_WIN, 0);
                        }
                }
        }
                        }
                }
        }
@@ -298,7 +291,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;
 
 {
        PanelType *pt;
 
@@ -315,34 +308,32 @@ void view3d_tool_props_register(ARegionType *art)
        
        pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel last operator");
        strcpy(pt->idname, "VIEW3D_PT_last_operator");
        
        pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel last operator");
        strcpy(pt->idname, "VIEW3D_PT_last_operator");
-       strcpy(pt->label, "Last Operator");
+       strcpy(pt->label, "Operator");
+       pt->draw_header= view3d_panel_operator_redo_header;
        pt->draw= view3d_panel_operator_redo;
        BLI_addtail(&art->paneltypes, pt);
 }
 
        pt->draw= view3d_panel_operator_redo;
        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);
        
 {
        ScrArea *sa= CTX_wm_area(C);
        ARegion *ar= view3d_has_tools_region(sa);
        
-       if(ar) {
-               ar->flag ^= RGN_FLAG_HIDDEN;
-               ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
-               
-               ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
-               ED_area_tag_redraw(sa);
-       }
+       if(ar)
+               ED_region_toggle_hidden(C, ar);
+
        return OPERATOR_FINISHED;
 }
 
        return OPERATOR_FINISHED;
 }
 
-void VIEW3D_OT_toolbar(wmOperatorType *ot)
+void VIEW3D_OT_toolshelf(wmOperatorType *ot)
 {
 {
-       ot->name= "Toolbar";
-       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 */
        ot->poll= ED_operator_view3d_active;
        
        /* flags */