Index: scconfig/Rev.h =================================================================== --- scconfig/Rev.h (revision 6680) +++ scconfig/Rev.h (revision 6681) @@ -1 +1 @@ -static const int myrev = 6679; +static const int myrev = 6681; Index: scconfig/Rev.tab =================================================================== --- scconfig/Rev.tab (revision 6680) +++ scconfig/Rev.tab (revision 6681) @@ -1,4 +1,4 @@ -6679 configure gtk splitup +6681 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup 6111 configure layer vs. layer group code split Index: src/Makefile.dep =================================================================== --- src/Makefile.dep (revision 6680) +++ src/Makefile.dep (revision 6681) @@ -816,13 +816,13 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \ @@ -852,13 +852,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h \ conf_core.h event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h compat_nls.h \ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.h \ @@ -890,13 +890,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h \ conf_core.h event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h misc_util.h \ error.h ../src_plugins/hid_gtk/gschem_accel_label.h @@ -927,13 +927,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h compat_nls.h ../src_plugins/hid_gtk/gschem_accel_label.o: \ @@ -978,13 +978,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_draw_helpers.h \ hid_attrib.h hid_helper.h hid_color.h @@ -1015,13 +1015,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_nogui.h \ hid_draw_helpers.h pcb-printf.h plugins.h hid_attrib.h hid_init.h \ @@ -1035,6 +1035,7 @@ ../src_plugins/lib_gtk_common/dlg_message.h \ ../src_plugins/lib_gtk_common/dlg_print.h \ ../src_plugins/lib_gtk_common/dlg_report.h \ + ../src_plugins/lib_gtk_common/dlg_pinout.h obj_elem.h \ ../src_plugins/lib_gtk_common/dlg_search.h \ ../src_plugins/lib_gtk_common/in_mouse.h dolists.h \ ../src_plugins/hid_gtk/hid_gtk_conf_fields.h @@ -1064,13 +1065,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h crosshair.h hid_actions.h \ compat_nls.h ../src_plugins/lib_gtk_common/util_str.h @@ -1100,13 +1101,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h change.h \ @@ -1147,13 +1148,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gui-drc-window.h hid_actions.h compat_nls.h \ @@ -1187,13 +1188,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h buffer.h plug_footprint.h \ vtlibrary.h compat_nls.h ../src_plugins/lib_gtk_common/wt_preview.h \ @@ -1226,13 +1227,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h hid_actions.h \ compat_nls.h ../src_plugins/lib_gtk_common/win_place.h @@ -1264,13 +1265,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/lib_gtk_common/util_str.h \ @@ -1301,13 +1302,13 @@ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h crosshair.h \ @@ -1315,44 +1316,6 @@ rats.h ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/in_keyboard.h \ ../src_plugins/lib_gtk_common/../hid_gtk/gui.h -../src_plugins/hid_gtk/gui-pinout-window.o: \ - ../src_plugins/hid_gtk/gui-pinout-window.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 \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.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 ../src_plugins/hid_gtk/gui.h \ - board.h const.h macro.h vtroutestyle.h attrib.h layer.h obj_all_list.h \ - obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ - ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ - obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ - obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ - obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \ - rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h hid.h \ - error.h drc.h hid_cfg.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ - vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ - ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ - compat_misc.h ../src_plugins/hid_gtk/colors.h \ - ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ - ../src_plugins/lib_gtk_common/bu_box.h \ - ../src_plugins/lib_gtk_common/bu_text_view.h \ - ../src_plugins/lib_gtk_common/bu_check_button.h \ - ../src_plugins/lib_gtk_common/bu_spin_button.h \ - ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h \ - ../src_plugins/lib_gtk_common/bu_cursor_pos.h copy.h draw.h move.h \ - rotate.h ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.h layer.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ - ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/hid_gtk/gui-top-window.o: \ ../src_plugins/hid_gtk/gui-top-window.c ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -1379,13 +1342,13 @@ vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/lib_gtk_common/wt_layer_selector.h event.h compat_misc.h \ ../src_plugins/hid_gtk/colors.h ../src_plugins/hid_gtk/hid_gtk_conf.h \ - conf.h ../src_plugins/lib_gtk_common/ui_zoompan.h \ + conf.h ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_cfg_action.h \ action_helper.h buffer.h change.h copy.h crosshair.h draw.h error.h \ @@ -2229,13 +2192,13 @@ route_style.h conf_core.h event.h compat_misc.h \ ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/dlg_input.o: \ @@ -2244,6 +2207,28 @@ ../src_plugins/lib_gtk_common/dlg_message.o: \ ../src_plugins/lib_gtk_common/dlg_message.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_message.h compat_nls.h +../src_plugins/lib_gtk_common/dlg_pinout.o: \ + ../src_plugins/lib_gtk_common/dlg_pinout.c ../config.h \ + ../src_plugins/lib_gtk_common/dlg_pinout.h obj_elem.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h \ + obj_arc_list.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h obj_pinvia_list.h \ + obj_pinvia.h obj_text.h hid.h error.h drc.h layer.h obj_all_list.h \ + obj_elem_list.h obj_elem.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h obj_poly_list.h obj_poly.h \ + polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \ + conf_core.h conf.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 \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ + copy.h data.h crosshair.h vtonpoint.h hid.h buffer.h draw.h move.h \ + rotate.h macro.h ../src_plugins/lib_gtk_common/wt_preview.h layer.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ + ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/lib_gtk_common/dlg_print.o: \ ../src_plugins/lib_gtk_common/dlg_print.c ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -2295,13 +2280,13 @@ ../src_3rd/genvector/vtp0.h list_conf.h event.h \ ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/dlg_report.o: \ @@ -2362,13 +2347,13 @@ ../src_3rd/genvector/vtp0.h list_conf.h event.h compat_misc.h \ ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/in_mouse.o: \ @@ -2401,13 +2386,13 @@ ../src_3rd/genvector/vtp0.h list_conf.h event.h compat_misc.h \ ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gui.h @@ -2414,7 +2399,8 @@ ../src_plugins/lib_gtk_common/lib_gtk_common.o: \ ../src_plugins/lib_gtk_common/lib_gtk_common.c plugins.h ../src_plugins/lib_gtk_common/ui_zoompan.o: \ - ../src_plugins/lib_gtk_common/ui_zoompan.c ../config.h unit.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.c ../config.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ action_helper.h global_typedefs.h pcb_bool.h unit.h error.h conf_core.h \ conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -2435,7 +2421,7 @@ rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h \ compat_misc.h compat_nls.h draw.h hid.h error.h drc.h data.h crosshair.h \ vtonpoint.h buffer.h layer_vis.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h + ../src_plugins/lib_gtk_common/bu_status_line.h ../src_plugins/lib_gtk_common/util_str.o: \ ../src_plugins/lib_gtk_common/util_str.c ../config.h \ ../src_plugins/lib_gtk_common/util_str.h @@ -2485,13 +2471,13 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ ../src_plugins/lib_gtk_common/bu_box.h \ ../src_plugins/lib_gtk_common/bu_text_view.h \ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ + ../src_plugins/lib_gtk_common/wt_coord_entry.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h ../src_plugins/lib_gtk_common/wt_preview.o: \ @@ -2512,10 +2498,10 @@ error.h drc.h layer.h obj_all_list.h obj_elem_list.h obj_elem.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h \ polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h layer.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h copy.h data.h crosshair.h \ - vtonpoint.h hid.h buffer.h draw.h move.h rotate.h obj_all.h macro.h \ - ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h + ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h copy.h \ + data.h crosshair.h vtonpoint.h hid.h buffer.h draw.h move.h rotate.h \ + obj_all.h macro.h ../src_plugins/lib_gtk_common/in_mouse.h \ + hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h ../src_plugins/lib_legacy_func/lib_legacy_func.o: \ ../src_plugins/lib_legacy_func/lib_legacy_func.c \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ Index: src_plugins/hid_gtk/gui-pinout-window.c =================================================================== --- src_plugins/hid_gtk/gui-pinout-window.c (revision 6680) +++ src_plugins/hid_gtk/gui-pinout-window.c (nonexistent) @@ -1,88 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Contact addresses for paper mail and Email: - * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany - * Thomas.Nau@rz.uni-ulm.de - * - */ - -/* This file written by Bill Wilson for the PCB Gtk port */ - -#include "config.h" -#include "conf_core.h" - -#include "gui.h" - -#include "copy.h" -#include "data.h" -#include "draw.h" -#include "move.h" -#include "rotate.h" - -#include "../src_plugins/lib_gtk_common/wt_preview.h" -#include "../src_plugins/lib_gtk_common/win_place.h" - -static void pinout_close_cb(GtkWidget * widget, GtkWidget * top_window) -{ - gtk_widget_destroy(top_window); -} - - -void ghid_pinout_window_show(GHidPort * out, pcb_element_t * element) -{ - GtkWidget *button, *vbox, *hbox, *preview, *top_window; - gchar *title; - int width, height; - - if (!element) - return; - title = g_strdup_printf("%s [%s,%s]", - PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element))); - - top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(top_window), title); - g_free(title); - gtk_window_set_wmclass(GTK_WINDOW(top_window), "PCB_Pinout", "PCB"); - gtk_container_set_border_width(GTK_CONTAINER(top_window), 4); - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(top_window), vbox); - - - preview = pcb_gtk_preview_pinout_new(gport, ghid_init_drawing_widget, ghid_preview_expose, element); - - gtk_box_pack_start(GTK_BOX(vbox), preview, TRUE, TRUE, 0); - - pcb_gtk_preview_get_natsize(GHID_PINOUT_PREVIEW(preview), &width, &height); - - gtk_window_set_default_size(GTK_WINDOW(top_window), width + 50, height + 50); - - hbox = gtk_hbutton_box_new(); - gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pinout_close_cb), top_window); - gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); - - gtk_widget_realize(top_window); - wplc_place(WPLC_PINOUT, top_window); - gtk_widget_show_all(top_window); -} Index: src_plugins/hid_gtk/Plug.tmpasm =================================================================== --- src_plugins/hid_gtk/Plug.tmpasm (revision 6680) +++ src_plugins/hid_gtk/Plug.tmpasm (revision 6681) @@ -12,7 +12,6 @@ $(PLUGDIR)/hid_gtk/gui-log-window.o $(PLUGDIR)/hid_gtk/gui-netlist-window.o $(PLUGDIR)/hid_gtk/gui-output-events.o - $(PLUGDIR)/hid_gtk/gui-pinout-window.o $(PLUGDIR)/hid_gtk/gui-top-window.o $(PLUGDIR)/hid_gtk/gtkhid-gdk.o $(PLUGDIR)/hid_gtk/menu_lht.o Index: src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- src_plugins/hid_gtk/gtkhid-main.c (revision 6680) +++ src_plugins/hid_gtk/gtkhid-main.c (revision 6681) @@ -39,6 +39,7 @@ #include "../src_plugins/lib_gtk_common/dlg_message.h" #include "../src_plugins/lib_gtk_common/dlg_print.h" #include "../src_plugins/lib_gtk_common/dlg_report.h" +#include "../src_plugins/lib_gtk_common/dlg_pinout.h" #include "../src_plugins/lib_gtk_common/dlg_search.h" #include "../src_plugins/lib_gtk_common/in_mouse.h" Index: src_plugins/hid_gtk/gui.h =================================================================== --- src_plugins/hid_gtk/gui.h (revision 6680) +++ src_plugins/hid_gtk/gui.h (revision 6681) @@ -299,9 +299,6 @@ void ghid_log(const char *fmt, ...); void ghid_logv(enum pcb_message_level level, const char *fmt, va_list args); -/* gui-pinout-window.c */ -void ghid_pinout_window_show(GHidPort * out, pcb_element_t *Element); - /* gtkhid-gdk.c AND gtkhid-gl.c */ int ghid_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty); pcb_hid_gc_t ghid_make_gc(void); Index: src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- src_plugins/lib_gtk_common/Plug.tmpasm (revision 6680) +++ src_plugins/lib_gtk_common/Plug.tmpasm (revision 6681) @@ -18,6 +18,7 @@ $(PLUGDIR)/lib_gtk_common/dlg_file_chooser.o $(PLUGDIR)/lib_gtk_common/dlg_input.o $(PLUGDIR)/lib_gtk_common/dlg_message.o + $(PLUGDIR)/lib_gtk_common/dlg_pinout.o $(PLUGDIR)/lib_gtk_common/dlg_print.o $(PLUGDIR)/lib_gtk_common/dlg_propedit.o $(PLUGDIR)/lib_gtk_common/dlg_report.o Index: src_plugins/lib_gtk_common/dlg_pinout.c =================================================================== --- src_plugins/lib_gtk_common/dlg_pinout.c (nonexistent) +++ src_plugins/lib_gtk_common/dlg_pinout.c (revision 6681) @@ -0,0 +1,88 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Contact addresses for paper mail and Email: + * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany + * Thomas.Nau@rz.uni-ulm.de + * + */ + +/* This file written by Bill Wilson for the PCB Gtk port */ + +#include "config.h" +#include "dlg_pinout.h" + +#include "conf_core.h" +#include "copy.h" +#include "data.h" +#include "draw.h" +#include "move.h" +#include "rotate.h" +#include "macro.h" + +#include "wt_preview.h" +#include "win_place.h" + +static void pinout_close_cb(GtkWidget * widget, GtkWidget * top_window) +{ + gtk_widget_destroy(top_window); +} + + +void ghid_pinout_window_show(void *gport, pcb_element_t *element) +{ + GtkWidget *button, *vbox, *hbox, *preview, *top_window; + gchar *title; + int width, height; + + if (!element) + return; + title = g_strdup_printf("%s [%s,%s]", + PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element))); + + top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(top_window), title); + g_free(title); + gtk_window_set_wmclass(GTK_WINDOW(top_window), "PCB_Pinout", "PCB"); + gtk_container_set_border_width(GTK_CONTAINER(top_window), 4); + + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(top_window), vbox); + + + preview = pcb_gtk_preview_pinout_new(gport, ghid_init_drawing_widget, ghid_preview_expose, element); + + gtk_box_pack_start(GTK_BOX(vbox), preview, TRUE, TRUE, 0); + + pcb_gtk_preview_get_natsize(GHID_PINOUT_PREVIEW(preview), &width, &height); + + gtk_window_set_default_size(GTK_WINDOW(top_window), width + 50, height + 50); + + hbox = gtk_hbutton_box_new(); + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pinout_close_cb), top_window); + gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); + + gtk_widget_realize(top_window); + wplc_place(WPLC_PINOUT, top_window); + gtk_widget_show_all(top_window); +} Index: src_plugins/lib_gtk_common/dlg_pinout.h =================================================================== --- src_plugins/lib_gtk_common/dlg_pinout.h (nonexistent) +++ src_plugins/lib_gtk_common/dlg_pinout.h (revision 6681) @@ -0,0 +1,10 @@ +#include +#include "obj_elem.h" +#include "hid.h" + +void ghid_pinout_window_show(void *gport, pcb_element_t *element); + +/* glue from hid_gtk: */ +extern void ghid_init_drawing_widget(GtkWidget *widget, void *gport); +extern gboolean ghid_preview_expose(GtkWidget * widget, GdkEventExpose * ev, pcb_hid_expose_t expcall, const pcb_hid_expose_ctx_t *ctx); +