Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5042) +++ trunk/doc-rnd/hacking/renames (revision 5043) @@ -987,3 +987,26 @@ FCT_START -> PCB_FCT_START find_callback_t -> pcb_find_callback_t find_callback -> pcb_find_callback +SHOWNUMBERFLAG -> PCB_SHOWNUMBERFLAG +LOCALREFFLAG -> PCB_LOCALREFFLAG +CHECKPLANESFLAG -> PCB_CHECKPLANESFLAG +SHOWPCB_FLAG_DRC -> PCB_SHOWPCB_FLAG_DRC +RUBBERBANDFLAG -> PCB_RUBBERBANDFLAG +DESCRIPTIONFLAG -> PCB_DESCRIPTIONFLAG +NAMEONPCBFLAG -> PCB_NAMEONPCBFLAG +AUTOPCB_FLAG_DRC -> PCB_AUTOPCB_FLAG_DRC +ALLDIRECTIONFLAG -> PCB_ALLDIRECTIONFLAG +SWAPSTARTDIRFLAG -> PCB_SWAPSTARTDIRFLAG +UNIQUENAMEFLAG -> PCB_UNIQUENAMEFLAG +CLEARNEWFLAG -> PCB_CLEARNEWFLAG +SNAPPCB_FLAG_PIN -> PCB_SNAPPCB_FLAG_PIN +SHOWMASKFLAG -> PCB_SHOWMASKFLAG +THINDRAWFLAG -> PCB_THINDRAWFLAG +ORTHOMOVEFLAG -> PCB_ORTHOMOVEFLAG +LIVEROUTEFLAG -> PCB_LIVEROUTEFLAG +THINDRAWPOLYFLAG -> PCB_THINDRAWPOLYFLAG +LOCKNAMESFLAG -> PCB_LOCKNAMESFLAG +ONLYNAMESFLAG -> PCB_ONLYNAMESFLAG +NEWPCB_FLAG_FULLPOLY -> PCB_NEWPCB_FLAG_FULLPOLY +HIDENAMESFLAG -> PCB_HIDENAMESFLAG +ENABLEPCB_FLAG_MINCUT -> PCB_ENABLEPCB_FLAG_MINCUT Index: trunk/src/flag.h =================================================================== --- trunk/src/flag.h (revision 5042) +++ trunk/src/flag.h (revision 5043) @@ -158,29 +158,29 @@ #define PCB_FLAGS 0x01ffffff /* all used flags */ -#define SHOWNUMBERFLAG 0x00000001 -#define LOCALREFFLAG 0x00000002 -#define CHECKPLANESFLAG 0x00000004 -#define SHOWPCB_FLAG_DRC 0x00000008 -#define RUBBERBANDFLAG 0x00000010 -#define DESCRIPTIONFLAG 0x00000020 -#define NAMEONPCBFLAG 0x00000040 -#define AUTOPCB_FLAG_DRC 0x00000080 -#define ALLDIRECTIONFLAG 0x00000100 -#define SWAPSTARTDIRFLAG 0x00000200 -#define UNIQUENAMEFLAG 0x00000400 -#define CLEARNEWFLAG 0x00000800 -#define SNAPPCB_FLAG_PIN 0x00001000 -#define SHOWMASKFLAG 0x00002000 -#define THINDRAWFLAG 0x00004000 -#define ORTHOMOVEFLAG 0x00008000 -#define LIVEROUTEFLAG 0x00010000 -#define THINDRAWPOLYFLAG 0x00020000 -#define LOCKNAMESFLAG 0x00040000 -#define ONLYNAMESFLAG 0x00080000 -#define NEWPCB_FLAG_FULLPOLY 0x00100000 -#define HIDENAMESFLAG 0x00200000 -#define ENABLEPCB_FLAG_MINCUT 0x00400000 +#define PCB_SHOWNUMBERFLAG 0x00000001 +#define PCB_LOCALREFFLAG 0x00000002 +#define PCB_CHECKPLANESFLAG 0x00000004 +#define PCB_SHOWPCB_FLAG_DRC 0x00000008 +#define PCB_RUBBERBANDFLAG 0x00000010 +#define PCB_DESCRIPTIONFLAG 0x00000020 +#define PCB_NAMEONPCBFLAG 0x00000040 +#define PCB_AUTOPCB_FLAG_DRC 0x00000080 +#define PCB_ALLDIRECTIONFLAG 0x00000100 +#define PCB_SWAPSTARTDIRFLAG 0x00000200 +#define PCB_UNIQUENAMEFLAG 0x00000400 +#define PCB_CLEARNEWFLAG 0x00000800 +#define PCB_SNAPPCB_FLAG_PIN 0x00001000 +#define PCB_SHOWMASKFLAG 0x00002000 +#define PCB_THINDRAWFLAG 0x00004000 +#define PCB_ORTHOMOVEFLAG 0x00008000 +#define PCB_LIVEROUTEFLAG 0x00010000 +#define PCB_THINDRAWPOLYFLAG 0x00020000 +#define PCB_LOCKNAMESFLAG 0x00040000 +#define PCB_ONLYNAMESFLAG 0x00080000 +#define PCB_NEWPCB_FLAG_FULLPOLY 0x00100000 +#define PCB_HIDENAMESFLAG 0x00200000 +#define PCB_ENABLEPCB_FLAG_MINCUT 0x00400000 Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 5042) +++ trunk/src/flag_str.c (revision 5043) @@ -542,29 +542,29 @@ #define N(x) x, sizeof(x)-1 static pcb_flag_bits_t pcb_flagbits[] = { - {SHOWNUMBERFLAG, N("shownumber"), 1}, - {LOCALREFFLAG, N("localref"), 1}, - {CHECKPLANESFLAG, N("checkplanes"), 1}, - {SHOWPCB_FLAG_DRC, N("showdrc"), 1}, - {RUBBERBANDFLAG, N("rubberband"), 1}, - {DESCRIPTIONFLAG, N("description"), 1}, - {NAMEONPCBFLAG, N("nameonpcb"), 1}, - {AUTOPCB_FLAG_DRC, N("autodrc"), 1}, - {ALLDIRECTIONFLAG, N("alldirection"), 1}, - {SWAPSTARTDIRFLAG, N("swapstartdir"), 1}, - {UNIQUENAMEFLAG, N("uniquename"), 1}, - {CLEARNEWFLAG, N("clearnew"), 1}, - {NEWPCB_FLAG_FULLPOLY, N("newfullpoly"), 1}, - {SNAPPCB_FLAG_PIN, N("snappin"), 1}, - {SHOWMASKFLAG, N("showmask"), 1}, - {THINDRAWFLAG, N("thindraw"), 1}, - {ORTHOMOVEFLAG, N("orthomove"), 1}, - {LIVEROUTEFLAG, N("liveroute"), 1}, - {THINDRAWPOLYFLAG, N("thindrawpoly"), 1}, - {LOCKNAMESFLAG, N("locknames"), 1}, - {ONLYNAMESFLAG, N("onlynames"), 1}, - {HIDENAMESFLAG, N("hidenames"), 1}, - {ENABLEPCB_FLAG_MINCUT, N("enablemincut"), 1}, + {PCB_SHOWNUMBERFLAG, N("shownumber"), 1}, + {PCB_LOCALREFFLAG, N("localref"), 1}, + {PCB_CHECKPLANESFLAG, N("checkplanes"), 1}, + {PCB_SHOWPCB_FLAG_DRC, N("showdrc"), 1}, + {PCB_RUBBERBANDFLAG, N("rubberband"), 1}, + {PCB_DESCRIPTIONFLAG, N("description"), 1}, + {PCB_NAMEONPCBFLAG, N("nameonpcb"), 1}, + {PCB_AUTOPCB_FLAG_DRC, N("autodrc"), 1}, + {PCB_ALLDIRECTIONFLAG, N("alldirection"), 1}, + {PCB_SWAPSTARTDIRFLAG, N("swapstartdir"), 1}, + {PCB_UNIQUENAMEFLAG, N("uniquename"), 1}, + {PCB_CLEARNEWFLAG, N("clearnew"), 1}, + {PCB_NEWPCB_FLAG_FULLPOLY, N("newfullpoly"), 1}, + {PCB_SNAPPCB_FLAG_PIN, N("snappin"), 1}, + {PCB_SHOWMASKFLAG, N("showmask"), 1}, + {PCB_THINDRAWFLAG, N("thindraw"), 1}, + {PCB_ORTHOMOVEFLAG, N("orthomove"), 1}, + {PCB_LIVEROUTEFLAG, N("liveroute"), 1}, + {PCB_THINDRAWPOLYFLAG, N("thindrawpoly"), 1}, + {PCB_LOCKNAMESFLAG, N("locknames"), 1}, + {PCB_ONLYNAMESFLAG, N("onlynames"), 1}, + {PCB_HIDENAMESFLAG, N("hidenames"), 1}, + {PCB_ENABLEPCB_FLAG_MINCUT, N("enablemincut"), 1}, }; #undef N Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 5042) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 5043) @@ -16,28 +16,28 @@ static flag_tr_t flags[] = { #warning TODO: get these from conf #if 0 - {1, FL_SHOWNUMBER, SHOWNUMBERFLAG}, - {1, FL_LOCALREF, LOCALREFFLAG}, - {1, FL_CHECKPLANS, CHECKPLANESFLAG}, - {1, FL_SHOWDRC, SHOWPCB_FLAG_DRC}, - {1, FL_RUBBERBAND, RUBBERBANDFLAG}, - {1, FL_DESCRIPTION, DESCRIPTIONFLAG}, - {1, FL_NAMEONPCB, NAMEONPCBFLAG}, - {1, FL_AUTODRC, AUTOPCB_FLAG_DRC}, - {1, FL_ALLDIRECTION, ALLDIRECTIONFLAG}, - {1, FL_SWAPSTARTDIR, SWAPSTARTDIRFLAG}, - {1, FL_UNIQUENAME, UNIQUENAMEFLAG}, - {1, FL_CLEARNEW, CLEARNEWFLAG}, - {1, FL_SNAPPIN, SNAPPCB_FLAG_PIN}, - {1, FL_SHOWMASK, SHOWMASKFLAG}, - {1, FL_THINDRAW, THINDRAWFLAG}, - {1, FL_ORTHOMOVE, ORTHOMOVEFLAG}, - {1, FL_LIVEROUTE, LIVEROUTEFLAG}, - {1, FL_THINDRAWPOLY, THINDRAWPOLYFLAG}, - {1, FL_LOCKNAMES, LOCKNAMESFLAG}, - {1, FL_ONLYNAMES, ONLYNAMESFLAG}, - {1, FL_NEWFULLPOLY, NEWPCB_FLAG_FULLPOLY}, - {1, FL_HIDENAMES, HIDENAMESFLAG}, + {1, FL_SHOWNUMBER, PCB_SHOWNUMBERFLAG}, + {1, FL_LOCALREF, PCB_LOCALREFFLAG}, + {1, FL_CHECKPLANS, PCB_CHECKPLANESFLAG}, + {1, FL_SHOWDRC, PCB_SHOWPCB_FLAG_DRC}, + {1, FL_RUBBERBAND, PCB_RUBBERBANDFLAG}, + {1, FL_DESCRIPTION, PCB_DESCRIPTIONFLAG}, + {1, FL_NAMEONPCB, PCB_NAMEONPCBFLAG}, + {1, FL_AUTODRC, PCB_AUTOPCB_FLAG_DRC}, + {1, FL_ALLDIRECTION, PCB_ALLDIRECTIONFLAG}, + {1, FL_SWAPSTARTDIR, PCB_SWAPSTARTDIRFLAG}, + {1, FL_UNIQUENAME, PCB_UNIQUENAMEFLAG}, + {1, FL_CLEARNEW, PCB_CLEARNEWFLAG}, + {1, FL_SNAPPIN, PCB_SNAPPCB_FLAG_PIN}, + {1, FL_SHOWMASK, PCB_SHOWMASKFLAG}, + {1, FL_THINDRAW, PCB_THINDRAWFLAG}, + {1, FL_ORTHOMOVE, PCB_ORTHOMOVEFLAG}, + {1, FL_LIVEROUTE, PCB_LIVEROUTEFLAG}, + {1, FL_THINDRAWPOLY, PCB_THINDRAWPOLYFLAG}, + {1, FL_LOCKNAMES, PCB_LOCKNAMESFLAG}, + {1, FL_ONLYNAMES, PCB_ONLYNAMESFLAG}, + {1, FL_NEWFULLPOLY, PCB_NEWPCB_FLAG_FULLPOLY}, + {1, FL_HIDENAMES, PCB_HIDENAMESFLAG}, #endif {0, FL_THERMALSTYLE1, 1}, Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5042) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5043) @@ -130,7 +130,7 @@ return PCB->InvisibleObjectsOn; case SL_MASK: if (SL_MYSIDE(idx)) - return PCB_FLAG_TEST(SHOWMASKFLAG, PCB); + return PCB_FLAG_TEST(PCB_SHOWMASKFLAG, PCB); return 0; case SL_SILK: priv->trans_lines = pcb_true; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 5042) +++ trunk/src_plugins/io_pcb/file.c (revision 5043) @@ -208,29 +208,29 @@ /* set binary flags from conf hash; these flags used to be checked with PCB_FLAG_TEST() but got moved to the conf system */ - conf_update_pcb_flag(&pcb_flags, "plugins/mincut/enable", ENABLEPCB_FLAG_MINCUT); - conf_update_pcb_flag(&pcb_flags, "editor/show_number", SHOWNUMBERFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/show_drc", SHOWPCB_FLAG_DRC); - conf_update_pcb_flag(&pcb_flags, "editor/rubber_band_mode", RUBBERBANDFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/auto_drc", AUTOPCB_FLAG_DRC); - conf_update_pcb_flag(&pcb_flags, "editor/all_direction_lines", ALLDIRECTIONFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/swap_start_direction", SWAPSTARTDIRFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/unique_names", UNIQUENAMEFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/clear_line", CLEARNEWFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/full_poly", NEWPCB_FLAG_FULLPOLY); - conf_update_pcb_flag(&pcb_flags, "editor/snap_pin", SNAPPCB_FLAG_PIN); - conf_update_pcb_flag(&pcb_flags, "editor/orthogonal_moves", ORTHOMOVEFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/live_routing", LIVEROUTEFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/lock_names", LOCKNAMESFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/only_names", ONLYNAMESFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/hide_names", HIDENAMESFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/thin_draw", THINDRAWFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/thin_draw_poly", THINDRAWPOLYFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/local_ref", LOCALREFFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/check_planes",CHECKPLANESFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/description", DESCRIPTIONFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/name_on_pcb", NAMEONPCBFLAG); - conf_update_pcb_flag(&pcb_flags, "editor/show_mask", SHOWMASKFLAG); + conf_update_pcb_flag(&pcb_flags, "plugins/mincut/enable", PCB_ENABLEPCB_FLAG_MINCUT); + conf_update_pcb_flag(&pcb_flags, "editor/show_number", PCB_SHOWNUMBERFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/show_drc", PCB_SHOWPCB_FLAG_DRC); + conf_update_pcb_flag(&pcb_flags, "editor/rubber_band_mode", PCB_RUBBERBANDFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/auto_drc", PCB_AUTOPCB_FLAG_DRC); + conf_update_pcb_flag(&pcb_flags, "editor/all_direction_lines", PCB_ALLDIRECTIONFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/swap_start_direction", PCB_SWAPSTARTDIRFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/unique_names", PCB_UNIQUENAMEFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/clear_line", PCB_CLEARNEWFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/full_poly", PCB_NEWPCB_FLAG_FULLPOLY); + conf_update_pcb_flag(&pcb_flags, "editor/snap_pin", PCB_SNAPPCB_FLAG_PIN); + conf_update_pcb_flag(&pcb_flags, "editor/orthogonal_moves", PCB_ORTHOMOVEFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/live_routing", PCB_LIVEROUTEFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/lock_names", PCB_LOCKNAMESFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/only_names", PCB_ONLYNAMESFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/hide_names", PCB_HIDENAMESFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/thin_draw", PCB_THINDRAWFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/thin_draw_poly", PCB_THINDRAWPOLYFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/local_ref", PCB_LOCALREFFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/check_planes",PCB_CHECKPLANESFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/description", PCB_DESCRIPTIONFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/name_on_pcb", PCB_NAMEONPCBFLAG); + conf_update_pcb_flag(&pcb_flags, "editor/show_mask", PCB_SHOWMASKFLAG); fprintf(FP, "\n# To read pcb files, the pcb version (or the git source date) must be >= the file version\n"); fprintf(FP, "FileVersion[%i]\n", PCBFileVersionNeeded()); Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 5042) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 5043) @@ -2516,29 +2516,29 @@ setlocale(LC_ALL, ""); if ((settings_dest != CFR_invalid) && (retval == 0)) { /* overwrite settings from the flags, mark them not-to-save */ - CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_mask", -1, CONF_BOOL_FLAG(SHOWMASKFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(PCB_RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(PCB_AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(PCB_ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(PCB_SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(PCB_UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(PCB_CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(PCB_NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(PCB_SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(PCB_ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(PCB_LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(PCB_LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(PCB_ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(PCB_HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(PCB_THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(PCB_THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(PCB_LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(PCB_CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(PCB_DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(PCB_NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_mask", -1, CONF_BOOL_FLAG(PCB_SHOWMASKFLAG, yy_pcb_flags), POL_OVERWRITE); /* don't save this because it is saved manually as PCB::grid::unit */ CONF_NO_ATTRIB("editor/grid_unit"); Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 5042) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 5043) @@ -375,29 +375,29 @@ setlocale(LC_ALL, ""); if ((settings_dest != CFR_invalid) && (retval == 0)) { /* overwrite settings from the flags, mark them not-to-save */ - CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE); - CONF_SET(settings_dest, "editor/show_mask", -1, CONF_BOOL_FLAG(SHOWMASKFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(PCB_RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(PCB_AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(PCB_ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(PCB_SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(PCB_UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(PCB_CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(PCB_NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(PCB_SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(PCB_ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(PCB_LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(PCB_LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(PCB_ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(PCB_HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(PCB_THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(PCB_THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(PCB_LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(PCB_CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(PCB_DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(PCB_NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE); + CONF_SET(settings_dest, "editor/show_mask", -1, CONF_BOOL_FLAG(PCB_SHOWMASKFLAG, yy_pcb_flags), POL_OVERWRITE); /* don't save this because it is saved manually as PCB::grid::unit */ CONF_NO_ATTRIB("editor/grid_unit"); Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 5042) +++ trunk/src_plugins/toporouter/toporouter.c (revision 5043) @@ -5532,7 +5532,7 @@ gdouble d = 0.; pcb_line_t *line; line = pcb_line_new_merge(LAYER_PTR(layer), x0, y0, x1, y1, - thickness, clearance, pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); + thickness, clearance, pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(PCB_CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (line) { pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(layer), line, line); @@ -5581,7 +5581,7 @@ arc = pcb_arc_new(LAYER_PTR(layer), vx(a->centre), vy(a->centre), a->r, a->r, sa, da, thickness, clearance, - pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); + pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(PCB_CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (arc) { pcb_undo_add_obj_to_create(PCB_TYPE_ARC, LAYER_PTR(layer), arc, arc);