remove "image-new-from-image" action.

2008-03-25  Michael Natterer  <mitch@gimp.org>

	* app/actions/image-actions.c: remove "image-new-from-image"
	action.

	* app/actions/image-commands.[ch]: remove its callback and made
	the "image-new" callback use the current image's dimensions
	instead.

	* menus/image-menu.xml.in: use the "image-new" action.


svn path=/trunk/; revision=25218
This commit is contained in:
Michael Natterer 2008-03-25 10:31:47 +00:00 committed by Michael Natterer
parent 90c932f705
commit c7bf68d2c7
5 changed files with 20 additions and 43 deletions

View File

@ -1,3 +1,14 @@
2008-03-25 Michael Natterer <mitch@gimp.org>
* app/actions/image-actions.c: remove "image-new-from-image"
action.
* app/actions/image-commands.[ch]: remove its callback and made
the "image-new" callback use the current image's dimensions
instead.
* menus/image-menu.xml.in: use the "image-new" action.
2008-03-25 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):

View File

@ -70,12 +70,6 @@ static const GimpActionEntry image_actions[] =
G_CALLBACK (image_new_cmd_callback),
GIMP_HELP_FILE_NEW },
{ "image-new-from-image", GTK_STOCK_NEW,
N_("_New..."), NULL,
N_("Create a new image"),
G_CALLBACK (image_new_from_image_cmd_callback),
GIMP_HELP_FILE_NEW },
{ "image-resize", GIMP_STOCK_RESIZE,
N_("Can_vas Size..."), NULL,
N_("Adjust the image dimensions"),
@ -201,16 +195,10 @@ static const GimpEnumActionEntry image_rotate_actions[] =
void
image_actions_setup (GimpActionGroup *group)
{
GtkAction *action;
gimp_action_group_add_actions (group,
image_actions,
G_N_ELEMENTS (image_actions));
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
"image-new-from-image");
gtk_action_set_accel_path (action, "<Actions>/image/image-new");
gimp_action_group_add_radio_actions (group,
image_convert_actions,
G_N_ELEMENTS (image_convert_actions),

View File

@ -127,26 +127,6 @@ image_new_cmd_callback (GtkAction *action,
GtkWidget *dialog;
return_if_no_widget (widget, data);
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
gtk_widget_get_screen (widget),
"gimp-image-new-dialog", -1, FALSE);
if (dialog)
{
image_new_dialog_set (dialog, NULL, NULL);
gtk_window_present (GTK_WINDOW (dialog));
}
}
void
image_new_from_image_cmd_callback (GtkAction *action,
gpointer data)
{
GtkWidget *widget;
GtkWidget *dialog;
return_if_no_widget (widget, data);
dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
gtk_widget_get_screen (widget),
"gimp-image-new-dialog", -1, FALSE);

View File

@ -22,8 +22,6 @@
void image_new_cmd_callback (GtkAction *action,
gpointer data);
void image_new_from_image_cmd_callback (GtkAction *action,
gpointer data);
void image_convert_cmd_callback (GtkAction *action,
GtkAction *current,
@ -51,15 +49,15 @@ void image_crop_cmd_callback (GtkAction *action,
void image_duplicate_cmd_callback (GtkAction *action,
gpointer data);
void image_merge_layers_cmd_callback (GtkAction *action,
gpointer data);
void image_flatten_image_cmd_callback (GtkAction *action,
gpointer data);
void image_merge_layers_cmd_callback (GtkAction *action,
gpointer data);
void image_flatten_image_cmd_callback (GtkAction *action,
gpointer data);
void image_configure_grid_cmd_callback (GtkAction *action,
gpointer data);
void image_properties_cmd_callback (GtkAction *action,
gpointer data);
void image_configure_grid_cmd_callback (GtkAction *action,
gpointer data);
void image_properties_cmd_callback (GtkAction *action,
gpointer data);
#endif /* __IMAGE_COMMANDS_H__ */

View File

@ -6,7 +6,7 @@
<menu action="file-menu" name="File">
<placeholder name="New">
<menuitem action="image-new-from-image" />
<menuitem action="image-new" />
</placeholder>
<placeholder name="Open">
<menuitem action="file-open" />