callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resurrected mail plug-in. Thanks to David Odin <dindinx@wanadoo.fr> for

Browse Source 
2001-09-17  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/mail.c: resurrected mail plug-in. Thanks to
	David Odin <dindinx@wanadoo.fr> for the patch.

	* plug-ins/common/.cvsignore
	* plug-ins/common/Makefile.am
	* plug-ins/common/plugin-defs.pl: build mail, nlfilt and plugindetails
	plug-ins again.

	* tips/Makefile.am
	* tips/gimp_conseils.fr.txt: removed ...
	* tips/gimp_tips.fr.txt: ... and readded under this name.
This commit is contained in:
Sven Neumann
2001-09-17 12:01:27 +00:00
committed by Sven Neumann
parent 2fd4615bc4
commit d871f9035e
8 changed files with 108 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plug-ins/common/.cvsignore
View File

@ -67,11 +67,13 @@ jigsaw
jpeg jpeg
laplace laplace
lic lic
mail
mapcolor mapcolor
max_rgb max_rgb
mblur mblur
mpeg mpeg
newsprint newsprint
nlfilt
noisify noisify
normalize normalize
nova nova
@ -82,6 +84,7 @@ pcx
pix pix
pixelize pixelize
plasma plasma
plugindetails
png png
pnm pnm
polar polar

45
plug-ins/common/Makefile.am
View File

@ -86,11 +86,13 @@ libexec_PROGRAMS = @STRIP_BEGIN@ \
$(JPEG) \ $(JPEG) \
laplace \ laplace \
lic \ lic \
mail \
mapcolor \ mapcolor \
max_rgb \ max_rgb \
mblur \ mblur \
$(MPEG) \ $(MPEG) \
newsprint \ newsprint \
nlfilt \
noisify \ noisify \
normalize \ normalize \
nova \ nova \
@ -101,6 +103,7 @@ libexec_PROGRAMS = @STRIP_BEGIN@ \
pix \ pix \
pixelize \ pixelize \
plasma \ plasma \
plugindetails \
$(PNG) \ $(PNG) \
pnm \ pnm \
polar \ polar \
@ -1061,6 +1064,20 @@ lic_LDADD = @STRIP_BEGIN@ \
$(INTLLIBS) \ $(INTLLIBS) \
@STRIP_END@ @STRIP_END@
mail_SOURCES = @STRIP_BEGIN@ \
mail.c \
@STRIP_END@
mail_LDADD = @STRIP_BEGIN@ \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(INTLLIBS) \
@STRIP_END@
mapcolor_SOURCES = @STRIP_BEGIN@ \ mapcolor_SOURCES = @STRIP_BEGIN@ \
mapcolor.c \ mapcolor.c \
@STRIP_END@ @STRIP_END@
@ -1130,6 +1147,20 @@ newsprint_LDADD = @STRIP_BEGIN@ \
$(INTLLIBS) \ $(INTLLIBS) \
@STRIP_END@ @STRIP_END@
nlfilt_SOURCES = @STRIP_BEGIN@ \
nlfilt.c \
@STRIP_END@
nlfilt_LDADD = @STRIP_BEGIN@ \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(INTLLIBS) \
@STRIP_END@
noisify_SOURCES = @STRIP_BEGIN@ \ noisify_SOURCES = @STRIP_BEGIN@ \
noisify.c \ noisify.c \
@STRIP_END@ @STRIP_END@
@ -1268,6 +1299,20 @@ plasma_LDADD = @STRIP_BEGIN@ \
$(INTLLIBS) \ $(INTLLIBS) \
@STRIP_END@ @STRIP_END@
plugindetails_SOURCES = @STRIP_BEGIN@ \
plugindetails.c \
@STRIP_END@
plugindetails_LDADD = @STRIP_BEGIN@ \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(INTLLIBS) \
@STRIP_END@
png_SOURCES = @STRIP_BEGIN@ \ png_SOURCES = @STRIP_BEGIN@ \
png.c \ png.c \
@STRIP_END@ @STRIP_END@

95
plug-ins/common/mail.c
View File

