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

Imported Upstream version 2.3.14

Browse Source
This commit is contained in:
Ari Pollak
2010-08-11 01:20:46 -04:00
parent bbd6d9844c
commit aca02f7697
2412 changed files with 114847 additions and 56535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1487
ChangeLog
View File

File diff suppressed because it is too large Load Diff

76
HACKING
View File

@ -26,24 +26,25 @@ Beta software can be found at alpha.gnu.org.
- ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/
These are only the additional requirements if you want to compile from
CVS. The file INSTALL lists the various libraries we depend on.
the Subversion repository. The file INSTALL lists the various libraries
we depend on.
Compilation
-----------
If you are accessing gimp via CVS, then you will need to take several
steps to get it to compile. You can do all these steps at once
If you are accessing gimp via Subversion, then you will need to take
several steps to get it to compile. You can do all these steps at once
by running:
cvsroot/gimp$ ./autogen.sh
gimp/trunk$ ./autogen.sh
Basically this does the following for you:
cvsroot/gimp$ aclocal-1.9; libtoolize; automake-1.9 -a;
cvsroot/gimp$ autoconf; glib-gettextize; intltoolize
gimp/trunk$ aclocal-1.9; libtoolize; automake-1.9 -a;
gimp/trunk$ autoconf; glib-gettextize; intltoolize
The above commands create the "configure" script. Now you can run the
configure script in cvsroot/gimp to create all the Makefiles.
configure script in gimp/trunk to create all the Makefiles.
Before running autogen.sh or configure, make sure you have libtool in
your path. Also make sure glib-2.0.m4 glib-gettext.m4, gtk-2.0.m4,
@ -69,30 +70,39 @@ disable the support for gtk-doc so you will not be able to generate
the API documentation.
CVS
---
GIMP is available from GNOME CVS. You can also grab glib, pango, atk,
gtk+, libart, gtkhtml2 as well as intltool and gtk-doc from the same
CVS server. You can use the following commands to get them from the
anonymous CVS server:
Subversion
----------
GIMP is available from GNOME Subversion. You can also grab glib, pango,
atk, gtk+, libart, gtkhtml2 as well as intltool and gtk-doc from the
same Subversion server. You can use the following commands to get them
from the anonymous Subversion server:
For getting the trunk, use:
$ svn co http://svn.gnome.org/svn/<module>/trunk <module>
For getting a branch, use:
$ svn co http://svn.gnome.org/svn/<module>/branches/<branch> <module>
$ export CVSROOT=':pserver:anonymous@anoncvs.gimp.org:/cvs/gnome'
$ cvs login
(there is no password, just hit return)
$ cvs -z3 checkout [-r <branch>] <module>
The interesting modules and the suggested stable branches to use are:
* gimp
* glib (glib-2-8)
* atk (gnome-2-12)
* pango (pango-1-10)
* gtk+ (gtk-2-8)
* glib (glib-2-12)
* atk (gnome-2-16)
* pango (pango-1-14)
* gtk+ (gtk-2-10)
* libart_lgpl
* gtkhtml2
* intltool
* gtk-doc
You can read more on using GNOME's Subversion service at these URLs:
http://developer.gnome.org/tools/svn.html
http://svnbook.red-bean.com/
Patches
-------
@ -105,20 +115,28 @@ patch needs to be discussed, you should also consider using the
mailing list instead of Bugzilla because bug reports tend to be hard
to read if they contain too many comments. For the code, please try to
follow the guidelines given in Hackordnung, below. You can create the
patch file with "cvs diff", preferably with a ~/.cvsrc containing
"diff -up". All kinds of contributions are appreciated.
patch file with "svn diff", preferably in an annotated patch format.
This can be achieved with ~/.subversion/config containing a custom
diff command in the [helpers] section:
[helpers]
diff-cmd = /usr/local/bin/_svndiff
And create an executable script in /usr/local/bin/_svndiff with the
following contents:
#!/bin/sh
/usr/bin/diff -up --label "${3}" ${6} --label "${5}" ${7}
Autogenerated Files
-------------------
Auto-generated Files
--------------------
Please notice that some files in the source are generated from other
sources. All those files have a short notice about being autogenerated
sources. All those files have a short notice about being generated
somewhere at the top. Among them are the files ending in _pdb.[ch] in
the libgimp directory and the files ending in _cmds.c in the app/pdb
subdirectory. Those are generated from the respective .pdb files in
tools/pdbgen/pdb. The list of contributors is used in several files
which are for that reason generated from the file contributors in
tools/authorsgen.
tools/pdbgen/pdb.
Hackordnung

