Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6086) +++ trunk/scconfig/Rev.h (revision 6087) @@ -1 +1 @@ -static const int myrev = 6063; +static const int myrev = 6087; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6086) +++ trunk/scconfig/Rev.tab (revision 6087) @@ -1,4 +1,4 @@ -6063 configure start splitting up hid_gtk: new plugin that hid_gtk depends on: lib_gtk_common +6087 configure start splitting up hid_gtk: new plugin that hid_gtk depends on: lib_gtk_common 6056 configure gschp2pcb-rnd build deps bug 6007 configure switch over Makefiles to use sccbox 6004 distclean,configure scconfig compiles sccbox thast will ease portable clean and installation rules Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 6086) +++ trunk/src/Makefile.dep (revision 6087) @@ -1037,7 +1037,8 @@ hid_draw_helpers.h pcb-printf.h plugins.h hid_attrib.h hid_init.h \ hid_flags.h hid_actions.h plug_footprint.h vtlibrary.h plug_io.h \ misc_util.h layer.h ../src_plugins/hid_gtk/ghid-search.h compat_nls.h \ - layer_vis.h ../src_plugins/hid_gtk/gtkhid.h conf_hid.h dolists.h \ + layer_vis.h ../src_plugins/hid_gtk/gtkhid.h conf_hid.h \ + ../src_plugins/lib_gtk_common/dlg_about.h dolists.h \ ../src_plugins/hid_gtk/hid_gtk_conf_fields.h ../src_plugins/hid_gtk/gui-command-window.o: \ ../src_plugins/hid_gtk/gui-command-window.c ../config.h conf_core.h \ @@ -2229,6 +2230,9 @@ dolists.h ../src_plugins/lib_gensexpr/lib_gensexpr.o: \ ../src_plugins/lib_gensexpr/lib_gensexpr.c plugins.h +../src_plugins/lib_gtk_common/dlg_about.o: \ + ../src_plugins/lib_gtk_common/dlg_about.c ../config.h \ + ../src_plugins/lib_gtk_common/dlg_about.h build_run.h ../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: \ @@ -2251,7 +2255,8 @@ ../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 library.h rats_patch.h board.h \ font.h box.h math_helper.h move.h misc_util.h compat_nls.h draw.h hid.h \ - error.h drc.h ../src_plugins/lib_gtk_common/ui_zoompan.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/util_str.o: \ ../src_plugins/lib_gtk_common/util_str.c ../config.h \ ../src_plugins/lib_gtk_common/util_str.h Index: trunk/src/build_run.c =================================================================== --- trunk/src/build_run.c (revision 6086) +++ trunk/src/build_run.c (revision 6087) @@ -87,7 +87,7 @@ gds_append_str(&info, "Copyright (C) C. Scott Ananian 2001\n"); gds_append_str(&info, "Copyright (C) DJ Delorie 2003, 2004, 2005, 2006, 2007, 2008\n"); gds_append_str(&info, "Copyright (C) Dan McMahill 2003, 2004, 2005, 2006, 2007, 2008\n\n"); - gds_append_str(&info, "Copyright (C) Tibor Palinkas 2013-2016 (pcb-rnd patches)\n\n"); + gds_append_str(&info, "Copyright (C) Tibor Palinkas 2013-2017 (pcb-rnd patches)\n\n"); gds_append_str(&info, "It is licensed under the terms of the GNU\n"); gds_append_str(&info, "General Public License version 2\n"); gds_append_str(&info, "See the LICENSE file for more information\n\n"); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6086) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6087) @@ -32,6 +32,7 @@ #include "gtkhid.h" #include "../src_plugins/lib_gtk_common/ui_zoompan.h" +#include "../src_plugins/lib_gtk_common/dlg_about.h" conf_hid_id_t ghid_conf_id = -1; conf_hid_id_t ghid_menuconf_id = -1; @@ -835,7 +836,7 @@ static int About(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - ghid_dialog_about(); + pcb_gtk_dlg_about(gport->top_window); return 0; } Index: trunk/src_plugins/hid_gtk/gui-dialog.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-dialog.c (revision 6086) +++ trunk/src_plugins/hid_gtk/gui-dialog.c (revision 6087) @@ -85,20 +85,6 @@ } /* ---------------------------------------------- */ -void ghid_dialog_about(void) -{ - GtkWidget *dialog; - GHidPort *out = &ghid_port; - dialog = gtk_message_dialog_new(GTK_WINDOW(out->top_window), - (GtkDialogFlags) (GTK_DIALOG_MODAL - | GTK_DIALOG_DESTROY_WITH_PARENT), - GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", pcb_get_infostr()); - - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} - -/* ---------------------------------------------- */ gint ghid_dialog_confirm_all(gchar * all_message) { GtkWidget *dialog; Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 6086) +++ trunk/src_plugins/hid_gtk/gui.h (revision 6087) @@ -250,7 +250,6 @@ #define GUI_DIALOG_CLOSE_CONFIRM_SAVE 2 gint ghid_dialog_confirm_all(gchar * message); gchar *ghid_dialog_input(const char *prompt, const char *initial); -void ghid_dialog_about(void); char *ghid_fileselect(const char *, const char *, const char *, const char *, const char *, int); Index: trunk/src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6086) +++ trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6087) @@ -6,6 +6,7 @@ put /local/pcb/mod/OBJS_C99 [@ $(PLUGDIR)/lib_gtk_common/ui_zoompan.o + $(PLUGDIR)/lib_gtk_common/dlg_about.o @] Index: trunk/src_plugins/lib_gtk_common/dlg_about.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_about.c (nonexistent) +++ trunk/src_plugins/lib_gtk_common/dlg_about.c (revision 6087) @@ -0,0 +1,46 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * pcb-rnd Copyright (C) 2017 Tibor 'Igor2' 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., 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 code was originally written by Bill Wilson for the PCB Gtk port. */ + +#include "config.h" + +#include "dlg_about.h" +#include "build_run.h" + +void pcb_gtk_dlg_about(GtkWidget *top_window) +{ + GtkWidget *dialog = gtk_message_dialog_new( + GTK_WINDOW(top_window), + (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", pcb_get_infostr() + ); + + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + Index: trunk/src_plugins/lib_gtk_common/dlg_about.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_about.h (nonexistent) +++ trunk/src_plugins/lib_gtk_common/dlg_about.h (revision 6087) @@ -0,0 +1,5 @@ +#include + +/* Display and run the modal About dialog */ +void pcb_gtk_dlg_about(GtkWidget *top_window); +