Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28151/10.3/unstable/main/finkinfo/x11
Modified Files: pcb.info pcb.patch Log Message: backport new version from 10.4 Index: pcb.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/pcb.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pcb.patch 28 Jun 2005 01:44:41 -0000 1.1 +++ pcb.patch 9 Nov 2006 03:53:19 -0000 1.2 @@ -1,302 +1,11 @@ -diff -urN pcb.orig/src/file.c pcb/src/file.c ---- pcb.orig/src/file.c 2005-06-10 23:37:36.000000000 -0500 -+++ pcb/src/file.c 2005-06-24 14:10:23.459870366 -0500 -@@ -213,6 +213,7 @@ - LoadPCB (char *Filename) - { - PCBTypePtr newPCB = CreateNewPCB (False); -+ gboolean units_mm; - - /* new data isn't added to the undo list */ - if (!ParsePCB (newPCB, Filename)) -@@ -252,8 +253,11 @@ - UpdatePIPFlags (NULL, NULL, NULL, False); - UpdateSettingsOnScreen (); - -- if (PCB->Grid != (gint) PCB->Grid) -- Settings.grid_units_mm = TRUE; -+ units_mm = (PCB->Grid != (gint) PCB->Grid) ? TRUE : FALSE; -+ -+ if (units_mm != Settings.grid_units_mm) -+ gui_config_handle_units_changed(); -+ Settings.grid_units_mm = units_mm; - - gui_sync_with_new_layout(); - -diff -urN pcb.orig/src/gui-config.c pcb/src/gui-config.c ---- pcb.orig/src/gui-config.c 2005-06-07 20:34:25.000000000 -0500 -+++ pcb/src/gui-config.c 2005-06-24 14:11:08.108866735 -0500 -@@ -1796,6 +1796,10 @@ - void - gui_config_handle_units_changed(void) - { -+ set_cursor_position_labels(); -+ gtk_label_set_markup(GTK_LABEL(gui->cursor_units_label), -+ Settings.grid_units_mm ? -+ "<b>mm</b> " : "<b>mil</b> "); - if (config_sizes_vbox) - { - gtk_widget_destroy(config_sizes_vbox); -@@ -1808,6 +1812,7 @@ - config_increments_vbox = NULL; - config_increments_tab_create(config_increments_tab_vbox); - } -+ Settings.config_modified = TRUE; - } - - void -diff -urN pcb.orig/src/gui-top-window.c pcb/src/gui-top-window.c ---- pcb.orig/src/gui-top-window.c 2005-06-10 23:37:36.000000000 -0500 -+++ pcb/src/gui-top-window.c 2005-06-24 14:10:48.911737709 -0500 -@@ -432,10 +432,6 @@ - ActionSetValue("Grid", grid, ""); - g_free(grid); - -- set_cursor_position_labels(); -- gtk_label_set_markup(GTK_LABEL(gui->cursor_units_label), -- Settings.grid_units_mm ? -- "<b>mm</b> " : "<b>mil</b> "); - gui_config_handle_units_changed(); - gui_change_selected_update_menu_actions(); - } -diff -urN pcb.orig/src/global.h pcb/src/global.h ---- pcb.orig/src/global.h 2005-06-10 23:37:36.000000000 -0500 -+++ pcb/src/global.h 2005-06-24 17:09:09.896422652 -0500 -@@ -522,6 +522,7 @@ - grid_units_mm, - small_layer_enable_label_markup, - gui_compact_horizontal, -+ gui_title_window, - use_command_window, - verbose; - -diff -urN pcb.orig/src/gui-config.c pcb/src/gui-config.c ---- pcb.orig/src/gui-config.c 2005-06-07 20:34:25.000000000 -0500 -+++ pcb/src/gui-config.c 2005-06-24 17:09:23.163954464 -0500 -@@ -90,6 +90,7 @@ - { - /* booleans */ - {"gui-compact-horizontal", &Settings.gui_compact_horizontal, "0"}, -+ {"gui-title-window", &Settings.gui_title_window, "0"}, - {"use-command-window", &Settings.use_command_window, "1"}, - {"grid-units-mm", &Settings.grid_units_mm, "0"}, - {"all-direction-lines", &Settings.AllDirectionLines, "0"}, -@@ -670,6 +671,17 @@ - FALSE, FALSE, 0); - } - set_status_line_label(); -+ Settings.config_modified = TRUE; -+ } -+ -+static void -+config_title_window_cb(GtkToggleButton *button, gpointer data) -+ { -+ gboolean active = gtk_toggle_button_get_active(button); -+ -+ Settings.gui_title_window = active; -+ gui_output_set_name_label(gui->name_label_string); -+ Settings.config_modified = TRUE; - } - - static void -@@ -719,6 +731,11 @@ - config_compact_toggle_cb, NULL, - _("Compact horizontal top window for narrow screens")); - -+ gui_check_button_connected(vbox, NULL, Settings.gui_title_window, -+ TRUE, FALSE, FALSE, 2, -+ config_title_window_cb, NULL, -+ _("Put layout name on the window title bar")); -+ - #if 0 - /* Works poorly */ - gui_check_button_connected(vbox, NULL, Settings.StipplePolygons, -diff -urN pcb.orig/src/gui-top-window.c pcb/src/gui-top-window.c ---- pcb.orig/src/gui-top-window.c 2005-06-10 23:37:36.000000000 -0500 -+++ pcb/src/gui-top-window.c 2005-06-24 17:09:19.495636943 -0500 -@@ -2259,15 +2259,31 @@ - } - - -- /* Set the PCB name label. -+ /* Set the PCB name on a label or on the window title bar. - */ - void - gui_output_set_name_label(gchar *name) - { - gchar *str; - -- str = g_strdup_printf(" <b><big>%s</big></b> ", name ? name : "Unnamed"); -- gtk_label_set_markup(GTK_LABEL(gui->name_label), str); -+ dup_string(&gui->name_label_string, name); -+ if (!gui->name_label_string || !*gui->name_label_string) -+ gui->name_label_string = g_strdup(_("Unnamed")); -+ -+ if (Settings.gui_title_window) -+ { -+ gtk_widget_hide(gui->name_label); -+ str = g_strdup_printf("PCB: %s", gui->name_label_string); -+ gtk_window_set_title(GTK_WINDOW(Output.top_window), str); -+ } -+ else -+ { -+ gtk_widget_show(gui->name_label); -+ str = g_strdup_printf(" <b><big>%s</big></b> ", -+ gui->name_label_string); -+ gtk_label_set_markup(GTK_LABEL(gui->name_label), str); -+ gtk_window_set_title(GTK_WINDOW(Output.top_window), "PCB"); -+ } - g_free(str); - } - -diff -urN pcb.orig/src/gui.h pcb/src/gui.h ---- pcb.orig/src/gui.h 2005-03-13 08:59:49.000000000 -0600 -+++ pcb/src/gui.h 2005-06-24 17:09:09.901421722 -0500 -@@ -109,6 +109,8 @@ - GtkObject *h_adjustment, - *v_adjustment; - -+ gchar *name_label_string; -+ - gboolean adjustment_changed_holdoff, - toggle_holdoff, - command_entry_status_line_active; -diff -urN pcb.orig/src/find.c pcb/src/find.c ---- pcb.orig/src/find.c 2005-03-11 20:17:11.000000000 -0600 -+++ pcb/src/find.c 2005-03-28 23:34:58.611566448 -0600 -@@ -152,7 +152,7 @@ - * message when asked about continuing DRC checks after first - * violation is found. - */ --#define DRC_CONTINUE _("Stop here? (Cancel to continue checking)") -+#define DRC_CONTINUE _("Press OK to continue DRC checking") +--- pcb-20060822/src/hid/gtk/gui-library-window.c.orig 2006-04-17 21:48:10.000000000 -0400 ++++ pcb-20060822/src/hid/gtk/gui-library-window.c 2006-10-04 23:11:25.000000000 -0400 +@@ -344,7 +344,7 @@ + * don't want. + */ + gtk_widget_realize (library_window); +- gdk_window_set_accept_focus (library_window->window, FALSE); ++ //gdk_window_set_accept_focus (library_window->window, FALSE); - /* --------------------------------------------------------------------------- - * some local types -@@ -3466,7 +3466,7 @@ - drc = False; - drcerr_count++; - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - return (True); - IncrementUndoSerialNumber (); - Undo (True); -@@ -3506,7 +3506,7 @@ - GotoError (); - User = False; - drc = False; -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - return (True); - IncrementUndoSerialNumber (); - Undo (True); -@@ -3622,7 +3622,7 @@ - DrawObject (type, ptr1, ptr2, 0); - drcerr_count++; - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - return 1; -@@ -3724,7 +3724,7 @@ - drcerr_count++; - SetThing (LINE_TYPE, layer, line, line); - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3748,7 +3748,7 @@ - drcerr_count++; - SetThing (ARC_TYPE, layer, arc, arc); - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3773,7 +3773,7 @@ - drcerr_count++; - SetThing (PIN_TYPE, element, pin, pin); - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3797,7 +3797,7 @@ - drcerr_count++; - SetThing (PAD_TYPE, element, pad, pad); - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3822,7 +3822,7 @@ - drcerr_count++; - SetThing (VIA_TYPE, via, via, via); - GotoError (); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3854,7 +3854,7 @@ - drcerr_count++; - SetThing(LINE_TYPE, layer, line, line); - GotoError(); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3887,7 +3887,7 @@ - drcerr_count++; - SetThing(ELEMENT_TYPE, element, element, element); - GotoError(); -- if (gui_dialog_confirm(DRC_CONTINUE)) -+ if (!gui_dialog_confirm(DRC_CONTINUE)) - { - IsBad = True; - break; -@@ -3973,9 +3973,11 @@ - case LINE_TYPE: - case ARC_TYPE: - case POLYGON_TYPE: -- g_message("GotoError: ChangeGroupVisibility (GetLayerNumber"); -+ ChangeGroupVisibility (GetLayerNumber -+ (PCB->Data, (LayerTypePtr) thing_ptr1), True, -+ True); - } -- CenterDisplay (X, Y, False); -+ CenterDisplay (X, Y - TO_PCB(Output.Height / 4), False); + gtk_widget_show_all (library_window); } - - void -diff -urN pcb.orig/src/gui-utils.c pcb/src/gui-utils.c ---- pcb.orig/src/gui-utils.c 2005-03-11 20:17:12.000000000 -0600 -+++ pcb/src/gui-utils.c 2005-03-28 23:46:42.001180627 -0600 -@@ -642,6 +642,7 @@ - { - GtkTextIter iter; - GtkTextBuffer *buffer; -+ GtkTextMark *mark; - - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view)); - gtk_text_buffer_get_end_iter(buffer, &iter); -@@ -664,6 +665,11 @@ - s + 4, -1, "underline", NULL); - else - gtk_text_buffer_insert(buffer, &iter, s, -1); -+ -+ mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE); -+ gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(view), mark, -+ 0, TRUE, 0.0, 1.0); -+ gtk_text_buffer_delete_mark(buffer, mark); - } - - void Index: pcb.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/pcb.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pcb.info 16 Dec 2005 07:53:04 -0000 1.9 +++ pcb.info 9 Nov 2006 03:53:19 -0000 1.10 @@ -1,30 +1,36 @@ Package: pcb # Remember to change snapshot version below as well: -Version: 1.99.20050609 -Revision: 5 +Version: 1.99.20060822 +Revision: 2 -Depends: libstroke-shlibs, app-defaults, tcltk, gtk+2-shlibs, glib2-shlibs, x11-shlibs -BuildDepends: libstroke, tetex-base, texinfo, gawk, gtk+2-dev, x11-dev, atk1 (>= 1.6.0-1), glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 1.4.0-1), pkgconfig, libgettext3-dev, libiconv-dev +Depends: libstroke-shlibs, app-defaults, tcltk, gtk+2-shlibs, glib2-shlibs, x11-shlibs, gd2-shlibs, libjpeg-shlibs, libpng3-shlibs, libgettext3-shlibs +BuildDepends: libstroke, gawk, gtk+2-dev, x11-dev, atk1 (>= 1.6.0-1), glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 1.4.0-1), gd2, libjpeg, libpng3, netpbm-bin, libgettext3-dev, libiconv-dev + +### For documentation: +# Bdep: tetex-base, texinfo +# InfoDocs: pcb.info Recommends: gerbv, gsch2pcb -Source: mirror:sourceforge:pcb/pcb-20050609.tar.gz -Source-MD5: a09473705c80eaf4f796617263d9f8fe +Source: mirror:sourceforge:pcb/pcb-20060822.tar.gz +Source-MD5: e091285d6741860484b31e8ac5b7e37f Patch: %n.patch -ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info --disable-dependency-tracking +ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info --disable-dependency-tracking --disable-doc InstallScript: << make install DESTDIR=%d install -m 755 -d %i/share/doc/pcb - mv %i/share/pcb/{pcb.{pdf,ps},examples,tutorial,refcard.*} %i/share/doc/pcb - mv doc/pcb.html %i/share/doc/pcb + cp -p doc/{pcb.{pdf,ps,html},refcard.*} %i/share/doc/pcb + cp -p doc/*.{pdf,png,eps,gif} %i/share/doc/pcb + cp -pr example tutorial/* %i/share/doc/pcb + rm -f %i/share/doc/pcb/{example,example/libraries,}/Makefile* install -m 755 -d %i/etc/app-defaults mv %i/share/pcb/Pcb %i/etc/app-defaults mv %i/bin/pcb-bin %i/bin/pcb + rmdir %i/share/pcb-20060822 << -InfoDocs: pcb.info DocFiles: << AUTHORS COPYING NEWS README ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits