Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 22162) +++ trunk/scconfig/Rev.h (revision 22163) @@ -1 +1 @@ -static const int myrev = 22119; +static const int myrev = 22163; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 22162) +++ trunk/scconfig/Rev.tab (revision 22163) @@ -1,3 +1,4 @@ +22163 configure removal of the old gtk-only preferences dialog code 22119 configure dialogs config for window placement 21977 configure new propedit 21972 configure boardflip plugin removed (core functionality took over) Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 22162) +++ trunk/src/Makefile.dep (revision 22163) @@ -1555,8 +1555,8 @@ ../src_plugins/lib_gtk_hid/render.h ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_hid/coord_conv.h compat_misc.h \ ../src_plugins/lib_gtk_hid/preview_helper.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h \ ../src_plugins/lib_hid_common/clip.h global_typedefs.h ../src_plugins/hid_gtk2_gdk/gtkhid-main.o: \ ../src_plugins/hid_gtk2_gdk/gtkhid-main.c ../config.h error.h \ @@ -1579,8 +1579,8 @@ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h event.h conf_hid.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \ @@ -1627,9 +1627,9 @@ vtpadstack_t.h draw.h layer.h hid_draw_helpers.h hid_attrib.h \ hid_color.h funchash_core.h funchash.h funchash_core_list.h \ ../src_plugins/lib_hid_common/clip.h global_typedefs.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h pcb-printf.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h conf.h pcb-printf.h \ ../src_3rd/liblihata/lihata.h list_conf.h conf.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h event.h conf_hid.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h hid.h event.h conf_hid.h \ ../src_plugins/lib_gtk_common/glue.h \ ../src_plugins/lib_gtk_common/compat.h ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ @@ -1674,8 +1674,8 @@ ../src_plugins/lib_hid_gl/draw_gl.h ../src_plugins/lib_hid_gl/opengl.h \ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h event.h conf_hid.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \ @@ -1741,8 +1741,8 @@ ../src_plugins/lib_gtk_hid/render.h ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_hid/coord_conv.h compat_misc.h \ ../src_plugins/lib_gtk_hid/preview_helper.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h \ ../src_plugins/lib_hid_common/clip.h global_typedefs.h ../src_plugins/hid_gtk3_cairo/gtkhid-main.o: \ ../src_plugins/hid_gtk3_cairo/gtkhid-main.c ../config.h error.h \ @@ -1765,8 +1765,8 @@ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h event.h conf_hid.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \ @@ -1811,8 +1811,8 @@ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h event.h conf_hid.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_hid/gui.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \ @@ -3424,7 +3424,7 @@ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ ../src_plugins/lib_gtk_common/util_str.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_hid_common/cli_history.h ../src_plugins/lib_gtk_common/bu_cursor_pos.o: \ ../src_plugins/lib_gtk_common/bu_cursor_pos.c ../config.h \ @@ -3546,7 +3546,7 @@ conf.h ../src_plugins/lib_gtk_common/compat.h \ ../src_plugins/lib_gtk_common/bu_mode_btn.data crosshair.h vtonpoint.h \ hid.h route.h conf_core.h tool.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h ../src_plugins/lib_gtk_common/bu_spin_button.o: \ ../src_plugins/lib_gtk_common/bu_spin_button.c ../config.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ @@ -3673,7 +3673,7 @@ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \ ../src_plugins/lib_gtk_common/win_place.h tool.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_common/dlg_library_param.h ../src_plugins/lib_gtk_common/dlg_library_param.o: \ ../src_plugins/lib_gtk_common/dlg_library_param.c ../config.h \ @@ -3722,7 +3722,7 @@ ../src_plugins/lib_gtk_common/win_place.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h conf.h ../src_plugins/lib_gtk_common/dlg_netlist.o: \ ../src_plugins/lib_gtk_common/dlg_netlist.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_netlist.h ../src_3rd/libfungw/fungw.h \ @@ -3754,7 +3754,7 @@ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h ../src_plugins/lib_gtk_common/dlg_route_style.o: \ ../src_plugins/lib_gtk_common/dlg_route_style.c ../config.h \ compat_misc.h compat_nls.h polygon.h flag.h globalconst.h rtree.h \ @@ -3839,9 +3839,9 @@ ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/in_keyboard.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h tool.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h event.h \ ../src_plugins/lib_gtk_common/glue.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/lib_gtk_common/in_keyboard.o: \ ../src_plugins/lib_gtk_common/in_keyboard.c ../config.h \ @@ -3910,7 +3910,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf.h ../src_plugins/lib_gtk_common/compat.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf_core.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h conf_core.h ../src_plugins/lib_gtk_common/ui_zoompan.o: \ ../src_plugins/lib_gtk_common/ui_zoompan.c ../config.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \ @@ -4102,9 +4102,9 @@ ../src_plugins/lib_gtk_common/compat.h pcb-printf.h board.h layer_grp.h \ library.h rats_patch.h board.h compat_nls.h \ ../src_plugins/lib_gtk_common/bu_status_line.h -../src_plugins/lib_gtk_config/gtk_conf_list.o: \ - ../src_plugins/lib_gtk_config/gtk_conf_list.c ../config.h \ - ../src_plugins/lib_gtk_config/gtk_conf_list.h conf.h global_typedefs.h \ +../src_plugins/lib_gtk_common/gtk_conf_list.o: \ + ../src_plugins/lib_gtk_common/gtk_conf_list.c ../config.h \ + ../src_plugins/lib_gtk_common/gtk_conf_list.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ @@ -4113,9 +4113,9 @@ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h compat_misc.h \ - ../src_plugins/lib_gtk_config/../lib_gtk_common/compat.h -../src_plugins/lib_gtk_config/gui-config.o: \ - ../src_plugins/lib_gtk_config/gui-config.c ../config.h conf_core.h \ + ../src_plugins/lib_gtk_common/../lib_gtk_common/compat.h +../src_plugins/lib_gtk_common/gui-config.o: \ + ../src_plugins/lib_gtk_common/gui-config.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ @@ -4124,7 +4124,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h globalconst.h color.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h error.h attrib.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h hid.h error.h attrib.h \ layer.h obj_common.h flag.h data_parent.h obj_arc_list.h obj_arc.h \ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \ @@ -4142,8 +4142,8 @@ plug_footprint.h vtlibrary.h data.h stub_draw.h draw.h compat_misc.h \ compat_nls.h fptr_cast.h safe_fs.h tool.h funchash_core.h funchash.h \ funchash_core_list.h ../src_3rd/liblihata/tree.h \ - ../src_plugins/lib_gtk_config/gtk_conf_list.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/gtk_conf_list.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ ../src_plugins/lib_gtk_common/compat.h \ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/wt_preview.h \ @@ -4158,9 +4158,9 @@ ../src_plugins/lib_gtk_common/bu_status_line.h \ ../src_plugins/lib_gtk_common/win_place.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h -../src_plugins/lib_gtk_config/lib_gtk_config.o: \ - ../src_plugins/lib_gtk_config/lib_gtk_config.c ../config.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h \ +../src_plugins/lib_gtk_common/lib_gtk_config.o: \ + ../src_plugins/lib_gtk_common/lib_gtk_config.c ../config.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h hid.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \ ../src_3rd/genht/ht.h error.h global_typedefs.h pcb_bool.h unit.h \ @@ -4176,11 +4176,11 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_plugins/lib_gtk_common/glue.h conf.h \ ../src_plugins/lib_gtk_common/compat.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h plugins.h \ + ../src_plugins/lib_gtk_common/hid_gtk_conf.h plugins.h \ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf_fields.h + ../src_plugins/lib_gtk_common/hid_gtk_conf_fields.h ../src_plugins/lib_gtk_hid/actions.o: \ ../src_plugins/lib_gtk_hid/actions.c ../config.h \ ../src_plugins/lib_gtk_hid/gui.h hid.h ../src_3rd/liblihata/dom.h \ @@ -4228,7 +4228,7 @@ ../src_plugins/lib_gtk_common/dlg_log.h error.h \ ../src_plugins/lib_gtk_common/dlg_netlist.h \ ../src_plugins/lib_gtk_common/dlg_search.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h dolists.h + ../src_plugins/lib_gtk_common/lib_gtk_config.h dolists.h ../src_plugins/lib_gtk_hid/common.o: ../src_plugins/lib_gtk_hid/common.c \ ../config.h crosshair.h vtonpoint.h global_typedefs.h pcb_bool.h unit.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -4265,7 +4265,7 @@ ../src_plugins/lib_gtk_common/wt_layersel.h \ ../src_plugins/lib_gtk_common/in_keyboard.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h ../src_plugins/lib_gtk_hid/glue_common.o: \ ../src_plugins/lib_gtk_hid/glue_common.c ../config.h \ ../src_plugins/lib_gtk_hid/glue_common.h hid.h \ @@ -4302,7 +4302,7 @@ rats_patch.h board.h event.h ../src_plugins/lib_gtk_hid/render.h \ ../src_plugins/lib_gtk_hid/common.h conf_core.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h ../src_plugins/lib_gtk_hid/glue_conf.o: \ ../src_plugins/lib_gtk_hid/glue_conf.c ../config.h \ ../src_plugins/lib_gtk_hid/glue_conf.h conf.h global_typedefs.h \ @@ -4372,8 +4372,8 @@ rats_patch.h board.h ../src_plugins/lib_gtk_hid/render.h conf_core.h \ tool.h ../src_plugins/lib_gtk_common/dlg_netlist.h \ ../src_plugins/lib_gtk_common/win_place.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h ../src_plugins/lib_gtk_hid/glue_hid.o: \ ../src_plugins/lib_gtk_hid/glue_hid.c ../config.h \ ../src_plugins/lib_gtk_hid/glue_hid.h hid.h ../src_3rd/liblihata/dom.h \ @@ -4422,8 +4422,8 @@ ../src_plugins/lib_gtk_common/util_timer.h \ ../src_plugins/lib_gtk_common/util_watch.h \ ../src_plugins/lib_gtk_common/win_place.h \ - ../src_plugins/lib_gtk_config/hid_gtk_conf.h \ - ../src_plugins/lib_gtk_config/lib_gtk_config.h + ../src_plugins/lib_gtk_common/hid_gtk_conf.h \ + ../src_plugins/lib_gtk_common/lib_gtk_config.h ../src_plugins/lib_gtk_hid/glue_win32.o: \ ../src_plugins/lib_gtk_hid/glue_win32.c \ ../src_plugins/lib_gtk_hid/glue_win32.h Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 22162) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 22163) @@ -17,8 +17,8 @@ #include "../src_plugins/lib_gtk_hid/coord_conv.h" #include "../src_plugins/lib_gtk_hid/preview_helper.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" #include "../src_plugins/lib_hid_common/clip.h" Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 22162) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 22163) @@ -9,8 +9,8 @@ #include "conf_core.h" #include "../src_plugins/lib_gtk_common/glue.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" #include "../src_plugins/lib_gtk_hid/gui.h" #include "../src_plugins/lib_gtk_hid/glue_common.h" Index: trunk/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup (revision 22162) +++ trunk/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup (revision 22163) @@ -5,7 +5,6 @@ $package hid-gtk2-gdk default buildin dep lib_gtk_common -dep lib_gtk_config dep lib_gtk_hid dep draw_csect autoload 1 Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 22162) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 22163) @@ -12,8 +12,8 @@ #include "funchash_core.h" #include "../src_plugins/lib_hid_common/clip.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" #include "../src_plugins/lib_gtk_hid/gui.h" #include "../src_plugins/lib_gtk_hid/coord_conv.h" @@ -27,7 +27,7 @@ #include "hid_draw_helpers.h" #include "../src_plugins/lib_hid_gl/stencil_gl.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" #define Z_NEAR 3.0 extern pcb_hid_t gtk2_gl_hid; Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 22162) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 22163) @@ -11,8 +11,8 @@ #include "../src_plugins/lib_hid_gl/draw_gl.h" #include "../src_plugins/lib_gtk_common/glue.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" #include "../src_plugins/lib_gtk_hid/gui.h" #include "../src_plugins/lib_gtk_hid/glue_common.h" Index: trunk/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup =================================================================== --- trunk/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup (revision 22162) +++ trunk/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup (revision 22163) @@ -5,7 +5,6 @@ $package hid-gtk2-gl default buildin dep lib_gtk_common -dep lib_gtk_config dep lib_gtk_hid dep lib_hid_gl dep draw_csect Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 22162) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 22163) @@ -44,8 +44,8 @@ #include "../src_plugins/lib_gtk_hid/coord_conv.h" #include "../src_plugins/lib_gtk_hid/preview_helper.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" #include "../src_plugins/lib_hid_common/clip.h" Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c (revision 22162) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-main.c (revision 22163) @@ -9,8 +9,8 @@ #include "conf_core.h" #include "../src_plugins/lib_gtk_common/glue.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" #include "../src_plugins/lib_gtk_hid/gui.h" #include "../src_plugins/lib_gtk_hid/glue_common.h" Index: trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup (revision 22162) +++ trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup (revision 22163) @@ -4,7 +4,6 @@ $state WIP default disable-all dep lib_gtk_common -dep lib_gtk_config dep lib_gtk_hid dep draw_csect autoload 1 Index: trunk/src_plugins/hid_gtk3_gl/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk3_gl/gtkhid-main.c (revision 22162) +++ trunk/src_plugins/hid_gtk3_gl/gtkhid-main.c (revision 22163) @@ -9,8 +9,8 @@ #include "conf_core.h" #include "../src_plugins/lib_gtk_common/glue.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" #include "../src_plugins/lib_gtk_hid/gui.h" #include "../src_plugins/lib_gtk_hid/glue_common.h" Index: trunk/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup =================================================================== --- trunk/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup (revision 22162) +++ trunk/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup (revision 22163) @@ -4,7 +4,6 @@ $state WIP default disable-all dep lib_gtk_common -dep lib_gtk_config dep lib_gtk_hid dep lib_hid_gl dep draw_csect Index: trunk/src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 22162) +++ trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 22163) @@ -1,6 +1,9 @@ put /local/pcb/mod {lib_gtk_common} +put /local/pcb/mod/CONF {$(PLUGDIR)/lib_gtk_config/hid_gtk_conf.h} + put /local/pcb/mod/OBJS [@ $(PLUGDIR)/lib_gtk_common/lib_gtk_common.o + $(PLUGDIR)/lib_gtk_common/lib_gtk_config.o @] put /local/pcb/mod/OBJS_C99 [@ Index: trunk/src_plugins/lib_gtk_common/bu_command.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_command.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/bu_command.c (revision 22163) @@ -47,7 +47,7 @@ #include "bu_text_view.h" #include "bu_status_line.h" #include "util_str.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" #include "../src_plugins/lib_hid_common/cli_history.h" Index: trunk/src_plugins/lib_gtk_common/bu_mode_btn.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_mode_btn.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/bu_mode_btn.c (revision 22163) @@ -37,7 +37,7 @@ #include "conf_core.h" #include "tool.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" #include "compat.h" Index: trunk/src_plugins/lib_gtk_common/dlg_library.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_library.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/dlg_library.c (revision 22163) @@ -79,7 +79,7 @@ #include "tool.h" #include "event.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" #include "dlg_library_param.h" /* how often should the parametric footprint redrawn while the parameters are Index: trunk/src_plugins/lib_gtk_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_log.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/dlg_log.c (revision 22163) @@ -48,7 +48,7 @@ #include "compat.h" #include "event.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" static GtkWidget *log_window, *log_text; static pcb_bool log_show_on_append = FALSE; Index: trunk/src_plugins/lib_gtk_common/dlg_netlist.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 22163) @@ -61,7 +61,7 @@ #include "compat.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" #define NET_HIERARCHY_SEPARATOR "/" Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 22163) @@ -64,8 +64,8 @@ #include "in_keyboard.h" #include "wt_layersel.h" #include "tool.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "lib_gtk_config.h" +#include "hid_gtk_conf.h" #include "win_place.h" /* sync the menu checkboxes with actual pcb state */ Index: trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h =================================================================== --- trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h (nonexistent) +++ trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h (revision 22163) @@ -0,0 +1,75 @@ +#ifndef PCB_HID_GTK_CONF_H +#define PCB_HID_GTK_CONF_H + +#include "conf.h" + +typedef struct { + const struct plugins { + const struct hid_gtk { + CFT_BOOLEAN listen; /* @usage Listen for actions on stdin. */ + CFT_STRING bg_image; /* @usage File name of an image to put into the background of the GUI canvas. The image is read via GdkPixbuf library. It can be any size, and will be automatically scaled to fit the canvas. */ + + CFT_BOOLEAN compact_horizontal; /* OBSOLETE: ignored; use central appearance/compact instead */ + CFT_BOOLEAN compact_vertical; /* OBSOLETE: ignored; use central appearance/compact instead */ + CFT_INTEGER history_size; + CFT_INTEGER n_mode_button_columns; + + const struct local_grid { + CFT_BOOLEAN enable; /* enable local grid to draw grid points only in a small radius around the crosshair - speeds up software rendering on large screens */ + CFT_INTEGER radius; /* radius, in number of grid points, around the local grid */ + } local_grid; + + const struct global_grid { + CFT_INTEGER min_dist_px; /* never try to draw a grid so dense that the distance between grid points is smaller than this */ + CFT_BOOLEAN sparse; /* enable drawing sparse grid: when zoomed out beyond min_dist_px draw every 2nd, 4th, 8th, etc. grid point; if disabled the grid is turned off when it'd get too dense */ + } global_grid; + + const struct auto_save_window_geometry { + CFT_BOOLEAN to_design; + CFT_BOOLEAN to_project; + CFT_BOOLEAN to_user; + } auto_save_window_geometry; + + const struct window_geometry { + CFT_INTEGER top_x; + CFT_INTEGER top_y; + CFT_INTEGER top_width; + CFT_INTEGER top_height; + + CFT_INTEGER log_x; + CFT_INTEGER log_y; + CFT_INTEGER log_width; + CFT_INTEGER log_height; + + CFT_INTEGER drc_x; + CFT_INTEGER drc_y; + CFT_INTEGER drc_width; + CFT_INTEGER drc_height; + + CFT_INTEGER library_x; + CFT_INTEGER library_y; + CFT_INTEGER library_width; + CFT_INTEGER library_height; + + CFT_INTEGER keyref_x; + CFT_INTEGER keyref_y; + CFT_INTEGER keyref_width; + CFT_INTEGER keyref_height; + + CFT_INTEGER netlist_x; + CFT_INTEGER netlist_y; + CFT_INTEGER netlist_height; + CFT_INTEGER netlist_width; + + CFT_INTEGER pinout_x; + CFT_INTEGER pinout_y; + CFT_INTEGER pinout_height; + CFT_INTEGER pinout_width; + } window_geometry; + } hid_gtk; + } plugins; +} conf_hid_gtk_t; + +extern conf_hid_gtk_t conf_hid_gtk; + +#endif Index: trunk/src_plugins/lib_gtk_common/lib_gtk_common.pup =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_common.pup (revision 22162) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_common.pup (revision 22163) @@ -4,4 +4,4 @@ $state works $package lib-gtk default disable-all -dep lib_gtk_config + Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (nonexistent) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 22163) @@ -0,0 +1,64 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * Copyright (C) 2017 Tibor Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: http://repo.hu/projects/pcb-rnd/contact.html + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + * + */ + +#include "config.h" + +#include +#include "lib_gtk_config.h" +#include "hid_gtk_conf.h" +#include "plugins.h" + +static const char *lib_gtk_config_cookie = "lib_gtk_config"; + +conf_hid_id_t ghid_conf_id = -1; +conf_hid_gtk_t conf_hid_gtk; + +void pcb_gtk_conf_init(void) +{ + ghid_conf_id = conf_hid_reg(lib_gtk_config_cookie, NULL); +} + +int pplg_check_ver_lib_gtk_config(int ver_needed) { return 0; } + +void pplg_uninit_lib_gtk_config(void) +{ + conf_hid_unreg(lib_gtk_config_cookie); + conf_unreg_fields("plugins/hid_gtk/"); +} + +int pplg_init_lib_gtk_config(void) +{ + PCB_API_CHK_VER; + pcb_gtk_conf_init(); + +#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ + conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); +#include "../src_plugins/lib_gtk_common/hid_gtk_conf_fields.h" + + return 0; +} + Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.h =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (nonexistent) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (revision 22163) @@ -0,0 +1,16 @@ +#include +#include "hid.h" +#include "event.h" +#include "conf_hid.h" +#include "../src_plugins/lib_gtk_common/glue.h" + +extern conf_hid_id_t ghid_conf_id; + +/* called before the first conf access, from hid_gtk* */ +void pcb_gtk_conf_init(void); + +/* Parses string_path to expand and select the corresponding path in tree view. */ +void pcb_gtk_config_set_cursor(const char *string_path); + + + Index: trunk/src_plugins/lib_gtk_common/ui_crosshair.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_crosshair.c (revision 22162) +++ trunk/src_plugins/lib_gtk_common/ui_crosshair.c (revision 22163) @@ -32,7 +32,7 @@ #include "ui_crosshair.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "hid_gtk_conf.h" #include "ui_zoompan.h" #include "bu_cursor_pos.h" #include "conf_core.h" Index: trunk/src_plugins/lib_gtk_config/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_config/lib_gtk_config.c (revision 22162) +++ trunk/src_plugins/lib_gtk_config/lib_gtk_config.c (nonexistent) @@ -1,64 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * Copyright (C) 2017 Tibor Palinkas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: http://repo.hu/projects/pcb-rnd/contact.html - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - * - */ - -#include "config.h" - -#include -#include "lib_gtk_config.h" -#include "hid_gtk_conf.h" -#include "plugins.h" - -static const char *lib_gtk_config_cookie = "lib_gtk_config"; - -conf_hid_id_t ghid_conf_id = -1; -conf_hid_gtk_t conf_hid_gtk; - -void pcb_gtk_conf_init(void) -{ - ghid_conf_id = conf_hid_reg(lib_gtk_config_cookie, NULL); -} - -int pplg_check_ver_lib_gtk_config(int ver_needed) { return 0; } - -void pplg_uninit_lib_gtk_config(void) -{ - conf_hid_unreg(lib_gtk_config_cookie); - conf_unreg_fields("plugins/hid_gtk/"); -} - -int pplg_init_lib_gtk_config(void) -{ - PCB_API_CHK_VER; - pcb_gtk_conf_init(); - -#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); -#include "../src_plugins/lib_gtk_config/hid_gtk_conf_fields.h" - - return 0; -} - Index: trunk/src_plugins/lib_gtk_config/lib_gtk_config.h =================================================================== --- trunk/src_plugins/lib_gtk_config/lib_gtk_config.h (revision 22162) +++ trunk/src_plugins/lib_gtk_config/lib_gtk_config.h (nonexistent) @@ -1,16 +0,0 @@ -#include -#include "hid.h" -#include "event.h" -#include "conf_hid.h" -#include "../src_plugins/lib_gtk_common/glue.h" - -extern conf_hid_id_t ghid_conf_id; - -/* called before the first conf access, from hid_gtk* */ -void pcb_gtk_conf_init(void); - -/* Parses string_path to expand and select the corresponding path in tree view. */ -void pcb_gtk_config_set_cursor(const char *string_path); - - - Index: trunk/src_plugins/lib_gtk_config/hid_gtk_conf.h =================================================================== --- trunk/src_plugins/lib_gtk_config/hid_gtk_conf.h (revision 22162) +++ trunk/src_plugins/lib_gtk_config/hid_gtk_conf.h (nonexistent) @@ -1,75 +0,0 @@ -#ifndef PCB_HID_GTK_CONF_H -#define PCB_HID_GTK_CONF_H - -#include "conf.h" - -typedef struct { - const struct plugins { - const struct hid_gtk { - CFT_BOOLEAN listen; /* @usage Listen for actions on stdin. */ - CFT_STRING bg_image; /* @usage File name of an image to put into the background of the GUI canvas. The image is read via GdkPixbuf library. It can be any size, and will be automatically scaled to fit the canvas. */ - - CFT_BOOLEAN compact_horizontal; /* OBSOLETE: ignored; use central appearance/compact instead */ - CFT_BOOLEAN compact_vertical; /* OBSOLETE: ignored; use central appearance/compact instead */ - CFT_INTEGER history_size; - CFT_INTEGER n_mode_button_columns; - - const struct local_grid { - CFT_BOOLEAN enable; /* enable local grid to draw grid points only in a small radius around the crosshair - speeds up software rendering on large screens */ - CFT_INTEGER radius; /* radius, in number of grid points, around the local grid */ - } local_grid; - - const struct global_grid { - CFT_INTEGER min_dist_px; /* never try to draw a grid so dense that the distance between grid points is smaller than this */ - CFT_BOOLEAN sparse; /* enable drawing sparse grid: when zoomed out beyond min_dist_px draw every 2nd, 4th, 8th, etc. grid point; if disabled the grid is turned off when it'd get too dense */ - } global_grid; - - const struct auto_save_window_geometry { - CFT_BOOLEAN to_design; - CFT_BOOLEAN to_project; - CFT_BOOLEAN to_user; - } auto_save_window_geometry; - - const struct window_geometry { - CFT_INTEGER top_x; - CFT_INTEGER top_y; - CFT_INTEGER top_width; - CFT_INTEGER top_height; - - CFT_INTEGER log_x; - CFT_INTEGER log_y; - CFT_INTEGER log_width; - CFT_INTEGER log_height; - - CFT_INTEGER drc_x; - CFT_INTEGER drc_y; - CFT_INTEGER drc_width; - CFT_INTEGER drc_height; - - CFT_INTEGER library_x; - CFT_INTEGER library_y; - CFT_INTEGER library_width; - CFT_INTEGER library_height; - - CFT_INTEGER keyref_x; - CFT_INTEGER keyref_y; - CFT_INTEGER keyref_width; - CFT_INTEGER keyref_height; - - CFT_INTEGER netlist_x; - CFT_INTEGER netlist_y; - CFT_INTEGER netlist_height; - CFT_INTEGER netlist_width; - - CFT_INTEGER pinout_x; - CFT_INTEGER pinout_y; - CFT_INTEGER pinout_height; - CFT_INTEGER pinout_width; - } window_geometry; - } hid_gtk; - } plugins; -} conf_hid_gtk_t; - -extern conf_hid_gtk_t conf_hid_gtk; - -#endif Index: trunk/src_plugins/lib_gtk_config/Plug.tmpasm =================================================================== --- trunk/src_plugins/lib_gtk_config/Plug.tmpasm (revision 22162) +++ trunk/src_plugins/lib_gtk_config/Plug.tmpasm (revision 22163) @@ -3,7 +3,6 @@ @] put /local/pcb/mod/OBJS_C99 [@ - $(PLUGDIR)/lib_gtk_config/lib_gtk_config.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/lib_gtk_config/hid_gtk_conf.h} Index: trunk/src_plugins/lib_gtk_hid/actions.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/actions.c (revision 22162) +++ trunk/src_plugins/lib_gtk_hid/actions.c (revision 22163) @@ -46,7 +46,7 @@ #include "../src_plugins/lib_gtk_common/dlg_log.h" #include "../src_plugins/lib_gtk_common/dlg_netlist.h" #include "../src_plugins/lib_gtk_common/dlg_search.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" #include "actions.h" Index: trunk/src_plugins/lib_gtk_hid/common.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/common.c (revision 22162) +++ trunk/src_plugins/lib_gtk_hid/common.c (revision 22163) @@ -9,7 +9,7 @@ #include "../src_plugins/lib_gtk_common/wt_layersel.h" #include "../src_plugins/lib_gtk_common/dlg_topwin.h" #include "../src_plugins/lib_gtk_common/in_keyboard.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" GhidGui _ghidgui, *ghidgui = &_ghidgui; GHidPort ghid_port, *gport; Index: trunk/src_plugins/lib_gtk_hid/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/glue_common.c (revision 22162) +++ trunk/src_plugins/lib_gtk_hid/glue_common.c (revision 22163) @@ -10,7 +10,7 @@ #include "conf_core.h" #include "../src_plugins/lib_gtk_common/bu_status_line.h" #include "../src_plugins/lib_gtk_common/dlg_topwin.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" static void ghid_interface_set_sensitive(gboolean sensitive); Index: trunk/src_plugins/lib_gtk_hid/glue_event.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/glue_event.c (revision 22162) +++ trunk/src_plugins/lib_gtk_hid/glue_event.c (revision 22163) @@ -5,8 +5,8 @@ #include "tool.h" #include "../src_plugins/lib_gtk_common/dlg_netlist.h" #include "../src_plugins/lib_gtk_common/win_place.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" void pcb_ghid_rst_chg(void) { Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/glue_hid.c (revision 22162) +++ trunk/src_plugins/lib_gtk_hid/glue_hid.c (revision 22163) @@ -22,8 +22,8 @@ #include "../src_plugins/lib_gtk_common/util_timer.h" #include "../src_plugins/lib_gtk_common/util_watch.h" #include "../src_plugins/lib_gtk_common/win_place.h" -#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h" -#include "../src_plugins/lib_gtk_config/lib_gtk_config.h" +#include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" +#include "../src_plugins/lib_gtk_common/lib_gtk_config.h" void gtkhid_begin(void) {