dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/actions/file-actions.c app/actions/file-commands.[ch] renamed 

2006-11-05  Sven Neumann  <sven@gimp.org>

	* app/actions/file-actions.c
	* app/actions/file-commands.[ch]
	* menus/image-menu.xml.in: renamed file-open-as-layer to
	file-open-as-layers to complete the changes done to fix bug
#358082.
This commit is contained in:
Sven Neumann 2006-11-05 11:35:57 +00:00 committed by Sven Neumann
parent dff4ef8f57
commit e2a0604174
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,10 @@
2006-11-05 Sven Neumann <sven@gimp.org>
* app/actions/file-actions.c
* app/actions/file-commands.[ch]
* menus/image-menu.xml.in: renamed file-open-as-layer to
file-open-as-layers to complete the changes done to fix bug #358082.
2006-11-05 Sven Neumann <sven@gimp.org>
* app/core/gimp-transform-region.c: applied patch from gg that
@ -6725,10 +6732,8 @@
* data/images/gimp2_2_logo.png: the old logo, as a reference.
* app/dialogs/about-dialog.c: let GtkAboutDialog deal with the logo.
Moved the text animation below the copyright notice and draw it on
in <Layers>, <Channels>, <Vectors> and
<ColormapEditor>:
* app/dialogs/about-dialog.c: let GtkAboutDialog deal with the
logo. Moved the text animation below the copyright notice.
* app/pdb/gimppluginprocedure.c
(gimp_plug_in_procedure_add_menu_path): added the argument type

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

@ -75,9 +75,9 @@ static const GimpActionEntry file_actions[] =
G_CALLBACK (file_open_from_image_cmd_callback),
GIMP_HELP_FILE_OPEN },
{ "file-open-as-layer", GIMP_STOCK_LAYER,
N_("Op_en as Layer..."), "<control><alt>O", NULL,
G_CALLBACK (file_open_as_layer_cmd_callback),
{ "file-open-as-layers", GIMP_STOCK_LAYER,
N_("Op_en as Layers..."), "<control><alt>O", NULL,
G_CALLBACK (file_open_as_layers_cmd_callback),
GIMP_HELP_FILE_OPEN_AS_LAYER },
{ "file-open-location", GIMP_STOCK_WEB,
@ -222,7 +222,7 @@ file_actions_update (GimpActionGroup *group,
#define SET_SENSITIVE(action,condition) \
gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
SET_SENSITIVE ("file-open-as-layer", image);
SET_SENSITIVE ("file-open-as-layers", image);
SET_SENSITIVE ("file-save", image && drawable);
SET_SENSITIVE ("file-save-as", image && drawable);
SET_SENSITIVE ("file-save-a-copy", image && drawable);

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

@ -66,7 +66,7 @@
static void file_open_dialog_show (GtkWidget *parent,
GimpImage *image,
const gchar *uri,
gboolean open_as_layer);
gboolean open_as_layers);
static void file_save_dialog_show (GimpImage *image,
GtkWidget *parent,
const gchar *title,
@ -111,7 +111,7 @@ file_open_from_image_cmd_callback (GtkAction *action,
}
void
file_open_as_layer_cmd_callback (GtkAction *action,
file_open_as_layers_cmd_callback (GtkAction *action,
gpointer data)
{
GimpDisplay *display;
@ -443,7 +443,7 @@ static void
file_open_dialog_show (GtkWidget *parent,
GimpImage *image,
const gchar *uri,
gboolean open_as_layer)
gboolean open_as_layers)
{
GtkWidget *dialog;
@ -456,9 +456,9 @@ file_open_dialog_show (GtkWidget *parent,
if (uri)
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri);
if (open_as_layer)
if (open_as_layers)
{
gtk_window_set_title (GTK_WINDOW (dialog), _("Open Image as Layer"));
gtk_window_set_title (GTK_WINDOW (dialog), _("Open Image as Layers"));
GIMP_FILE_DIALOG (dialog)->image = image;
}
else

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

@ -24,7 +24,7 @@ void file_open_cmd_callback (GtkAction *action,
gpointer data);
void file_open_from_image_cmd_callback (GtkAction *action,
gpointer data);
void file_open_as_layer_cmd_callback (GtkAction *action,
void file_open_as_layers_cmd_callback (GtkAction *action,
gpointer data);
void file_open_location_cmd_callback (GtkAction *action,
gpointer data);

2
menus/image-menu.xml.in
View File

@ -10,7 +10,7 @@
</placeholder>
<placeholder name="Open">
<menuitem action="file-open-from-image" />
<menuitem action="file-open-as-layer" />
<menuitem action="file-open-as-layers" />
<menuitem action="file-open-location" />
</placeholder>
<menu action="file-open-recent-menu" name="Open Recent">