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

app/widgets/gimpdocumentview.[ch] app/gui/documents-commands.[ch] changed 

2002-09-12  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpdocumentview.[ch]
	* app/gui/documents-commands.[ch]
	* app/gui/menus.c: changed icon/variables/functions to say
	"Remove" instead of "Delete" because "Delete" is misleading (we
	don't delete the file but just remove the entry from the document
	history).
This commit is contained in:
Michael Natterer 2002-09-12 17:34:43 +00:00 committed by Michael Natterer
parent eedcbf7dcc
commit 57d3fff345
9 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-09-12 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdocumentview.[ch]
* app/gui/documents-commands.[ch]
* app/gui/menus.c: changed icon/variables/functions to say
"Remove" instead of "Delete" because "Delete" is misleading (we
don't delete the file but just remove the entry from the document
history).
2002-09-12 Sven Neumann <sven@gimp.org> 2002-09-12 Sven Neumann <sven@gimp.org>
* autogen.sh: fixed output in case automake-1.6 is not available. * autogen.sh: fixed output in case automake-1.6 is not available.

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

@ -85,7 +85,7 @@ documents_file_open_dialog_cmd_callback (GtkWidget *widget,
} }
void void
documents_delete_document_cmd_callback (GtkWidget *widget, documents_remove_document_cmd_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GimpDocumentView *view; GimpDocumentView *view;
@ -95,7 +95,7 @@ documents_delete_document_cmd_callback (GtkWidget *widget,
if (! view) if (! view)
return; return;
gtk_button_clicked (GTK_BUTTON (view->delete_button)); gtk_button_clicked (GTK_BUTTON (view->remove_button));
} }

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