19
INSTALL
View File

@ -29,7 +29,7 @@ header files installed.
from http://www.freedesktop.org/software/pkgconfig/.
2. You need to have installed GTK+ version 2.8.17 or newer. GIMP
needs an even more recent version of GLib (>= 2.10.2). It also
needs an even more recent version of GLib (>= 2.12.3). It also
wants Pango (>= 1.12.2). Sources for these can be grabbed from
ftp://ftp.gtk.org/.
@ -42,27 +42,30 @@ header files installed.
Older versions are known to have bugs that seriously affect
stability of GIMP.
4. We use libart2. Grab the module libart_lgpl out of GNOME CVS or
4. We use libart2. Grab the module libart_lgpl out of GNOME SVN or
fetch the tarball from
ftp://ftp.gnome.org/pub/gnome/sources/libart_lgpl/
5. You may want to install other third party libraries or programs
5. We use dbus-glib if available. Grab it from
http://dbus.freedesktop.org/releases/dbus-glib/
6. You may want to install other third party libraries or programs
that are needed for some of the available plugins. We recommend
to check that the following libraries are installed: libpng,
libjpeg, libpoppler, libtiff, gtkhtml-2, libmng, librsvg, libwmf.
6. The Python extension requires Python development headers to be
7. The Python extension requires Python development headers to be
present. You will also need PyGTK and the respective development
headers.
7. Configure GIMP by running the `configure' script. You may want
8. Configure GIMP by running the `configure' script. You may want
to pass some options to it, see below.
8. Build GIMP by running `make'. The use of GNU make is recommended.
9. Build GIMP by running `make'. The use of GNU make is recommended.
If you need to tweak the build to make it work with other flavours
of make, we'd appreciate if you'd send us a patch with the changes.
9. Install GIMP by running `make install'. In order to avoid clashes
10. Install GIMP by running `make install'. In order to avoid clashes
with other versions of GIMP, we install a binary called gimp-2.3.
By default there's also a link created so that you can type 'gimp'
to start gimp-2.3.
@ -164,7 +167,7 @@ These are:
--enable-gtk-doc. This option controls whether the libgimp API
references will be created using gtk-doc. The HTML pages are
included in a standard tarball, so you will only need this if you
are building from CVS.
are building from SVN.
--with-html-dir=PATH. This option allows to specify where the
libgimp API reference should be installed. You might want to modify

4
Makefile.in
View File

@ -138,6 +138,9 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@
DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@
DEFS = @DEFS@
@ -175,6 +178,7 @@ GIMPINSTALL = @GIMPINSTALL@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
GIMP_COMMAND = @GIMP_COMMAND@
GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
GIMP_FULL_NAME = @GIMP_FULL_NAME@
GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@

18
NEWS
View File

@ -7,6 +7,24 @@ This is the development branch of GIMP. Here's where all the shiny
new stuff is being done that will one day be released as GIMP 2.4.
Changes in GIMP 2.3.14
======================
- added actions to control brush spacing
- polished appearance of image window
- scale the brush's spacing when scaling the brush
- save tool presets when they are changed
- improved handling of vectors in the Python bindings
- allow for auto-cropping the result of the transform tools
- added GimpRatioEntry widget and use it in the rectangle tool options
- added functions to transform between preview and image coordinates
- added PDB functions to validate display, drawable, image and vectors IDs
- added HSL color model to Decompose and Compose plug-ins
- further improved status bar messages for tools
- on systems with D-Bus build gimp-remote functionality into gimp executable
- bug fixes and code cleanup
Changes in GIMP 2.3.13
======================

