diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2004-07-03 21:28:15 +0400 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2004-07-03 21:28:15 +0400 |
commit | cbe7471905bd6f34c00b5d1b6b9cde84f3f24cb4 (patch) | |
tree | e0a028d26d3cb6939c1ea396242d6f739fe124b0 /source/blender/src/header_script.c | |
parent | 5c543698c9fd5377aee5630ed22a87921593a3ad (diff) |
Interface:
- added submenu "Scripts" in both View3D->Object and Mesh menus.
Put them on top (it's better to follow some guideline, so users don't have to search for "Scripts" submenu in a different position in each menu), feel free to change.
- added button 'previous win' to SpaceScript, makes accessing buttons win, for example, much faster. Maybe all spaces could have this button.
BPython:
- added Window.EditMode(), to check, enter and leave edit mode. Scripts that change mesh data need this to leave edit mode before making changes to the active (G.obedit) mesh, of course.
- updated script bevel_center to use the above function and also popup an error msg if the active obj is not a mesh.
- doc updates, minor fixes.
Forgot to mention in my previous commit that I also updated the "-P" command-line option (for running script files) to be able to run already loaded Blender Texts, too. So, if you have a script called 'Text' in foo.blend, you can run it with blender foo.blend -P Text .
Diffstat (limited to 'source/blender/src/header_script.c')
-rw-r--r-- | source/blender/src/header_script.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/src/header_script.c b/source/blender/src/header_script.c index 0ce38ec9846..01d400bcbbf 100644 --- a/source/blender/src/header_script.c +++ b/source/blender/src/header_script.c @@ -45,6 +45,8 @@ #include "BLI_winstuff.h" #endif +#include "BLI_blenlib.h" + #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL @@ -80,7 +82,6 @@ /* action executed after clicking in Scripts menu */ static void do_scripts_submenus(void *int_arg, int event) { - extern int BPY_menu_do_python(short menutype, int event); // BPY_interface.c int menutype = (int)int_arg; BPY_menu_do_python (menutype, event); @@ -97,9 +98,8 @@ static uiBlock *script_scripts_submenus(void *int_menutype) if ((menutype < 0) || (menutype > PYMENU_TOTAL)) return NULL; - block= uiNewBlock(&curarea->uiblocks, "importmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); + block= uiNewBlock(&curarea->uiblocks, "scriptsscriptssubmenus", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_scripts_submenus, int_menutype); - //uiBlockSetXOfs(block, -50); // offset to parent button for (pym = BPyMenuTable[menutype]; pym; pym = pym->next, i++) { uiDefBut(block, BUTM, 1, pym->name, 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, i, pym->tooltip?pym->tooltip:pym->filename); @@ -168,7 +168,7 @@ void do_script_buttons(unsigned short event) SpaceScript *sc= curarea->spacedata.first; ID *id, *idtest; int nr= 1; - Script *script; + Script *script = sc->script; if (!sc) return; if (sc->spacetype != SPACE_SCRIPT) return; @@ -176,13 +176,12 @@ void do_script_buttons(unsigned short event) switch (event) { case B_SCRIPTBROWSE: if (sc->menunr==-2) { - activate_databrowse((ID *)sc->script, ID_SCR, 0, B_SCRIPTBROWSE, + activate_databrowse((ID *)script, ID_SCR, 0, B_SCRIPTBROWSE, &sc->menunr, do_script_buttons); break; } - if(sc->menunr < 0) break; - script = sc->script; + if(sc->menunr < 0) break; nr = 1; id = (ID *)script; @@ -202,8 +201,13 @@ void do_script_buttons(unsigned short event) allqueue(REDRAWHEADERS, 0); } break; - case B_SCRIPT2BUTS: - newspace(curarea, SPACE_BUTS); + case B_SCRIPT2PREV: + if(sc->next) { + BLI_remlink(&curarea->spacedata, sc); + BLI_addtail(&curarea->spacedata, sc); + sc = curarea->spacedata.first; + newspace(curarea, sc->spacetype); + } break; } @@ -256,7 +260,9 @@ void script_buttons(void) } uiBlockSetEmboss(block, UI_EMBOSSX); - xco += 10; + + uiDefIconBut(block, BUT, B_SCRIPT2PREV, ICON_GO_LEFT, xco+=XIC, 0, XIC, YIC, + 0, 0, 0, 0, 0, "Returns to previous window"); /* FULL WINDOW */ if(curarea->full) @@ -270,12 +276,6 @@ void script_buttons(void) xco += 2*XIC; xco= std_libbuttons(block, xco, 0, 0, NULL, B_SCRIPTBROWSE, (ID*)sc->script, 0, &(sc->menunr), 0, 0, 0, 0, 0); - if (sc->script && sc->script->lastspace == SPACE_BUTS) { - xco += 10; - uiDefIconBut(block, BUT, B_SCRIPT2BUTS, ICON_BUTS, xco+=XIC, 0, XIC, YIC, - 0, 0, 0, 0, 0, "Returns to Buttons Window"); - } - /* always as last */ curarea->headbutlen= xco+2*XIC; |