From f6c77ecf91c512559020a59d392a9c1983a1d001 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 6 Jan 2003 23:47:04 +0000 Subject: [PATCH] configure.in plug-ins/gfig/Makefile.am added a new directory with PNG 2003-01-07 Sven Neumann * configure.in * plug-ins/gfig/Makefile.am * plug-ins/gfig/images/Makefile.am: added a new directory with PNG images for the GFig plug-in. * plug-ins/gfig/images/*.png: placeholder images that need to be replaced (see bug #92473). * plug-ins/gfig/gfig-stock.[ch]: new files that register the images as stock icons. * plug-ins/gfig/gfig.c: use stock icons for the buttons on the left side of the dialog. * plug-ins/gfig/pix_data.h: removed obsoleted images. The remaining ones should get converted as well. --- ChangeLog | 19 + NEWS | 13 + configure.in | 1 + plug-ins/gfig/Makefile.am | 4 +- plug-ins/gfig/gfig-stock.c | 108 ++++++ plug-ins/gfig/gfig-stock.h | 47 +++ plug-ins/gfig/gfig.c | 70 ++-- plug-ins/gfig/images/.cvsignore | 6 + plug-ins/gfig/images/Makefile.am | 31 ++ plug-ins/gfig/images/stock-bezier.png | Bin 0 -> 267 bytes plug-ins/gfig/images/stock-circle.png | Bin 0 -> 248 bytes plug-ins/gfig/images/stock-copy-object.png | Bin 0 -> 278 bytes plug-ins/gfig/images/stock-curve.png | Bin 0 -> 253 bytes plug-ins/gfig/images/stock-delete-object.png | Bin 0 -> 257 bytes plug-ins/gfig/images/stock-ellipse.png | Bin 0 -> 243 bytes plug-ins/gfig/images/stock-line.png | Bin 0 -> 219 bytes plug-ins/gfig/images/stock-move-object.png | Bin 0 -> 297 bytes plug-ins/gfig/images/stock-move-point.png | Bin 0 -> 263 bytes plug-ins/gfig/images/stock-polygon.png | Bin 0 -> 274 bytes plug-ins/gfig/images/stock-spiral.png | Bin 0 -> 251 bytes plug-ins/gfig/images/stock-star.png | Bin 0 -> 297 bytes plug-ins/gfig/pix_data.h | 386 ------------------- po/Makefile.in.in | 19 +- 23 files changed, 268 insertions(+), 436 deletions(-) create mode 100644 plug-ins/gfig/gfig-stock.c create mode 100644 plug-ins/gfig/gfig-stock.h create mode 100644 plug-ins/gfig/images/.cvsignore create mode 100644 plug-ins/gfig/images/Makefile.am create mode 100644 plug-ins/gfig/images/stock-bezier.png create mode 100644 plug-ins/gfig/images/stock-circle.png create mode 100644 plug-ins/gfig/images/stock-copy-object.png create mode 100644 plug-ins/gfig/images/stock-curve.png create mode 100644 plug-ins/gfig/images/stock-delete-object.png create mode 100644 plug-ins/gfig/images/stock-ellipse.png create mode 100644 plug-ins/gfig/images/stock-line.png create mode 100644 plug-ins/gfig/images/stock-move-object.png create mode 100644 plug-ins/gfig/images/stock-move-point.png create mode 100644 plug-ins/gfig/images/stock-polygon.png create mode 100644 plug-ins/gfig/images/stock-spiral.png create mode 100644 plug-ins/gfig/images/stock-star.png diff --git a/ChangeLog b/ChangeLog index cd2a6d3feb..e25e707a05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2003-01-07 Sven Neumann + + * configure.in + * plug-ins/gfig/Makefile.am + * plug-ins/gfig/images/Makefile.am: added a new directory with PNG + images for the GFig plug-in. + + * plug-ins/gfig/images/*.png: placeholder images that need to be + replaced (see bug #92473). + + * plug-ins/gfig/gfig-stock.[ch]: new files that register the + images as stock icons. + + * plug-ins/gfig/gfig.c: use stock icons for the buttons on the + left side of the dialog. + + * plug-ins/gfig/pix_data.h: removed obsoleted images. The + remaining ones should get converted as well. + 2003-01-06 Maurits Rijk * plug-ins/imagemap/imap_preview.c diff --git a/NEWS b/NEWS index e94e514ef5..84adfdd5e4 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,19 @@ development takes place on the road to the next stablerelease dubbed GIMP 1.4. +Overview of Changes in GIMP 1.3.12 +================================== + +- Portability fixes for 64bit platforms [Yosh, Sven] +- Handle large swap files (>2GB) [Sven] +- Updates to the Win32 build system [Tor Lillqvist, Hans Breuer] +- More work on the vectors tool [Simon] +- Lots of bug fixes + +Other contributors: + Maurits Rijk, Garry R. Osgood + + Overview of Changes in GIMP 1.3.11 ================================== diff --git a/configure.in b/configure.in index eb3eabda56..172a4167b2 100644 --- a/configure.in +++ b/configure.in @@ -1150,6 +1150,7 @@ plug-ins/flame/Makefile plug-ins/fp/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile +plug-ins/gfig/images/Makefile plug-ins/gflare/Makefile plug-ins/gflare/gflares/Makefile plug-ins/gfli/Makefile diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index a6df57399b..dd11bf2101 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = gfig-examples +SUBDIRS = gfig-examples images libexecdir = $(gimpplugindir)/plug-ins @@ -8,6 +8,8 @@ libexec_PROGRAMS = gfig gfig_SOURCES = \ gfig.c \ + gfig-stock.c \ + gfig-stock.h \ pix_data.h EXTRA_DIST = README diff --git a/plug-ins/gfig/gfig-stock.c b/plug-ins/gfig/gfig-stock.c new file mode 100644 index 0000000000..68bf7c16b4 --- /dev/null +++ b/plug-ins/gfig/gfig-stock.c @@ -0,0 +1,108 @@ +/* + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This is a plug-in for the GIMP. + * + * Generates images containing vector type drawings. + * + * Copyright (C) 1997 Andy Thomas + * 2003 Sven Neumann + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include + +#include "gfig-stock.h" + +#include "images/gfig-stock-pixbufs.h" + + +static GtkIconFactory *gfig_icon_factory = NULL; + +static GtkStockItem gfig_stock_items[] = +{ + { GFIG_STOCK_BEZIER, NULL, 0, 0, NULL }, + { GFIG_STOCK_CIRCLE, NULL, 0, 0, NULL }, + { GFIG_STOCK_COPY_OBJECT, NULL, 0, 0, NULL }, + { GFIG_STOCK_CURVE, NULL, 0, 0, NULL }, + { GFIG_STOCK_DELETE_OBJECT, NULL, 0, 0, NULL }, + { GFIG_STOCK_ELLIPSE, NULL, 0, 0, NULL }, + { GFIG_STOCK_LINE, NULL, 0, 0, NULL }, + { GFIG_STOCK_MOVE_OBJECT, NULL, 0, 0, NULL }, + { GFIG_STOCK_MOVE_POINT, NULL, 0, 0, NULL }, + { GFIG_STOCK_POLYGON, NULL, 0, 0, NULL }, + { GFIG_STOCK_SPIRAL, NULL, 0, 0, NULL }, + { GFIG_STOCK_STAR, NULL, 0, 0, NULL } +}; + + +static void +add_stock_icon (const gchar *stock_id, + const guint8 *inline_data) +{ + GtkIconSource *source; + GtkIconSet *set; + GdkPixbuf *pixbuf; + + source = gtk_icon_source_new (); + + gtk_icon_source_set_size (source, GTK_ICON_SIZE_BUTTON); + gtk_icon_source_set_size_wildcarded (source, FALSE); + + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_data, FALSE, NULL); + + gtk_icon_source_set_pixbuf (source, pixbuf); + g_object_unref (pixbuf); + + set = gtk_icon_set_new (); + + gtk_icon_set_add_source (set, source); + gtk_icon_source_free (source); + + gtk_icon_factory_add (gfig_icon_factory, stock_id, set); + + gtk_icon_set_unref (set); +} + +void +gfig_stock_init (void) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + gfig_icon_factory = gtk_icon_factory_new (); + + add_stock_icon (GFIG_STOCK_BEZIER, stock_bezier); + add_stock_icon (GFIG_STOCK_CIRCLE, stock_circle); + add_stock_icon (GFIG_STOCK_COPY_OBJECT, stock_copy_object); + add_stock_icon (GFIG_STOCK_CURVE, stock_curve); + add_stock_icon (GFIG_STOCK_DELETE_OBJECT, stock_delete_object); + add_stock_icon (GFIG_STOCK_ELLIPSE, stock_ellipse); + add_stock_icon (GFIG_STOCK_LINE, stock_line); + add_stock_icon (GFIG_STOCK_MOVE_OBJECT, stock_move_object); + add_stock_icon (GFIG_STOCK_MOVE_POINT, stock_move_point); + add_stock_icon (GFIG_STOCK_POLYGON, stock_polygon); + add_stock_icon (GFIG_STOCK_SPIRAL, stock_spiral); + add_stock_icon (GFIG_STOCK_STAR, stock_star); + + gtk_icon_factory_add_default (gfig_icon_factory); + + gtk_stock_add_static (gfig_stock_items, G_N_ELEMENTS (gfig_stock_items)); +} diff --git a/plug-ins/gfig/gfig-stock.h b/plug-ins/gfig/gfig-stock.h new file mode 100644 index 0000000000..cc923fbce0 --- /dev/null +++ b/plug-ins/gfig/gfig-stock.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This is a plug-in for the GIMP. + * + * Generates images containing vector type drawings. + * + * Copyright (C) 1997 Andy Thomas + * 2003 Sven Neumann + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __GFIG_STOCK_H__ +#define __GFIG_STOCK_H__ + + +#define GFIG_STOCK_BEZIER "gfig-bezier" +#define GFIG_STOCK_CIRCLE "gfig-circle" +#define GFIG_STOCK_COPY_OBJECT "gfig-copy-object" +#define GFIG_STOCK_CURVE "gfig-curve" +#define GFIG_STOCK_DELETE_OBJECT "gfig-delete" +#define GFIG_STOCK_ELLIPSE "gfig-ellipse" +#define GFIG_STOCK_LINE "gfig-line" +#define GFIG_STOCK_MOVE_OBJECT "gfig-move-object" +#define GFIG_STOCK_MOVE_POINT "gfig-move-point" +#define GFIG_STOCK_POLYGON "gfig-polygon" +#define GFIG_STOCK_SPIRAL "gfig-spiral" +#define GFIG_STOCK_STAR "gfig-star" + + +void gfig_stock_init (void); + + +#endif /* __GFIG_STOCK_H__ */ diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index 61c945efc6..913a1636ae 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -76,6 +76,8 @@ #include "libgimp/stdplugins-intl.h" +#include "gfig-stock.h" + #include "pix_data.h" @@ -1592,9 +1594,10 @@ gfig_save (void) gfig_save_callbk (); } + /* HACK WARNING */ -void * xxx; -void * yyy; +static void * xxx; +static void * yyy; /* Cache the preview image - updates are a lot faster. */ /* The preview_cache will contain the small image */ @@ -1824,15 +1827,14 @@ obj_select_buttons (void) } static GtkWidget * -but_with_pix (gchar **pixdata, - GSList **group, - gint baction) +but_with_pix (const gchar *stock_id, + GSList **group, + gint baction) { GtkWidget *button; - GtkWidget *alignment; - GtkWidget *pixmap_widget; - button = gtk_radio_button_new (*group); + button = gtk_radio_button_new_with_label (*group, stock_id); + gtk_button_set_use_stock (GTK_BUTTON (button), TRUE); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); g_signal_connect (button, "toggled", G_CALLBACK (toggle_obj_type), @@ -1841,14 +1843,6 @@ but_with_pix (gchar **pixdata, *group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); - alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (button), alignment); - gtk_widget_show (alignment); - - pixmap_widget = gimp_pixmap_new (pixdata); - gtk_container_add (GTK_CONTAINER (alignment), pixmap_widget); - gtk_widget_show (pixmap_widget); - return button; } @@ -2095,27 +2089,27 @@ draw_buttons (GtkWidget *ww) gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); /* Put buttons in */ - button = but_with_pix (line_xpm, &group, LINE); + button = but_with_pix (GFIG_STOCK_LINE, &group, LINE); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_widget_show (button); gimp_help_set_help_data (button, _("Create line"), NULL); - button = but_with_pix (circle_xpm, &group, CIRCLE); + button = but_with_pix (GFIG_STOCK_CIRCLE, &group, CIRCLE); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Create circle"), NULL); - button = but_with_pix (ellipse_xpm, &group, ELLIPSE); + button = but_with_pix (GFIG_STOCK_ELLIPSE, &group, ELLIPSE); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Create ellipse"), NULL); - button = but_with_pix (curve_xpm, &group, ARC); + button = but_with_pix (GFIG_STOCK_CURVE, &group, ARC); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Create arch"), NULL); - button = but_with_pix (poly_xpm, &group, POLY); + button = but_with_pix (GFIG_STOCK_POLYGON, &group, POLY); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); @@ -2124,7 +2118,7 @@ draw_buttons (GtkWidget *ww) NULL); gimp_help_set_help_data (button, _("Create reg polygon"), NULL); - button = but_with_pix (star_xpm, &group, STAR); + button = but_with_pix (GFIG_STOCK_STAR, &group, STAR); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); g_signal_connect (button, "button_press_event", @@ -2132,7 +2126,7 @@ draw_buttons (GtkWidget *ww) NULL); gimp_help_set_help_data (button, _("Create star"), NULL); - button = but_with_pix (spiral_xpm, &group, SPIRAL); + button = but_with_pix (GFIG_STOCK_SPIRAL, &group, SPIRAL); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_widget_show (button); @@ -2141,7 +2135,7 @@ draw_buttons (GtkWidget *ww) NULL); gimp_help_set_help_data (button, _("Create spiral"), NULL); - button = but_with_pix (bezier_xpm, &group, BEZIER); + button = but_with_pix (GFIG_STOCK_BEZIER, &group, BEZIER); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_widget_show (button); g_signal_connect (button, "button_press_event", @@ -2152,22 +2146,22 @@ draw_buttons (GtkWidget *ww) _("Create bezier curve. " "Shift + Button ends object creation."), NULL); - button = but_with_pix (move_obj_xpm, &group, MOVE_OBJ); + button = but_with_pix (GFIG_STOCK_MOVE_OBJECT, &group, MOVE_OBJ); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Move an object"), NULL); - button = but_with_pix (move_point_xpm, &group, MOVE_POINT); + button = but_with_pix (GFIG_STOCK_MOVE_POINT, &group, MOVE_POINT); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Move a single point"), NULL); - button = but_with_pix (copy_obj_xpm, &group, COPY_OBJ); + button = but_with_pix (GFIG_STOCK_COPY_OBJECT, &group, COPY_OBJ); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Copy an object"), NULL); - button = but_with_pix (delete_xpm, &group, DEL_OBJ); + button = but_with_pix (GFIG_STOCK_DELETE_OBJECT, &group, DEL_OBJ); gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); gimp_help_set_help_data (button, _("Delete an object"), NULL); @@ -2176,13 +2170,6 @@ draw_buttons (GtkWidget *ww) gtk_container_add (GTK_CONTAINER (vbox), button); gtk_widget_show (button); -#if 0 - button = but_with_pix (blank_xpm, &group, NULL_OPER); - gtk_container_add (GTK_CONTAINER (vbox), button); - gtk_widget_set_sensitive (button, FALSE); - gtk_widget_show (button); -#endif /* 0 */ - gtk_widget_show (vbox); gtk_widget_show (frame); @@ -3916,6 +3903,7 @@ gfig_dialog (void) GtkWidget *top_level_dlg; gimp_ui_init ("gfig", TRUE); + gfig_stock_init (); yyy = gdk_rgb_get_visual (); xxx = gdk_rgb_get_colormap (); @@ -3933,9 +3921,6 @@ gfig_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - GTK_STOCK_CANCEL, gtk_widget_destroy, - NULL, 1, NULL, FALSE, TRUE, - GTK_STOCK_UNDO, gfig_undo_callback, NULL, NULL, &undo_widget, FALSE, FALSE, @@ -3945,12 +3930,15 @@ gfig_dialog (void) GTK_STOCK_SAVE, save_button_callback, NULL, NULL, &save_button, FALSE, FALSE, + GTK_STOCK_CANCEL, gtk_widget_destroy, + NULL, 1, NULL, FALSE, TRUE, + + GTK_STOCK_CLOSE, gfig_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + _("Paint"), gfig_paint_callback, NULL, NULL, NULL, FALSE, FALSE, - _("Done"), gfig_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, - NULL); g_signal_connect (top_level_dlg, "destroy", diff --git a/plug-ins/gfig/images/.cvsignore b/plug-ins/gfig/images/.cvsignore new file mode 100644 index 0000000000..ef126d0ff5 --- /dev/null +++ b/plug-ins/gfig/images/.cvsignore @@ -0,0 +1,6 @@ +Makefile +Makefile.in +.xvpics +.thumbnails +stock-icons.list +gfig-stock-pixbufs.h diff --git a/plug-ins/gfig/images/Makefile.am b/plug-ins/gfig/images/Makefile.am new file mode 100644 index 0000000000..68b95fb6b0 --- /dev/null +++ b/plug-ins/gfig/images/Makefile.am @@ -0,0 +1,31 @@ +## Process this file with automake to produce Makefile.in + +STOCK_IMAGES = \ + stock-bezier.png \ + stock-circle.png \ + stock-copy-object.png \ + stock-curve.png \ + stock-delete-object.png \ + stock-ellipse.png \ + stock-line.png \ + stock-move-object.png \ + stock-move-point.png \ + stock-polygon.png \ + stock-spiral.png \ + stock-star.png + +EXTRA_DIST = $(STOCK_IMAGES) + +noinst_DATA = gfig-stock-pixbufs.h +CLEANFILES = $(noinst_DATA) stock-icons.list + +stock-icons.list: $(STOCK_IMAGES) Makefile.am + ( rm -f $@; \ + for image in $(STOCK_IMAGES); do \ + echo $$image | \ + sed -e 's|.*/||' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \ + echo " $(srcdir)/$$image" >> $@; \ + done ) + +$(srcdir)/gfig-stock-pixbufs.h: stock-icons.list + gdk-pixbuf-csource --raw --build-list `cat stock-icons.list` > $(@F) diff --git a/plug-ins/gfig/images/stock-bezier.png b/plug-ins/gfig/images/stock-bezier.png new file mode 100644 index 0000000000000000000000000000000000000000..8c69af4e2314e9d605b5b6b24d0e5079c61dc34f GIT binary patch literal 267 zcmV+m0rdWfP)m!0(HOFA&n@$*2F{wL}sQGxiZ`wIpRcxMAuvyk0kIeolS-P3J0RVU_s!mMWW>KVT-cNuSC)tCi7-B6Hx~4+H+Z7C;*oO#l4Z*KWXH*pN zPjGqsKLJ-p+YWZWWc0e})n0V6o8s;N!F7`1tw3}}_MT76mK9%%ttzQ?W;yBcp|-R_ y+)PY5)e=1ArLPQoFSdT8nBQZfBwGSUF?K%EK*&AXZM50|0000Yc7lw~00ks0H&-o}SBPNr!C3;B5_OS;2*D!3 zFTRVFt3AG$O960CE=hE3j6iKbak@uxBX;Wn5dsmK+jR0(Y|3QZ=zK(ggb=NoNbG;~ z!7u$#Pp)p^JDFPMAD47J`U7{$Gn z=#05q*r!3QnCic6=FqIucQ431d!|Gwku$=N#BTHMsvNy=yj8QK00000NkvXXu0mjf Dr9Ez_ literal 0 HcmV?d00001 diff --git a/plug-ins/gfig/images/stock-delete-object.png b/plug-ins/gfig/images/stock-delete-object.png new file mode 100644 index 0000000000000000000000000000000000000000..1b2cef5756c8fa29f32ef8f034ad92dab1410d06 GIT binary patch literal 257 zcmV+c0sj7pP)b{DRoIE~INyZy}EzzCc5h9boDrPUK zRg+{TFN-O1be)?Z(t<1Si$o#t=&0BM?rzin9@hlm=w~%fKj^qQxHnY^jFmJ3>+{N` zJaP97CwV97)BWT<;nV%?MMf*K01&Q>=8My}{(W41&Mf~8jU%s||3#)r00000NkvXX Hu0mjf1ygZL literal 0 HcmV?d00001 diff --git a/plug-ins/gfig/images/stock-ellipse.png b/plug-ins/gfig/images/stock-ellipse.png new file mode 100644 index 0000000000000000000000000000000000000000..a4070842c301856061e52e35a129948128a8b562 GIT binary patch literal 243 zcmVI6(gIN5z|_Bh7}^G>vw$rL-F9 z&h0D`d5ED#hnQDsnEl`Y0En({G9f0g_Vc-UZ~4_*4&`M$J90J0P`{`WBJ$ilP#Uw| t5IQ3o{Re`mS!J;*u_S1+VMM0!?00oia_t$hS zK*-pTzp=|48Oz+J4w&OP*R?`8huvjFvii@D)?*Y2S{It4*R!a!R9UfBt+r%$p*>@t Va_yONKx6;_002ovPDHLkV1g&LaM^UYr|Tx&|U(@5l1?Z8}- z$GD8i1;|J%!0=DU_5TF$#^U1R52@j&(r3q^YhhZ1MWd|)-8#bw23Z(Bdj vIU=FWtl<2UBYHBFl}t9>85JINUQ;{(AC%3E(Uib500000NkvXXu0mjfNuz~E literal 0 HcmV?d00001 diff --git a/plug-ins/gfig/images/stock-move-point.png b/plug-ins/gfig/images/stock-move-point.png new file mode 100644 index 0000000000000000000000000000000000000000..87451404d0b3229497bab6fa6fd42ce5c7fb4a4d GIT binary patch literal 263 zcmV+i0r>ujP){>eqG*0W=YX0bZT z%K&kzRvTYN)luiclWE$r3MSTFkS>5#?^&EYK4;);BR;+ZGzM@Zc(cjK{^7uuQkr1q zJ<%?_Y$IcoCMdlNuUk9-wR4}Bx5c`(?d?5?jNS^UM@IJ#2B&?A@d5f7mK6&0xYP))0PjSOPwh+GI(ZYGo9dk%BZSH?5Y-hB_ePuH)7OPBxige=<1T zcn4dvNKP%oRvQ6~Hy<9PxCk4PEC+`$aTik_kHrkAjyM7e5Nv0a75rr z5V~Gh>1PD41flD=s%@J@$HZL{(lvX~R$(K8q_#UG`#Ji^$T_S`1|}o@wTqUKj&HPy zS#a?8?fSa|n7G@=fA^PfcV4~ZB2CYlpIzfX;@|x;ZF+JjS}v4UOhIqQJp&DD%rd z_lvJD=nG{n(6uv*oTTQJn=avY^qTY>o~FYGtu&T)^;PHZkOk^=VGvj-wIOFq;~iOs zi?Lr!ZIWu7rtN5ASCfp4V>B|_JMkgUWy$4*Z3`uq>wZ<3vO47C9~<3^J(nxom8Ub@ zdi3wd-Nfy|({8`~{QW!QtA7{UqB2X~J$1LtJ$KI2egn7C^NLE=zA86ssb49nm!^xU yFv%?a@yOznM9(Bw+aQP9JJPw&iaNDEuG+@S~My@L$l)VSL4Y#u6-O+H@CY?oDg+zL;sw>SP3Ynd=YMN!ktFip_W#i>& v*nA(d9|EpM)}8dd(v8Q{Z#dqpq*B00000NkvXXu0mjfJ8^-- literal 0 HcmV?d00001 diff --git a/plug-ins/gfig/pix_data.h b/plug-ins/gfig/pix_data.h index 40d153d695..9874521572 100644 --- a/plug-ins/gfig/pix_data.h +++ b/plug-ins/gfig/pix_data.h @@ -1,229 +1,3 @@ -/* XPM */ -static char * circle_xpm[] = { -"24 24 4 1", -" s None c None", -". c black", -"X c red", -"o c white", -" ", -" ... ", -" ... ... ", -" . . ", -" . XXX ", -" . XoX ", -" . XXX ", -" . XXX . ", -" . XoX . ", -" . XXX . ", -" . . ", -" . . ", -" . . ", -" . . ", -" ... ... ", -" ... ", -" ", -" ", -" ... ... ... ... . ...", -".. . . . .. . . ", -". . . . . . . ", -". . .. . . .. ", -".. . . . .. . . ", -" ... ... . . ... ......"}; - -/* XPM */ -static char * ellipse_xpm[] = { -"24 24 4 1", -" s None c None", -". c black", -"X c red", -"o c white", -" ", -" ", -" .......... ", -" . . ", -" . . ", -" . . ", -" . . ", -" . XXX . ", -" . XoX . ", -" . XXX . ", -" . . ", -" . . ", -" . . ", -" . . XXX ", -" .......... XoX ", -" XXX ", -" ", -"... . . ... .. ... ...", -". . . . . .. . ", -"... . . . . ... ...", -". . . . .. . . ", -". . . . . .. ", -"... ......... . ... ...", -" "}; - -static char * curve_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ", -" ", -" ... ", -" .X.ooo ", -" o... oo ", -" oo oo ", -" o o ", -" o o ", -" o ... ", -" o .X. ", -" o ... ", -" ... ", -" .X. ", -" ... ", -" ", -" ", -" ", -" ooo o o ooo o o ooo ", -"oo o o o o o o o ", -"o o o o o o o ooo ", -"o o o oo o o o ", -"oo o o o o o o o ", -" ooo oooo o o o ooo "}; - -/* XPM */ -static char * line_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ", -" ... ", -" .X. ", -" ... ", -" oo ", -" oo ", -" oo ", -" oo ", -" oo ", -" oo ", -" ... ", -" .X. ", -" ... ", -" ", -" ", -" ", -" o ooo o o oooo ", -" o o oo o o ", -" o o oo o ooo ", -" o o o oo o ", -" o o o oo o ", -" oooo ooo o o oooo ", -" "}; - - -/* XPM */ -static char * move_obj_xpm[] = { -"24 24 4 1", -" s None c None", -". c black", -"X c red", -"o c white", -" . ", -" XXX . XXX ", -" XoX ..... XoX ", -" XXX . XXX ", -" X . . ", -" X . ", -" X . . ", -" X . . ", -" X ..... . ", -" X . . ", -" X . . ", -" XXX XXX ", -" XoX XoX ", -" XXX XXX ", -" ", -" ", -" ", -" . . ... . . .... ", -" .. .. .. .. . . . ", -" .. .. . . . . ... ", -" .. .. . . . . . ", -" . . . .. .. ... . ", -" . . . ... . .... ", -" "}; - -/* XPM */ -static char * copy_obj_xpm[] = { -"24 24 4 1", -" s None c None", -". c black", -"X c red", -"o c white", -" ", -" . ", -" XXX . XXX ", -" XoX ..... XoX ", -" XXX . XXX ", -" . . . ", -" . . ", -" . . ", -" . . ", -" . . . ", -" . . . ", -" . ..... . ", -" . . . ", -" XXX . XXX ", -" XoX XoX ", -" XXX XXX ", -" ", -" .... ... .... . . ", -" .. .. .. . . . . ", -" . . . . . . . ", -" . . . ... . ", -" .. . .. .. . . ", -" .... ... . . ", -" "}; - -/* XPM */ -static char * move_point_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ", -" ", -" ... ", -" .X. ", -" ...oo ", -" . oo ", -" . ooo ... ", -" . oo.X. ", -" . ... ", -" . ", -" . oooo ", -" . oo ", -" . o o ", -" ... o o ", -" .X. o ", -" ... ", -" ", -"oo oo ooo o oooooo ", -"o o o o o oo o o ", -"o o o o o o o oo o o ", -"o o o o o ooo o oo o ", -"o o o o o o o oo o ", -"o o o o o o o o "}; - - - /* XPM */ static char * mini_cross_xpm[] = { "16 14 4 1", @@ -314,166 +88,6 @@ static char * Floppy6_xpm[] = { " &&&&&&&&&&&& ", " "}; -/* XPM */ -static char * poly_xpm[] = { -"24 24 3 1", -" c None", -". c red", -"X c black", -" ", -" ... ... ", -" . . . . ", -" ... ... ", -" X X X X ", -" X X X X ", -" X X... ... ...", -" X . . . . . .", -" X X... ... ...", -" X X X X ", -" ...X X X ", -" . . ... ", -" ... . . ", -" ... ", -" ", -" ", -" ", -" XXXX XX X X X ", -" X X X X X X X ", -" X X X X X X X ", -" XXX X X X X ", -" X X X X X ", -" X XX XXXX X ", -" "}; - -/* XPM */ -static char * delete_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ", -" ", -" ... . ", -" .X. . ", -" ...o . ", -" oo .. ", -" .................. ", -" . oo ", -" . oo ", -" . ... ", -" .. .X. ", -" . ... ", -" . ", -" . ", -" ", -" ", -" ", -"ooo ooo o ooooooooooo", -"o o o o o o o ", -"o o ooo o ooo o ooo", -"o o o o o o o ", -"o o o o o o o ", -"ooo ooo ooooooo o ooo"}; - -/* XPM */ -static char * star_xpm[] = { -"24 24 4 1", -" s None c None", -". c black", -"X c red", -"o c white", -" . ", -" ... ", -" . . ", -" . . ", -" . . ", -" .. .. XXX ", -" ........ ......XoX ", -" .. XXX .XXX ", -" .. XXX XoX.. ", -" .. XoX XXX ", -" .. XXX .. ", -" . . ", -" . . . ", -" .. .... . ", -" . .. .. . ", -" ... ... ", -" .. .. ", -" . . ", -" ... ..... . ... ", -" . . ... . . ", -" .. . . . . . ", -" .. . ... .. ", -" . . . . . . ", -" ... . . . . . "}; - -/* XPM */ -static char * spiral_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ... ", -" .X.ooooooooooooooo ", -" ... o ", -" o ", -" oooooooooooo o ", -" o o o ", -" o ... o o ", -" o ooo.X. o o ", -" o o ... o o ", -" o o o o ", -" o ooooooooo o ", -" o o ", -" o o ", -" ooooooooooooooo ", -" ", -" ", -"ooo ooo o ooo o o ", -"o o o o o o ooo o ", -"oo o o o o o o o o ", -" oo ooo o oo ooo o ", -" o o o o o o o o ", -"ooo o o o o o o ooo", -" "}; - -/* XPM */ -static char * bezier_xpm[] = { -"24 24 4 1", -" s None c None", -". c red", -"X c white", -"o c black", -" ", -" ... ... ", -" .X. .X. ", -" ... o... ", -" o ", -" ooooo o ", -" o oo o ", -" o ooo ", -" o ", -" o ... ", -" o .X. ", -" ... ... ", -" .X. ", -" ... ", -" ", -" ", -" ", -" oooXooo ooo o ooo oo ", -" o oXo o o o o o ", -" oooXooo o o ooo o o ", -" o oXo o o o oo ", -" o oXo o o o o o ", -" oooXooo ooo o ooo o o ", -" "}; - - /* XPM */ static char * rulers_comp_xpm[] = { "74 85 192 2", diff --git a/po/Makefile.in.in b/po/Makefile.in.in index ee22e42a73..8f116b1895 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -26,11 +26,10 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = @datadir@ -libdir = @libdir@ -localedir = $(libdir)/locale -gnulocaledir = $(datadir)/locale -gettextsrcdir = $(datadir)/glib-2.0/gettext/po +datadir = $(prefix)/@DATADIRNAME@ +localedir = $(datadir)/locale +gnulocaledir = $(prefix)/share/locale +gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po subdir = po INSTALL = @INSTALL@ @@ -39,10 +38,13 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ CC = @CC@ GENCAT = @GENCAT@ -GMSGFMT = @GMSGFMT@ +GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -MSGMERGE = msgmerge +XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -195,6 +197,7 @@ dist distdir: update-po $(DISTFILES) update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot + PATH=`pwd`/../src:$$PATH; \ cd $(srcdir); \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \