Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 32203)
+++ trunk/scconfig/Rev.h	(revision 32204)
@@ -1 +1 @@
-static const int myrev = 32203;
+static const int myrev = 32204;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 32203)
+++ trunk/scconfig/Rev.tab	(revision 32204)
@@ -1,4 +1,4 @@
-32203	configure	cleanup: eahc plugin shall register its own menus
+32204	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 32203)
+++ trunk/src/Makefile.dep	(revision 32204)
@@ -3121,6 +3121,7 @@
  ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
  librnd/core/hid_init.h ../src_3rd/genvector/vtp0.h
 ../src_plugins/import_calay/calay.o: ../src_plugins/import_calay/calay.c \
+ ../src_plugins/import_calay/menu_internal.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 librnd/core/unit.h attrib.h \
Index: trunk/src/pcb-menu-default.lht
===================================================================
--- trunk/src/pcb-menu-default.lht	(revision 32203)
+++ trunk/src/pcb-menu-default.lht	(revision 32204)
@@ -75,7 +75,6 @@
 						-
 						@import_sch
 						ha:Load netlist file                 = {                             action=Load(Netlist) }
-						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_calay/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_calay/Plug.tmpasm	(revision 32203)
+++ trunk/src_plugins/import_calay/Plug.tmpasm	(revision 32204)
@@ -1,5 +1,7 @@
 put /local/pcb/mod {import_calay}
 put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_calay/calay.o @]
+put /local/pcb/mod/MENUFILE {calay-menu.lht}
+put /local/pcb/mod/MENUVAR {calay_menu}
 
 switch /local/pcb/import_calay/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
Index: trunk/src_plugins/import_calay/calay-menu.lht
===================================================================
--- trunk/src_plugins/import_calay/calay-menu.lht	(nonexistent)
+++ trunk/src_plugins/import_calay/calay-menu.lht	(revision 32204)
@@ -0,0 +1,9 @@
+ha:rnd-menu-v1 {
+	li:anchored {
+		ha:@import_sch {
+			li:submenu {
+				ha:Load Calay .net+.cmp files = { action=LoadCalayFrom() }
+			}
+		}
+	}
+}
\ No newline at end of file
Index: trunk/src_plugins/import_calay/calay.c
===================================================================
--- trunk/src_plugins/import_calay/calay.c	(revision 32203)
+++ trunk/src_plugins/import_calay/calay.c	(revision 32204)
@@ -39,7 +39,7 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-
+#include <librnd/core/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/hid.h>
@@ -47,6 +47,8 @@
 #define NETEXT ".net"
 #define CMPEXT ".cmp"
 
+#include "menu_internal.c"
+
 static const char *calay_cookie = "calay importer";
 
 /* remove leading whitespace */
@@ -269,6 +271,7 @@
 {
 	rnd_remove_actions_by_cookie(calay_cookie);
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_calay);
+	rnd_hid_menu_unload(rnd_gui, calay_cookie);
 }
 
 int pplg_init_import_calay(void)
@@ -291,5 +294,6 @@
 
 
 	RND_REGISTER_ACTIONS(calay_action_list, calay_cookie)
+	rnd_hid_menu_load(rnd_gui, NULL, calay_cookie, 170, NULL, 0, calay_menu, "plugin: import calay");
 	return 0;
 }