Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 32202) +++ trunk/scconfig/Rev.h (revision 32203) @@ -1 +1 @@ -static const int myrev = 32202; +static const int myrev = 32203; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 32202) +++ trunk/scconfig/Rev.tab (revision 32203) @@ -1,4 +1,4 @@ -32202 configure cleanup: eahc plugin shall register its own menus +32203 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 32202) +++ trunk/src/Makefile.dep (revision 32203) @@ -3639,7 +3639,7 @@ plug_import.h ../src_plugins/import_sch2/import_sch_conf.h \ ../src_plugins/import_sch2/import_sch_dlg.c \ ../src_plugins/import_sch2/import_sch_conf_fields.h -../src_plugins/import_tinycad/tinycad.o: \ +../src_plugins/import_tinycad/tinycad.o: ../src_plugins/import_tinycad/menu_internal.c \ ../src_plugins/import_tinycad/tinycad.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 32202) +++ trunk/src/pcb-menu-default.lht (revision 32203) @@ -75,7 +75,6 @@ - @import_sch ha:Load netlist file = { action=Load(Netlist) } - ha:Load TinyCAD .net file = { action=LoadTinyCADFrom() } ha:Load Calay .net+.cmp files = { action=LoadCalayFrom() } ha:Load LTSpice .net and .asc files = { action=LoadLTSpiceFrom() } ha:Load FreePCB netlist (EasyEDA) = { action=LoadFpcbnlFrom() } Index: trunk/src_plugins/import_tinycad/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_tinycad/Plug.tmpasm (revision 32202) +++ trunk/src_plugins/import_tinycad/Plug.tmpasm (revision 32203) @@ -1,5 +1,7 @@ put /local/pcb/mod {import_tinycad} put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_tinycad/tinycad.o @] +put /local/pcb/mod/MENUFILE {tinycad-menu.lht} +put /local/pcb/mod/MENUVAR {tinycad_menu} switch /local/pcb/import_tinycad/controls case {buildin} include /local/pcb/tmpasm/buildin; end; Index: trunk/src_plugins/import_tinycad/tinycad-menu.lht =================================================================== --- trunk/src_plugins/import_tinycad/tinycad-menu.lht (nonexistent) +++ trunk/src_plugins/import_tinycad/tinycad-menu.lht (revision 32203) @@ -0,0 +1,9 @@ +ha:rnd-menu-v1 { + li:anchored { + ha:@import_sch { + li:submenu { + ha:Load TinyCAD .net file = { action=LoadTinyCADFrom() } + } + } + } +} \ No newline at end of file Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 32202) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 32203) @@ -41,11 +41,13 @@ #include #include #include - +#include #include #include #include +#include "menu_internal.c" + static const char *tinycad_cookie = "tinycad importer"; /* remove leading whitespace */ @@ -253,6 +255,7 @@ { rnd_remove_actions_by_cookie(tinycad_cookie); RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_tinycad); + rnd_hid_menu_unload(rnd_gui, tinycad_cookie); } int pplg_init_import_tinycad(void) @@ -274,5 +277,6 @@ RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_tinycad); RND_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie) + rnd_hid_menu_load(rnd_gui, NULL, tinycad_cookie, 175, NULL, 0, tinycad_menu, "plugin: import tinycad"); return 0; }