Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 32205) +++ trunk/scconfig/Rev.h (revision 32206) @@ -1 +1 @@ -static const int myrev = 32205; +static const int myrev = 32206; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 32205) +++ trunk/scconfig/Rev.tab (revision 32206) @@ -1,4 +1,4 @@ -32205 configure cleanup: eahc plugin shall register its own menus +32206 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 32205) +++ trunk/src/Makefile.dep (revision 32206) @@ -3247,7 +3247,7 @@ librnd/core/rnd_printf.h ../src_3rd/liblihata/lihata.h \ librnd/core/list_conf.h plug_import.h rats_patch.h plug_io.h vtlibrary.h \ ../src_3rd/genvector/vts0.h -../src_plugins/import_fpcb_nl/fpcb_nl.o: \ +../src_plugins/import_fpcb_nl/fpcb_nl.o: ../src_plugins/import_fpcb_nl/menu_internal.c \ ../src_plugins/import_fpcb_nl/fpcb_nl.c ../config.h librnd/config.h \ ../src_3rd/qparse/qparse.h board.h ../src_3rd/genht/htsp.h \ ../src_3rd/genht/ht.h librnd/core/global_typedefs.h \ Index: trunk/src/pcb-menu-default.lht =================================================================== --- trunk/src/pcb-menu-default.lht (revision 32205) +++ trunk/src/pcb-menu-default.lht (revision 32206) @@ -75,7 +75,6 @@ - @import_sch ha:Load netlist file = { action=Load(Netlist) } - ha:Load FreePCB netlist (EasyEDA) = { action=LoadFpcbnlFrom() } } } - Index: trunk/src_plugins/import_fpcb_nl/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_fpcb_nl/Plug.tmpasm (revision 32205) +++ trunk/src_plugins/import_fpcb_nl/Plug.tmpasm (revision 32206) @@ -1,5 +1,7 @@ put /local/pcb/mod {import_fpcb_nl} put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_fpcb_nl/fpcb_nl.o @] +put /local/pcb/mod/MENUFILE {fpcb_nl-menu.lht} +put /local/pcb/mod/MENUVAR {fpcb_nl_menu} switch /local/pcb/import_fpcb_nl/controls case {buildin} include /local/pcb/tmpasm/buildin; end; Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl-menu.lht =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl-menu.lht (nonexistent) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl-menu.lht (revision 32206) @@ -0,0 +1,9 @@ +ha:rnd-menu-v1 { + li:anchored { + ha:@import_sch { + li:submenu { + ha:Load FreePCB netlist (EasyEDA) = { action=LoadFpcbnlFrom() } + } + } + } +} \ No newline at end of file Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 32205) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 32206) @@ -40,11 +40,13 @@ #include #include #include - +#include #include #include #include +#include "menu_internal.c" + static const char *fpcb_nl_cookie = "fpcb_nl importer"; /* remove leading whitespace */ @@ -233,6 +235,7 @@ { rnd_remove_actions_by_cookie(fpcb_nl_cookie); RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_fpcb_nl); + rnd_hid_menu_unload(rnd_gui, fpcb_nl_cookie); } int pplg_init_import_fpcb_nl(void) @@ -255,5 +258,6 @@ RND_REGISTER_ACTIONS(fpcb_nl_action_list, fpcb_nl_cookie) + rnd_hid_menu_load(rnd_gui, NULL, fpcb_nl_cookie, 165, NULL, 0, fpcb_nl_menu, "plugin: fpcb_nl import"); return 0; }