Commit 00268bb3 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

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

2007-01-15  Sven Neumann  <sven@gimp.org>

	* app/actions/file-commands.[ch]
	* app/actions/file-actions.c
	* menus/image-menu.xml.in: removed "file-open-from-image" action
	and simply use "file-open-image" from both File menus. Makes the
	behavior more predictable and removes unneeded complexity.


svn path=/trunk/; revision=21716
parent c91cd323
2007-01-15 Sven Neumann <sven@gimp.org>
* app/actions/file-commands.[ch]
* app/actions/file-actions.c
* menus/image-menu.xml.in: removed "file-open-from-image" action
and simply use "file-open-image" from both File menus. Makes the
behavior more predictable and removes unneeded complexity.
2007-01-15 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-close.c (gimp_time_since): round up
......
......@@ -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),
......@@ -134,7 +129,6 @@ static const GimpActionEntry file_actions[] =
void
file_actions_setup (GimpActionGroup *group)
{
GtkAction *action;
GimpEnumActionEntry *entries;
gint n_entries;
gint i;
......@@ -143,10 +137,6 @@ 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");
n_entries = GIMP_GUI_CONFIG (group->gimp->config)->last_opened_size;
entries = g_new0 (GimpEnumActionEntry, n_entries);
......
......@@ -83,19 +83,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;
......
......@@ -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,
......
......@@ -9,7 +9,7 @@
<menuitem action="image-new-from-image" />
</placeholder>
<placeholder name="Open">
<menuitem action="file-open-from-image" />
<menuitem action="file-open" />
<menuitem action="file-open-as-layers" />
<menuitem action="file-open-location" />
</placeholder>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment