Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 32200) +++ trunk/scconfig/Rev.h (revision 32201) @@ -1 +1 @@ -static const int myrev = 32200; +static const int myrev = 32201; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 32200) +++ trunk/scconfig/Rev.tab (revision 32201) @@ -1,4 +1,4 @@ -32200 configure cleanup: eahc plugin shall register its own menus +32201 configure cleanup: eahc plugin shall register its own menus 32187 configure librnd: infra for menu patching 32169 configure hid_lesstif is part of the hidlib 32120 configure removing the old drc in favor of drc_query Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 32200) +++ trunk/src/Makefile.dep (revision 32201) @@ -3404,7 +3404,7 @@ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/error.h -../src_plugins/import_mentor_sch/mentor_sch.o: \ +../src_plugins/import_mentor_sch/mentor_sch.o: ../src_plugins/import_mentor_sch/menu_internal.c \ ../src_plugins/import_mentor_sch/mentor_sch.c ../config.h \ librnd/config.h board.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \ librnd/core/global_typedefs.h librnd/core/rnd_bool.h vtroutestyle.h \ Index: trunk/src/pcb-menu-default.lht =================================================================== --- trunk/src/pcb-menu-default.lht (revision 32200) +++ trunk/src/pcb-menu-default.lht (revision 32201) @@ -74,7 +74,6 @@ @import_geo - @import_sch - ha:Import mentor graphics schematics = { action=LoadMentorFrom() } ha:Load netlist file = { action=Load(Netlist) } ha:Load IPC-D-356 netlist = { action=LoadIpc356From() } ha:Load TinyCAD .net file = { action=LoadTinyCADFrom() } Index: trunk/src_plugins/import_mentor_sch/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_mentor_sch/Plug.tmpasm (revision 32200) +++ trunk/src_plugins/import_mentor_sch/Plug.tmpasm (revision 32201) @@ -4,6 +4,8 @@ $(PLUGDIR)/import_mentor_sch/mentor_sch.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/import_mentor_sch/mentor_sch_conf.h} +put /local/pcb/mod/MENUFILE {mentor-menu.lht} +put /local/pcb/mod/MENUVAR {mentor_menu} switch /local/pcb/import_mentor_sch/controls Index: trunk/src_plugins/import_mentor_sch/mentor-menu.lht =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor-menu.lht (nonexistent) +++ trunk/src_plugins/import_mentor_sch/mentor-menu.lht (revision 32201) @@ -0,0 +1,9 @@ +ha:rnd-menu-v1 { + li:anchored { + ha:@import_sch { + li:submenu { + ha:Import mentor graphics schematics = { action=LoadMentorFrom() } + } + } + } +} \ No newline at end of file Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 32200) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 32201) @@ -39,7 +39,7 @@ #include #include #include - +#include #include #include #include @@ -49,6 +49,8 @@ #include "netlist_helper.h" +#include "menu_internal.c" + conf_mentor_sch_t conf_mentor; @@ -311,6 +313,7 @@ rnd_remove_actions_by_cookie(mentor_sch_cookie); rnd_conf_unreg_fields("plugins/import_mentor_sch/"); RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_mentor_sch); + rnd_hid_menu_unload(rnd_gui, mentor_sch_cookie); } int pplg_init_import_mentor_sch(void) @@ -336,5 +339,6 @@ RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_mentor_sch); RND_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie) + rnd_hid_menu_load(rnd_gui, NULL, mentor_sch_cookie, 185, NULL, 0, mentor_menu, "plugin: mentor_sch"); return 0; }