Index: trunk/src_plugins/dialogs/dialogs.c =================================================================== --- trunk/src_plugins/dialogs/dialogs.c (revision 29989) +++ trunk/src_plugins/dialogs/dialogs.c (revision 29990) @@ -86,7 +86,6 @@ {"PrintCalibrate", pcb_act_PrintCalibrate, pcb_acth_PrintCalibrate, pcb_acts_PrintCalibrate}, {"Load", pcb_act_Load, pcb_acth_Load, pcb_acts_Load}, {"Save", pcb_act_Save, pcb_acth_Save, pcb_acts_Save}, - {"ImportGUI", pcb_act_ImportGUI, pcb_acth_ImportGUI, pcb_acts_ImportGUI}, {"LibraryDialog", pcb_act_LibraryDialog, pcb_acth_LibraryDialog, pcb_acts_LibraryDialog}, {"SearchDialog", pcb_act_SearchDialog, pcb_acth_SearchDialog, pcb_acts_SearchDialog}, {"InfoBarFileChanged", pcb_act_InfoBarFileChanged, pcb_acth_InfoBarFileChanged, pcb_acts_InfoBarFileChanged} Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 29989) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 29990) @@ -616,33 +616,3 @@ PCB_ACT_IRES(0); return 0; } - -const char pcb_acts_ImportGUI[] = "ImportGUI()"; -const char pcb_acth_ImportGUI[] = "Asks user which schematics to import into PCB.\n"; -/* DOC: importgui.html */ -fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - char *name; - static char *cwd = NULL; - static int lock = 0; - int rv = 0; - - if (cwd == NULL) - cwd = dup_cwd(); - - if (lock) - return 1; - - name = pcb_gui->fileselect(pcb_gui, "Load schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", PCB_HID_FSD_MAY_NOT_EXIST, NULL); - if (name != NULL) { - pcb_attrib_put(PCB, "import::src0", name); - free(name); - - lock = 1; - rv = pcb_action(&PCB->hidlib, "Import"); - lock = 0; - } - - PCB_ACT_IRES(rv); - return 0; -} Index: trunk/src_plugins/dialogs/dlg_loadsave.h =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.h (revision 29989) +++ trunk/src_plugins/dialogs/dlg_loadsave.h (revision 29990) @@ -5,7 +5,3 @@ extern const char pcb_acts_Save[]; extern const char pcb_acth_Save[]; fgw_error_t pcb_act_Save(fgw_arg_t *res, int argc, fgw_arg_t *argv); - -extern const char pcb_acts_ImportGUI[]; -extern const char pcb_acth_ImportGUI[]; -fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv); Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 29989) +++ trunk/src_plugins/oldactions/oldactions.c (revision 29990) @@ -284,6 +284,16 @@ return 0; } +static const char pcb_acts_ImportGUI[] = "ImportGUI()"; +static const char pcb_acth_ImportGUI[] = "Asks user which schematics to import into PCB.\n"; +/* DOC: importgui.html */ +static fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv) +{ + pcb_message(PCB_MSG_ERROR, "The ImportGUI() action is deprecated. Using ImportSch() instead.\n"); + PCB_ACT_IRES(pcb_actionva(PCB_ACT_HIDLIB, "ImportSch", NULL)); + return 0; +} + /*** deprecated ***/ static fgw_error_t pcb_act_ToggleHideName(fgw_arg_t *res, int argc, fgw_arg_t *argv) @@ -360,6 +370,7 @@ {"NetlistChanged", pcb_act_NetlistChanged, pcb_acth_NetlistChanged, pcb_acts_NetlistChanged}, {"RouteStylesChanged", pcb_act_RouteStylesChanged, pcb_acth_RouteStylesChanged, pcb_acts_RouteStylesChanged}, {"LibraryChanged", pcb_act_LibraryChanged, pcb_acth_LibraryChanged, pcb_acts_LibraryChanged}, + {"ImportGUI", pcb_act_ImportGUI, pcb_acth_ImportGUI, pcb_acts_ImportGUI}, /* deprecated actions */ {"ToggleHideName", pcb_act_ToggleHideName, 0, 0},