@ -26,7 +26,7 @@ void documents_raise_or_open_document_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_file_open_dialog_cmd_callback (GtkWidget *widget, void documents_file_open_dialog_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_delete_document_cmd_callback (GtkWidget *widget, void documents_remove_document_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_recreate_preview_cmd_callback (GtkWidget *widget, void documents_recreate_preview_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);

4
app/gui/documents-commands.c
View File

@ -85,7 +85,7 @@ documents_file_open_dialog_cmd_callback (GtkWidget *widget,
} }
void void
documents_delete_document_cmd_callback (GtkWidget *widget, documents_remove_document_cmd_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GimpDocumentView *view; GimpDocumentView *view;
@ -95,7 +95,7 @@ documents_delete_document_cmd_callback (GtkWidget *widget,
if (! view) if (! view)
return; return;
gtk_button_clicked (GTK_BUTTON (view->delete_button)); gtk_button_clicked (GTK_BUTTON (view->remove_button));
} }

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

@ -26,7 +26,7 @@ void documents_raise_or_open_document_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_file_open_dialog_cmd_callback (GtkWidget *widget, void documents_file_open_dialog_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_delete_document_cmd_callback (GtkWidget *widget, void documents_remove_document_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);
void documents_recreate_preview_cmd_callback (GtkWidget *widget, void documents_recreate_preview_cmd_callback (GtkWidget *widget,
gpointer data); gpointer data);

4
app/gui/menus.c
View File

@ -1958,8 +1958,8 @@ static GimpItemFactoryEntry documents_entries[] =
"<StockItem>", GTK_STOCK_OPEN }, "<StockItem>", GTK_STOCK_OPEN },
NULL, NULL, NULL }, NULL, NULL, NULL },
{ { N_("/Remove Entry"), NULL, { { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0, documents_remove_document_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_REMOVE },
NULL, NULL, NULL }, NULL, NULL, NULL },
SEPARATOR ("/---"), SEPARATOR ("/---"),

4
app/menus/menus.c
View File

@ -1958,8 +1958,8 @@ static GimpItemFactoryEntry documents_entries[] =
"<StockItem>", GTK_STOCK_OPEN }, "<StockItem>", GTK_STOCK_OPEN },
NULL, NULL, NULL }, NULL, NULL, NULL },
{ { N_("/Remove Entry"), NULL, { { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0, documents_remove_document_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_REMOVE },
NULL, NULL, NULL }, NULL, NULL, NULL },
SEPARATOR ("/---"), SEPARATOR ("/---"),

21
app/widgets/gimpdocumentview.c
View File

@ -62,7 +62,7 @@ static void gimp_document_view_open_clicked (GtkWidget *widget
static void gimp_document_view_open_extended_clicked (GtkWidget *widget, static void gimp_document_view_open_extended_clicked (GtkWidget *widget,
guint state, guint state,
GimpDocumentView *view); GimpDocumentView *view);
static void gimp_document_view_delete_clicked (GtkWidget *widget, static void gimp_document_view_remove_clicked (GtkWidget *widget,
GimpDocumentView *view); GimpDocumentView *view);
static void gimp_document_view_refresh_clicked (GtkWidget *widget, static void gimp_document_view_refresh_clicked (GtkWidget *widget,
GimpDocumentView *view); GimpDocumentView *view);
@ -124,7 +124,7 @@ static void
gimp_document_view_init (GimpDocumentView *view) gimp_document_view_init (GimpDocumentView *view)
{ {
view->open_button = NULL; view->open_button = NULL;
view->delete_button = NULL; view->remove_button = NULL;
view->refresh_button = NULL; view->refresh_button = NULL;
} }
@ -169,11 +169,11 @@ gimp_document_view_new (GimpViewType view_type,
G_CALLBACK (gimp_document_view_open_extended_clicked), G_CALLBACK (gimp_document_view_open_extended_clicked),
editor); editor);
document_view->delete_button = document_view->remove_button =
gimp_editor_add_button (GIMP_EDITOR (editor->view), gimp_editor_add_button (GIMP_EDITOR (editor->view),
GTK_STOCK_DELETE, GTK_STOCK_REMOVE,
_("Remove selected entry"), NULL, _("Remove selected entry"), NULL,
G_CALLBACK (gimp_document_view_delete_clicked), G_CALLBACK (gimp_document_view_remove_clicked),
NULL, NULL,
editor); editor);
@ -197,7 +197,7 @@ gimp_document_view_new (GimpViewType view_type,
GTK_BUTTON (document_view->open_button), GTK_BUTTON (document_view->open_button),
GIMP_TYPE_IMAGEFILE); GIMP_TYPE_IMAGEFILE);
gimp_container_view_enable_dnd (editor->view, gimp_container_view_enable_dnd (editor->view,
GTK_BUTTON (document_view->delete_button), GTK_BUTTON (document_view->remove_button),
GIMP_TYPE_IMAGEFILE); GIMP_TYPE_IMAGEFILE);
return GTK_WIDGET (document_view); return GTK_WIDGET (document_view);
@ -305,7 +305,7 @@ gimp_document_view_open_extended_clicked (GtkWidget *widget,
} }
static void static void
gimp_document_view_delete_clicked (GtkWidget *widget, gimp_document_view_remove_clicked (GtkWidget *widget,
GimpDocumentView *view) GimpDocumentView *view)
{ {
GimpContainerEditor *editor; GimpContainerEditor *editor;
@ -389,8 +389,7 @@ gimp_document_view_select_item (GimpContainerEditor *editor,
GimpViewable *viewable) GimpViewable *viewable)
{ {
GimpDocumentView *view; GimpDocumentView *view;
gboolean remove_sensitive = FALSE;
gboolean delete_sensitive = FALSE;
if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item) if (GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item)
GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item (editor, viewable); GIMP_CONTAINER_EDITOR_CLASS (parent_class)->select_item (editor, viewable);
@ -400,10 +399,10 @@ gimp_document_view_select_item (GimpContainerEditor *editor,
if (viewable && gimp_container_have (editor->view->container, if (viewable && gimp_container_have (editor->view->container,
GIMP_OBJECT (viewable))) GIMP_OBJECT (viewable)))
{ {
delete_sensitive = TRUE; remove_sensitive = TRUE;
} }
gtk_widget_set_sensitive (view->delete_button, delete_sensitive); gtk_widget_set_sensitive (view->remove_button, remove_sensitive);
} }
static void static void

2
app/widgets/gimpdocumentview.h
View File

@ -41,7 +41,7 @@ struct _GimpDocumentView
GimpContainerEditor parent_instance; GimpContainerEditor parent_instance;
GtkWidget *open_button; GtkWidget *open_button;
GtkWidget *delete_button; GtkWidget *remove_button;
GtkWidget *refresh_button; GtkWidget *refresh_button;
}; };