Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 23645) +++ trunk/src/font_act.c (revision 23646) @@ -66,7 +66,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load PCB font file...", "Picks a PCB font file to load.\n", - default_file, ".font", "pcbfont", HID_FILESELECT_READ); + default_file, ".font", "pcbfont", PCB_HID_FSD_READ); if (fname == NULL) return 0; /* cancel */ if (default_file != NULL) { @@ -138,7 +138,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Save PCB font file...", "Picks a PCB font file to save.\n", - default_file, ".font", "pcbfont", HID_FILESELECT_MAY_NOT_EXIST); + default_file, ".font", "pcbfont", PCB_HID_FSD_MAY_NOT_EXIST); if (fname == NULL) PCB_ACT_FAIL(save_font_to); if (default_file != NULL) { Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 23645) +++ trunk/src/hid.h (revision 23646) @@ -116,7 +116,7 @@ /* Prompts the user for a filename or directory name. For GUI HID's this would mean a file select dialog box. The 'flags' argument is the bitwise OR of the following values. */ - HID_FILESELECT_READ = 1, + PCB_HID_FSD_READ = 1, /* The function calling hid->fileselect will deal with the case where the selected file already exists. If not given, then the @@ -123,13 +123,13 @@ GUI will prompt with an "overwrite?" prompt. Only used when writing. */ - HID_FILESELECT_MAY_NOT_EXIST = 2, + PCB_HID_FSD_MAY_NOT_EXIST = 2, /* The call is supposed to return a file template (for gerber output for example) instead of an actual file. Only used when writing. */ - HID_FILESELECT_IS_TEMPLATE = 4 + PCB_HID_FSD_IS_TEMPLATE = 4 } pcb_hid_fsd_flags_t; /* Optional fields of a menu item; all non-NULL fields are strdup'd in the HID. */ Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 23645) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 23646) @@ -102,7 +102,7 @@ fname = pcb_gui->fileselect("Save window geometry to...", "Pick a file for saving window geometry to.\n", - "win_geo.lht", ".lht", "wingeo", HID_FILESELECT_MAY_NOT_EXIST); + "win_geo.lht", ".lht", "wingeo", PCB_HID_FSD_MAY_NOT_EXIST); if (fname == NULL) return; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 23645) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 23646) @@ -468,7 +468,7 @@ FILE *f; void *load_ctx; - fn = pcb_gui->fileselect("Load view list", "Load all views from the list", "view.lht", "lht", "view", HID_FILESELECT_READ); + fn = pcb_gui->fileselect("Load view list", "Load all views from the list", "view.lht", "lht", "view", PCB_HID_FSD_READ); if (fn == NULL) return; Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 23645) +++ trunk/src_plugins/export_openems/mesh.c (revision 23646) @@ -957,7 +957,7 @@ fname = pcb_gui->fileselect("Save mesh settings...", "Picks file for saving mesh settings.\n", - default_file, ".lht", "mesh", HID_FILESELECT_MAY_NOT_EXIST); + default_file, ".lht", "mesh", PCB_HID_FSD_MAY_NOT_EXIST); if (fname == NULL) return; /* cancel */ @@ -989,7 +989,7 @@ fname = pcb_gui->fileselect("Load mesh settings...", "Picks file for loading mesh settings from.\n", - default_file, ".lht", "mesh", HID_FILESELECT_READ); + default_file, ".lht", "mesh", PCB_HID_FSD_READ); if (fname == NULL) return; /* cancel */ Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 23645) +++ trunk/src_plugins/import_calay/calay.c (revision 23646) @@ -203,7 +203,7 @@ if (!fname_net || !*fname_net) { fname_net = pcb_gui->fileselect("Load calay netlist file...", "Picks a calay netlist file to load.\n", - default_file, NETEXT, "calay", HID_FILESELECT_READ); + default_file, NETEXT, "calay", PCB_HID_FSD_READ); if (fname_net == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 23645) +++ trunk/src_plugins/import_dsn/dsn.c (revision 23646) @@ -223,7 +223,7 @@ "Load a routed dsn or ses file...", "Select dsn or ses file to load.\nThe file could be generated using the tool downloaded from freeroute.net\n", NULL, /* default file name */ - ".dsn", "dsn", HID_FILESELECT_READ); + ".dsn", "dsn", PCB_HID_FSD_READ); if (fname == NULL) return 1; } Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 23645) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 23646) @@ -172,7 +172,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load freepcb netlist...", "Picks a freepcb netlist file to load.\n", - default_file, ".net", "freepcb", HID_FILESELECT_READ); + default_file, ".net", "freepcb", PCB_HID_FSD_READ); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 23645) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 23646) @@ -158,7 +158,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load HP-GL file...", "Picks a HP-GL plot file to load.\n", - default_file, ".hpgl", "hpgl", HID_FILESELECT_READ); + default_file, ".hpgl", "hpgl", PCB_HID_FSD_READ); if (fname == NULL) return 0; /* cancel */ if (default_file != NULL) { Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 23645) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 23646) @@ -368,7 +368,7 @@ if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect("Load IPC-D-356 netlist...", "Pick an IPC-D-356 netlist file.\n", - default_file, ".net", "ipcd356", HID_FILESELECT_READ); + default_file, ".net", "ipcd356", PCB_HID_FSD_READ); if (fname == NULL) { PCB_ACT_IRES(1); return 0; Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 23645) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 23646) @@ -277,7 +277,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load ltspice net+asc file pair...", "Picks a ltspice mentor net or asc file to load.\n", - default_file, ".asc", "ltspice", HID_FILESELECT_READ); + default_file, ".asc", "ltspice", PCB_HID_FSD_READ); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 23645) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 23646) @@ -266,7 +266,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load mentor edf netlist file...", "Picks a mentor edf file to load.\n", - default_file, ".edf", "mentor_sch", HID_FILESELECT_READ); + default_file, ".edf", "mentor_sch", PCB_HID_FSD_READ); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 23645) +++ trunk/src_plugins/import_mucs/mucs.c (revision 23646) @@ -76,7 +76,7 @@ fname = pcb_gui->fileselect("Load mucs routing session Resource File...", "Picks a mucs session resource file to load.\n" "This file could be generated by mucs-pcb\n", - default_file, ".l1", "unixplot", HID_FILESELECT_READ); + default_file, ".l1", "unixplot", PCB_HID_FSD_READ); if (fname == NULL) { PCB_ACT_IRES(1); return 0; Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 23645) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 23646) @@ -181,7 +181,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load tinycad netlist file...", "Picks a tinycad netlist file to load.\n", - default_file, ".net", "tinycad", HID_FILESELECT_READ); + default_file, ".net", "tinycad", PCB_HID_FSD_READ); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 23645) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 23646) @@ -79,7 +79,7 @@ if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(_("Load .hyp file..."), - _("Picks a hyperlynx file to load.\n"), "default.hyp", ".hyp", "hyp", HID_FILESELECT_READ); + _("Picks a hyperlynx file to load.\n"), "default.hyp", ".hyp", "hyp", PCB_HID_FSD_READ); } if (fname == NULL) { Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 23645) +++ trunk/src_plugins/io_kicad/read_net.c (revision 23646) @@ -225,7 +225,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect("Load eeschema netlist file...", "Picks a eeschema netlist file to load.\n", - default_file, ".net", "eeschema", HID_FILESELECT_READ); + default_file, ".net", "eeschema", PCB_HID_FSD_READ); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 23645) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 23646) @@ -114,7 +114,7 @@ if ((fname == NULL) || (*fname == '\0')) { \ fname = pcb_gui->fileselect("Load tedax " #type " file...", \ "Picks a tedax " #type " file to load.\n", \ - default_file, ".tdx", "tedax-" #type, HID_FILESELECT_READ); \ + default_file, ".tdx", "tedax-" #type, PCB_HID_FSD_READ); \ if (fname == NULL) \ return 1; \ if (default_file != NULL) { \ Index: trunk/src_plugins/lib_gtk_common/dlg_file_chooser.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_file_chooser.c (revision 23645) +++ trunk/src_plugins/lib_gtk_common/dlg_file_chooser.c (revision 23646) @@ -364,7 +364,7 @@ dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(top_window), - (flags & HID_FILESELECT_READ) ? + (flags & PCB_HID_FSD_READ) ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); @@ -378,7 +378,7 @@ if (base && *base) { /* default file is only supposed to be for writing, not reading */ - if (!(flags & HID_FILESELECT_READ)) { + if (!(flags & PCB_HID_FSD_READ)) { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), base); } g_free(base); Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 23645) +++ trunk/src_plugins/script/script_act.c (revision 23646) @@ -159,7 +159,7 @@ { script_dlg_t *ctx = caller_data; int failed; - char *tmp, *fn = pcb_gui->fileselect("script to load", "Select a script file to load", NULL, NULL, "script", HID_FILESELECT_READ); + char *tmp, *fn = pcb_gui->fileselect("script to load", "Select a script file to load", NULL, NULL, "script", PCB_HID_FSD_READ); pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; typedef struct { PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 23645) +++ trunk/src_plugins/vendordrill/vendor.c (revision 23646) @@ -150,7 +150,7 @@ _("Picks a vendor resource file to load.\n" "This file can contain drc settings for a\n" "particular vendor as well as a list of\n" - "predefined drills which are allowed."), default_file, ".res", "vendor", HID_FILESELECT_READ); + "predefined drills which are allowed."), default_file, ".res", "vendor", PCB_HID_FSD_READ); if (fname == NULL) { PCB_ACT_IRES(1); return 0;