@ -140,12 +140,12 @@ static GimpPDBStatusType save_image (gchar *filename,
gint32 run_mode); gint32 run_mode);
static gint save_dialog (void); static gint save_dialog (void);
static void ok_callback (GtkWidget *widget, static void ok_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void mail_entry_callback (GtkWidget *widget, static void mail_entry_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void mesg_body_callback (GtkWidget *widget, static void mesg_body_callback (GtkTextBuffer *buffer,
gpointer data); gpointer data);
static gint valid_file (gchar *filename); static gint valid_file (gchar *filename);
static void create_headers (FILE *mailpipe); static void create_headers (FILE *mailpipe);
@ -189,7 +189,7 @@ static m_info mail_info =
if you prefer that as the default */ if you prefer that as the default */
}; };
static gchar * mesg_body = "\0"; static gchar * mesg_body = NULL;
static gint run_flag = 0; static gint run_flag = 0;
MAIN () MAIN ()
@ -436,14 +436,14 @@ save_image (gchar *filename,
static gint static gint
save_dialog (void) save_dialog (void)
{ {
GtkWidget *dlg; GtkWidget *dlg;
GtkWidget *entry; GtkWidget *entry;
GtkWidget *table; GtkWidget *table;
GtkWidget *table2; GtkWidget *label;
GtkWidget *label; GtkWidget *vbox;
GtkWidget *vbox; GtkWidget *scrolled_window;
GtkWidget *text; GtkWidget *text_view;
GtkWidget *vscrollbar; GtkTextBuffer *text_buffer;
gchar buffer[BUFFER_SIZE]; gchar buffer[BUFFER_SIZE];
gchar *gump_from; gchar *gump_from;
@ -545,34 +545,30 @@ save_dialog (void)
&mail_info.filename); &mail_info.filename);
/* comment */ /* comment */
table2 = gtk_table_new (2, 2, FALSE); scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_table_set_row_spacing (GTK_TABLE (table2), 0, 2); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
gtk_table_set_col_spacing (GTK_TABLE (table2), 0, 2); GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 4);
gtk_table_attach (GTK_TABLE (table), scrolled_window,
0, 2, 5, 6,
GTK_EXPAND | GTK_FILL,
GTK_EXPAND | GTK_FILL,
0, 0);
gtk_widget_show (scrolled_window);
gtk_table_attach (GTK_TABLE (table), table2, text_buffer = gtk_text_buffer_new (NULL);
0, 2, 5, 6,
GTK_EXPAND | GTK_FILL,
GTK_EXPAND | GTK_FILL,
0, 0);
text = gtk_text_new (NULL, NULL); text_view = gtk_text_view_new_with_buffer (text_buffer);
gtk_text_set_editable (GTK_TEXT (text), TRUE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_table_attach (GTK_TABLE (table2), text, gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
0, 1, 0, 1, gtk_widget_show (text_view);
GTK_EXPAND | GTK_FILL,
GTK_EXPAND | GTK_FILL,
0, 0);
gtk_widget_set_usize (text, 200, 100);
gtk_widget_show (text);
gtk_signal_connect (GTK_OBJECT (text), "changed",
GTK_SIGNAL_FUNC (mesg_body_callback),
mesg_body);
gtk_widget_show (table2);
vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj); g_object_unref (G_OBJECT (text_buffer));
gtk_table_attach (GTK_TABLE (table2), vscrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); g_signal_connect (G_OBJECT (text_buffer), "changed",
gtk_widget_show (vscrollbar); G_CALLBACK (mesg_body_callback),
NULL);
/* Encapsulation label */ /* Encapsulation label */
label = gtk_label_new (_("Encapsulation:")); label = gtk_label_new (_("Encapsulation:"));
@ -724,11 +720,19 @@ mail_entry_callback (GtkWidget *widget,
} }
static void static void
mesg_body_callback (GtkWidget *widget, mesg_body_callback (GtkTextBuffer *buffer,
gpointer data) gpointer data)
{ {
mesg_body = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, GtkTextIter start_iter;
gtk_text_get_length (GTK_TEXT (widget))); GtkTextIter end_iter;
gchar *text;
gtk_text_buffer_get_bounds (buffer, &start_iter, &end_iter);
gtk_text_iter_backward_char (&end_iter);
if (mesg_body)
g_free (mesg_body);
mesg_body = gtk_text_buffer_get_text (buffer, &start_iter, &end_iter, FALSE);
} }
static void static void
@ -757,7 +761,8 @@ create_headers (FILE *mailpipe)
} }
fprintf (mailpipe, mail_info.comment); fprintf (mailpipe, mail_info.comment);
fprintf (mailpipe, "\n\n"); fprintf (mailpipe, "\n\n");
fprintf (mailpipe, mesg_body); if (mesg_body)
fprintf (mailpipe, mesg_body);
fprintf (mailpipe, "\n\n"); fprintf (mailpipe, "\n\n");
if (mail_info.encapsulation == ENCAPSULATION_MIME ) if (mail_info.encapsulation == ENCAPSULATION_MIME )
{ {

6
plug-ins/common/plugin-defs.pl
View File

@ -64,13 +64,13 @@
'jpeg' => { libdep => 'gtk', ui => 1, optional => 1 }, 'jpeg' => { libdep => 'gtk', ui => 1, optional => 1 },
'laplace' => { libdep => 'glib', ui => 1 }, 'laplace' => { libdep => 'glib', ui => 1 },
'lic' => { libdep => 'gtk', ui => 1 }, 'lic' => { libdep => 'gtk', ui => 1 },
# 'mail' => { libdep => 'gtk', ui => 1 }, 'mail' => { libdep => 'gtk', ui => 1 },
'mapcolor' => { libdep => 'gtk', ui => 1 }, 'mapcolor' => { libdep => 'gtk', ui => 1 },
'max_rgb' => { libdep => 'gtk', ui => 1 }, 'max_rgb' => { libdep => 'gtk', ui => 1 },
'mblur' => { libdep => 'gtk', ui => 1 }, 'mblur' => { libdep => 'gtk', ui => 1 },
'mpeg' => { libdep => 'gtk', optional => 1 }, 'mpeg' => { libdep => 'gtk', optional => 1 },
'newsprint' => { libdep => 'gtk', ui => 1 }, 'newsprint' => { libdep => 'gtk', ui => 1 },
# 'nlfilt' => { libdep => 'gtk', ui => 1 }, 'nlfilt' => { libdep => 'gtk', ui => 1 },
'noisify' => { libdep => 'gtk', ui => 1 }, 'noisify' => { libdep => 'gtk', ui => 1 },
'normalize' => { libdep => 'glib' }, 'normalize' => { libdep => 'glib' },
'nova' => { libdep => 'gtk', ui => 1 }, 'nova' => { libdep => 'gtk', ui => 1 },
@ -81,7 +81,7 @@
'pix' => { libdep => 'gtk', ui => 1 }, 'pix' => { libdep => 'gtk', ui => 1 },
'pixelize' => { libdep => 'gtk', ui => 1 }, 'pixelize' => { libdep => 'gtk', ui => 1 },
'plasma' => { libdep => 'gtk', ui => 1 }, 'plasma' => { libdep => 'gtk', ui => 1 },
# 'plugindetails' => { libdep => 'gtk', ui => 1 }, 'plugindetails' => { libdep => 'gtk', ui => 1 },
'png' => { libdep => 'gtk', ui => 1, optional => 1 }, 'png' => { libdep => 'gtk', ui => 1, optional => 1 },
'pnm' => { libdep => 'gtk', ui => 1 }, 'pnm' => { libdep => 'gtk', ui => 1 },
'polar' => { libdep => 'gtk', ui => 1 }, 'polar' => { libdep => 'gtk', ui => 1 },

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2001-09-17 Sven Neumann <sven@gimp.org>
* fr.po: changed gimp_conseils.fr.txt to gimp_tips.fr.txt.
2001-09-17 Andras Timar <timar@gnome.hu> 2001-09-17 Andras Timar <timar@gnome.hu>
* hu.po: converted to UTF-8. * hu.po: converted to UTF-8.

4
po/fr.po
View File

@ -12,7 +12,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gimp 1.3.0\n" "Project-Id-Version: gimp 1.3.0\n"
"POT-Creation-Date: 2001-08-29 10:12+0200\n" "POT-Creation-Date: 2001-08-29 10:12+0200\n"
"PO-Revision-Date: 2001-08-29 10:12+0200\n" "PO-Revision-Date: 2001-09-17 13:29+0200\n"
"Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n" "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
"Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n" "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -4791,7 +4791,7 @@ msgstr "pr
#: app/gui/tips-dialog.c:81 #: app/gui/tips-dialog.c:81
msgid "gimp_tips.txt" msgid "gimp_tips.txt"
msgstr "gimp_conseils.fr.txt" msgstr "gimp_tips.fr.txt"
#: app/gui/tips-dialog.c:96 #: app/gui/tips-dialog.c:96
msgid "GIMP Tip of the Day" msgid "GIMP Tip of the Day"

2
tips/Makefile.am
View File

@ -7,7 +7,7 @@ tipsdata_DATA = \
gimp_tips.cs.txt \ gimp_tips.cs.txt \
gimp_tips.de.txt \ gimp_tips.de.txt \
gimp_tips.es.txt \ gimp_tips.es.txt \
gimp_conseils.fr.txt \ gimp_tips.fr.txt \
gimp_tips.it.txt \ gimp_tips.it.txt \
gimp_tips.ja.txt \ gimp_tips.ja.txt \
gimp_tips.ko.txt \ gimp_tips.ko.txt \

0
tips/gimp_conseils.fr.txt → tips/gimp_tips.fr.txt
View File