20
README.i18n
View File

@ -169,15 +169,17 @@ this one may not necessarily fit.
po-tips/gimp20-tips.pot -- the startup tips
If you are looking for the translations of gimp-perl, please note that
gimp-perl has been moved into it's own CVS module called gimp-perl.
gimp-perl has been moved into it's own Subversion module called
gimp-perl.
The version of GIMP you are holding in your hand uses GTK+-2.0.
GTK+-2.0 requires that all strings are UTF-8 encoded. Therefore to make
internationalisation work, po files need to be UTF-8 encoded. If your
editor doesn't support UTF-8, you need to convert it to an encoding your
editor can handle and convert it back to UTF-8 before commiting your
changes back. The gnome-i18n module in CVS has some scripts that help
with this task, but it can also easily done using iconv.
GTK+-2.0 requires that all strings are UTF-8 encoded. Therefore to
make internationalisation work, po files need to be UTF-8 encoded. If
your editor doesn't support UTF-8, you need to convert it to an
encoding your editor can handle and convert it back to UTF-8 before
commiting your changes back. The gnome-i18n module in Subversion has
some scripts that help with this task, but it can also easily done
using iconv.
7. Adding additional textdomains
@ -214,8 +216,8 @@ this one may not necessarily fit.
Any help with translations is appreciated. If you want to help,
please get in contact with the people from the GNOME Translation
Project who coordinate all translation efforts in the GNOME CVS
tree. They have a nice web-page at
Project who coordinate all translation efforts in the GNOME
Subversion tree. They have a nice web-page at
http://developer.gnome.org/projects/gtp/.
10. And more?

3
aclocal.m4 vendored
View File

@ -605,8 +605,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"`
else
@ -614,6 +616,7 @@ else
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])

2
app/Makefile.am
View File

@ -89,6 +89,7 @@ INCLUDES = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(includedir)
gimp_2_3_LDFLAGS = $(mwindows) $(munix) -u $(SYMPREFIX)xcf_init -u $(SYMPREFIX)internal_procs_init
@ -127,6 +128,7 @@ gimp_2_3_LDADD = \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \

8
app/Makefile.in
View File

@ -88,7 +88,7 @@ gimp_2_3_DEPENDENCIES = gui/libappgui.a actions/libappactions.a \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_10)
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10)
am__gimp_console_2_3_SOURCES_DIST = app_procs.c app_procs.h main.c \
about.h batch.c batch.h errors.c errors.h sanity.c sanity.h \
units.c units.h gimp-intl.h
@ -200,6 +200,9 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@
DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@
DEFS = @DEFS@
@ -237,6 +240,7 @@ GIMPINSTALL = @GIMPINSTALL@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
GIMP_COMMAND = @GIMP_COMMAND@
GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
GIMP_FULL_NAME = @GIMP_FULL_NAME@
GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@
@ -580,6 +584,7 @@ INCLUDES = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(includedir)
gimp_2_3_LDFLAGS = $(mwindows) $(munix) -u $(SYMPREFIX)xcf_init -u $(SYMPREFIX)internal_procs_init
@ -617,6 +622,7 @@ gimp_2_3_LDADD = \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \

4
app/about.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -27,7 +27,7 @@
_("GNU Image Manipulation Program")
#define GIMP_COPYRIGHT \
_("Copyright © 1995-2006\n" \
_("Copyright © 1995-2007\n" \
"Spencer Kimball, Peter Mattis and the GIMP Development Team")
#define GIMP_LICENSE \

4
app/actions/Makefile.in
View File

@ -154,6 +154,9 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@
DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@
DEFS = @DEFS@
@ -191,6 +194,7 @@ GIMPINSTALL = @GIMPINSTALL@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
GIMP_COMMAND = @GIMP_COMMAND@
GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
GIMP_FULL_NAME = @GIMP_FULL_NAME@
GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@

10
app/actions/actions-types.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -39,5 +39,13 @@ typedef enum
GIMP_ACTION_SELECT_PERCENT_NEXT = -10
} GimpActionSelectType;
typedef enum
{
GIMP_SAVE_MODE_SAVE,
GIMP_SAVE_MODE_SAVE_AS,
GIMP_SAVE_MODE_SAVE_A_COPY,
GIMP_SAVE_MODE_SAVE_AND_CLOSE
} GimpSaveMode;
#endif /* __ACTIONS_TYPES_H__ */

