2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434...
[blender.git] / source / blender / editors / space_image / image_header.c
index 9153cc44d8f5555065614417a3b6b7b71fd069e3..44b068cebc17d67c7d841610148467abf96860be 100644 (file)
@@ -90,16 +90,10 @@ static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg
        return block;
 }
 
-#define B_NEWSPACE             100
-
 static void do_image_buttons(bContext *C, void *arg, int event)
 {
        switch(event) {
-               case B_NEWSPACE:
-                       ED_newspace(C->area, C->area->butspacetype);
-                       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
-                       break;
-               }
+       }
 }
 
 
@@ -112,36 +106,7 @@ void image_header_buttons(const bContext *C, ARegion *ar)
        block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
        uiBlockSetHandleFunc(block, do_image_buttons, NULL);
        
-       if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER);
-       else uiBlockSetCol(block, TH_HEADERDESEL);
-
-       xco = 8;
-       
-       uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, 
-                                         windowtype_pup(), xco, yco, XIC+10, YIC, 
-                                         &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
-                                         "Displays Current Window Type. "
-                                         "Click for menu of available types.");
-       
-       xco += XIC + 14;
-       
-       uiBlockSetEmboss(block, UI_EMBOSSN);
-       if (sa->flag & HEADER_NO_PULLDOWN) {
-               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
-                                                ICON_DISCLOSURE_TRI_RIGHT,
-                                                xco,yco,XIC,YIC-2,
-                                                &(sa->flag), 0, 0, 0, 0, 
-                                                "Show pulldown menus");
-       }
-       else {
-               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
-                                                ICON_DISCLOSURE_TRI_DOWN,
-                                                xco,yco,XIC,YIC-2,
-                                                &(sa->flag), 0, 0, 0, 0, 
-                                                "Hide pulldown menus");
-       }
-       uiBlockSetEmboss(block, UI_EMBOSS);
-       xco+=XIC;
+       xco= ED_area_header_standardbuttons(C, block, yco);
        
        if((sa->flag & HEADER_NO_PULLDOWN)==0) {
                int xmax;
@@ -152,6 +117,7 @@ void image_header_buttons(const bContext *C, ARegion *ar)
                xmax= GetButStringLength("View");
                uiDefPulldownBut(block, dummy_viewmenu, C->area, 
                                                 "View", xco, yco-2, xmax-3, 24, "");
+               xco+=XIC+xmax;
        }
        
        uiBlockSetEmboss(block, UI_EMBOSS);