2
app/actions/actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/brush-editor-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/brush-editor-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/brushes-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/brushes-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/buffers-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/buffers-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/buffers-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/buffers-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/channels-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/channels-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/channels-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/channels-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/colormap-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/colormap-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/colormap-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/colormap-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

38
app/actions/context-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -846,6 +846,38 @@ static const GimpEnumActionEntry context_font_select_actions[] =
NULL }
};
static const GimpEnumActionEntry context_brush_spacing_actions[] =
{
{ "context-brush-spacing-set", GIMP_STOCK_BRUSH,
"Set Brush Spacing", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
{ "context-brush-spacing-minimum", GIMP_STOCK_BRUSH,
"Minimum Spacing", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
{ "context-brush-spacing-maximum", GIMP_STOCK_BRUSH,
"Maximum Spacing", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
{ "context-brush-spacing-decrease", GIMP_STOCK_BRUSH,
"Decrease Spacing", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
{ "context-brush-spacing-increase", GIMP_STOCK_BRUSH,
"Increase Spacing", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
{ "context-brush-spacing-decrease-skip", GIMP_STOCK_BRUSH,
"Decrease Spacing More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
{ "context-brush-spacing-increase-skip", GIMP_STOCK_BRUSH,
"Increase Spacing More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }
};
static const GimpEnumActionEntry context_brush_shape_actions[] =
{
{ "context-brush-shape-circle", GIMP_STOCK_BRUSH,
@ -1160,6 +1192,10 @@ context_actions_setup (GimpActionGroup *group)
G_N_ELEMENTS (context_font_select_actions),
G_CALLBACK (context_font_select_cmd_callback));
gimp_action_group_add_enum_actions (group,
context_brush_spacing_actions,
G_N_ELEMENTS (context_brush_spacing_actions),
G_CALLBACK (context_brush_spacing_cmd_callback));
gimp_action_group_add_enum_actions (group,
context_brush_shape_actions,
G_N_ELEMENTS (context_brush_shape_actions),

2
app/actions/context-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

22
app/actions/context-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -470,6 +470,26 @@ context_font_select_cmd_callback (GtkAction *action,
context, context->gimp->fonts);
}
void
context_brush_spacing_cmd_callback (GtkAction *action,
gint value,
gpointer data)
{
GimpContext *context;
GimpBrush *brush;
gint spacing;
return_if_no_context (context, data);
brush = gimp_context_get_brush (context);
spacing = gimp_brush_get_spacing (brush);
spacing = action_select_value ((GimpActionSelectType) value,
spacing,
1.0, 5000.0,
1.0, 5.0, 20.0, 0.0, FALSE);
gimp_brush_set_spacing (brush, spacing);
}
void
context_brush_shape_cmd_callback (GtkAction *action,
gint value,

5
app/actions/context-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -113,6 +113,9 @@ void context_font_select_cmd_callback (GtkAction *action,
gint value,
gpointer data);
void context_brush_spacing_cmd_callback (GtkAction *action,
gint value,
gpointer data);
void context_brush_shape_cmd_callback (GtkAction *action,
gint value,
gpointer data);

2
app/actions/cursor-info-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/cursor-info-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/cursor-info-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/cursor-info-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/data-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/data-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/data-editor-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/data-editor-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/debug-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/debug-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/debug-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/debug-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dialogs-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dialogs-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dialogs-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dialogs-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dock-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dock-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dock-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dock-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dockable-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dockable-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dockable-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/dockable-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/documents-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/documents-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/documents-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/documents-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/drawable-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/drawable-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/drawable-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/drawable-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

5
app/actions/edit-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -64,7 +64,7 @@ static const GimpActionEntry edit_actions[] =
{ "edit-paste-as-menu", NULL, N_("_Paste as") },
{ "edit-buffer-menu", NULL, N_("_Buffer") },
{ "undo-editor-popup",
{ "undo-popup",
GTK_STOCK_UNDO, N_("Undo History Menu"), NULL, NULL, NULL,
GIMP_HELP_UNDO_DIALOG },
@ -307,6 +307,7 @@ edit_actions_update (GimpActionGroup *group,
g_free (undo_name);
g_free (redo_name);
g_free (fade_name);
SET_SENSITIVE ("edit-cut", drawable);
SET_SENSITIVE ("edit-copy", drawable);

2
app/actions/edit-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/edit-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/edit-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/error-console-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/error-console-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/error-console-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/error-console-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

52
app/actions/file-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -70,11 +70,6 @@ static const GimpActionEntry file_actions[] =
G_CALLBACK (file_open_cmd_callback),
GIMP_HELP_FILE_OPEN },
{ "file-open-from-image", GTK_STOCK_OPEN,
N_("_Open..."), NULL, NULL,
G_CALLBACK (file_open_from_image_cmd_callback),
GIMP_HELP_FILE_OPEN },
{ "file-open-as-layers", GIMP_STOCK_LAYER,
N_("Op_en as Layers..."), "<control><alt>O", NULL,
G_CALLBACK (file_open_as_layers_cmd_callback),
@ -85,21 +80,6 @@ static const GimpActionEntry file_actions[] =
G_CALLBACK (file_open_location_cmd_callback),
GIMP_HELP_FILE_OPEN_LOCATION },
{ "file-save", GTK_STOCK_SAVE,
N_("_Save"), "<control>S", NULL,
G_CALLBACK (file_save_cmd_callback),
GIMP_HELP_FILE_SAVE },
{ "file-save-as", GTK_STOCK_SAVE_AS,
N_("Save _As..."), "<control><shift>S", NULL,
G_CALLBACK (file_save_as_cmd_callback),
GIMP_HELP_FILE_SAVE_AS },
{ "file-save-a-copy", NULL,
N_("Save a Cop_y..."), NULL, NULL,
G_CALLBACK (file_save_a_copy_cmd_callback),
GIMP_HELP_FILE_SAVE_A_COPY },
{ "file-save-as-template", NULL,
N_("Save as _Template..."), NULL,
N_("Create a new template from this image"),
@ -125,11 +105,32 @@ static const GimpActionEntry file_actions[] =
GIMP_HELP_FILE_QUIT }
};
static const GimpEnumActionEntry file_save_actions[] =
{
{ "file-save", GTK_STOCK_SAVE,
N_("_Save"), "<control>S", NULL,
GIMP_SAVE_MODE_SAVE, FALSE,
GIMP_HELP_FILE_SAVE },
{ "file-save-as", GTK_STOCK_SAVE_AS,
N_("Save _As..."), "<control><shift>S", NULL,
GIMP_SAVE_MODE_SAVE_AS, FALSE,
GIMP_HELP_FILE_SAVE_AS },
{ "file-save-a-copy", NULL,
N_("Save a Cop_y..."), NULL, NULL,
GIMP_SAVE_MODE_SAVE_A_COPY, FALSE,
GIMP_HELP_FILE_SAVE_A_COPY },
{ "file-save-and-close", NULL,
N_("Save and Close..."), NULL, NULL,
GIMP_SAVE_MODE_SAVE_AND_CLOSE, FALSE,
GIMP_HELP_FILE_SAVE }
};
void
file_actions_setup (GimpActionGroup *group)
{
GtkAction *action;
GimpEnumActionEntry *entries;
gint n_entries;
gint i;
@ -138,9 +139,10 @@ file_actions_setup (GimpActionGroup *group)
file_actions,
G_N_ELEMENTS (file_actions));
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
"file-open-from-image");
gtk_action_set_accel_path (action, "<Actions>/file/file-open");
gimp_action_group_add_enum_actions (group,
file_save_actions,
G_N_ELEMENTS (file_save_actions),
G_CALLBACK (file_save_cmd_callback));
n_entries = GIMP_GUI_CONFIG (group->gimp->config)->last_opened_size;

2
app/actions/file-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

119
app/actions/file-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -70,7 +70,8 @@ static void file_open_dialog_show (GtkWidget *parent,
static void file_save_dialog_show (GimpImage *image,
GtkWidget *parent,
const gchar *title,
gboolean save_a_copy);
gboolean save_a_copy,
gboolean close_after_saving);
static void file_save_dialog_destroyed (GtkWidget *dialog,
GimpImage *image);
static void file_new_template_callback (GtkWidget *widget,
@ -83,19 +84,10 @@ static void file_revert_confirm_response (GtkWidget *dialog,
/* public functions */
void
file_open_cmd_callback (GtkAction *action,
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
file_open_dialog_show (widget, NULL, NULL, FALSE);
}
void
file_open_from_image_cmd_callback (GtkAction *action,
gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@ -185,17 +177,28 @@ file_last_opened_cmd_callback (GtkAction *action,
void
file_save_cmd_callback (GtkAction *action,
gint value,
gpointer data)
{
GimpDisplay *display;
GimpImage *image;
GtkWidget *widget;
GimpSaveMode save_mode;
gboolean saved = FALSE;
return_if_no_display (display, data);
return_if_no_widget (widget, data);
image = display->image;
save_mode = (GimpSaveMode) value;
if (! gimp_image_active_drawable (image))
return;
switch (save_mode)
{
case GIMP_SAVE_MODE_SAVE:
case GIMP_SAVE_MODE_SAVE_AND_CLOSE:
/* Only save if the image has been modified */
if (image->dirty ||
! GIMP_GUI_CONFIG (image->gimp->config)->trust_dirty_flag)
@ -211,22 +214,18 @@ file_save_cmd_callback (GtkAction *action,
file_utils_find_proc (image->gimp->plug_in_manager->save_procs,
uri, NULL);
if (! (uri && save_proc))
{
file_save_as_cmd_callback (action, data);
}
else
if (uri && save_proc)
{
GimpPDBStatusType status;
GError *error = NULL;
GList *list;
gchar *filename;
for (list = gimp_action_groups_from_name ("file");
list;
list = g_list_next (list))
{
gimp_action_group_set_action_sensitive (list->data, "file-quit",
gimp_action_group_set_action_sensitive (list->data,
"file-quit",
FALSE);
}
@ -235,72 +234,70 @@ file_save_cmd_callback (GtkAction *action,
uri, save_proc,
GIMP_RUN_WITH_LAST_VALS, FALSE, &error);
filename = file_utils_uri_display_name (uri);
switch (status)
{
case GIMP_PDB_SUCCESS:
gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_INFO,
_("Image saved to '%s'"),
filename);
saved = TRUE;
break;
case GIMP_PDB_CANCEL:
gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_INFO,
gimp_message (image->gimp, G_OBJECT (display),
GIMP_MESSAGE_INFO,
_("Saving canceled"));
break;
default:
gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
{
gchar *filename = file_utils_uri_display_name (uri);
gimp_message (image->gimp, G_OBJECT (display),
GIMP_MESSAGE_ERROR,
_("Saving '%s' failed:\n\n%s"),
filename, error->message);
g_free (filename);
g_clear_error (&error);
}
break;
}
g_free (filename);
for (list = gimp_action_groups_from_name ("file");
list;
list = g_list_next (list))
{
gimp_action_group_set_action_sensitive (list->data, "file-quit",
gimp_action_group_set_action_sensitive (list->data,
"file-quit",
TRUE);
}
break;
}
/* fall thru */
}
else
{
saved = TRUE;
break;
}
}
void
file_save_as_cmd_callback (GtkAction *action,
gpointer data)
{
GimpDisplay *display;
GtkWidget *widget;
return_if_no_display (display, data);
return_if_no_widget (widget, data);
if (! gimp_image_active_drawable (display->image))
return;
case GIMP_SAVE_MODE_SAVE_AS:
file_save_dialog_show (display->image, widget,
_("Save Image"), FALSE);
}
void
file_save_a_copy_cmd_callback (GtkAction *action,
gpointer data)
{
GimpDisplay *display;
GtkWidget *widget;
return_if_no_display (display, data);
return_if_no_widget (widget, data);
if (! gimp_image_active_drawable (display->image))
return;
_("Save Image"), FALSE,
save_mode == GIMP_SAVE_MODE_SAVE_AND_CLOSE);
break;
case GIMP_SAVE_MODE_SAVE_A_COPY:
file_save_dialog_show (display->image, widget,
_("Save a Copy of the Image"), TRUE);
_("Save a Copy of the Image"), TRUE,
FALSE);
break;
}
if (save_mode == GIMP_SAVE_MODE_SAVE_AND_CLOSE &&
saved && ! display->image->dirty)
{
gimp_display_delete (display);
}
}
void
@ -467,6 +464,9 @@ file_open_dialog_show (GtkWidget *parent,
GIMP_FILE_DIALOG (dialog)->image = NULL;
}
parent = gtk_widget_get_toplevel (parent);
if (GTK_IS_WINDOW (parent))
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
gtk_window_present (GTK_WINDOW (dialog));
@ -477,7 +477,8 @@ static void
file_save_dialog_show (GimpImage *image,
GtkWidget *parent,
const gchar *title,
gboolean save_a_copy)
gboolean save_a_copy,
gboolean close_after_saving)
{
GtkWidget *dialog;
@ -509,7 +510,7 @@ file_save_dialog_show (GimpImage *image,
gtk_window_set_title (GTK_WINDOW (dialog), title);
gimp_file_dialog_set_image (GIMP_FILE_DIALOG (dialog),
image, save_a_copy);
image, save_a_copy, close_after_saving);
gtk_window_present (GTK_WINDOW (dialog));
}

9
app/actions/file-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -22,8 +22,6 @@
void file_open_cmd_callback (GtkAction *action,
gpointer data);
void file_open_from_image_cmd_callback (GtkAction *action,
gpointer data);
void file_open_as_layers_cmd_callback (GtkAction *action,
gpointer data);
void file_open_location_cmd_callback (GtkAction *action,
@ -33,10 +31,7 @@ void file_last_opened_cmd_callback (GtkAction *action,
gpointer data);
void file_save_cmd_callback (GtkAction *action,
gpointer data);
void file_save_as_cmd_callback (GtkAction *action,
gpointer data);
void file_save_a_copy_cmd_callback (GtkAction *action,
gint value,
gpointer data);
void file_save_template_cmd_callback (GtkAction *action,
gpointer data);

2
app/actions/fonts-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/fonts-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/fonts-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/fonts-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

4
app/actions/gradient-editor-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -381,7 +381,7 @@ static const GimpEnumActionEntry gradient_editor_zoom_actions[] =
{ "gradient-editor-zoom-all", GTK_STOCK_ZOOM_FIT,
N_("Zoom All"), NULL,
N_("Zoom all"),
GIMP_ZOOM_TO /* abused */, FALSE,
GIMP_ZOOM_OUT_MAX, FALSE,
GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL }
};

2
app/actions/gradient-editor-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradient-editor-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradient-editor-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradients-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradients-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradients-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/gradients-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/help-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/help-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/help-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/help-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/image-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/image-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/image-commands.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/image-commands.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/images-actions.c
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

2
app/actions/images-actions.h
View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify

Some files were not shown because too many files have changed in this diff Show More