diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-07-24 23:40:48 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-07-24 23:40:48 +0000 |
| commit | 6efe58f5fba6d78b8a5aac0ed17fb5a2b6a85b43 (patch) | |
| tree | da0902a231cec3369c8e39cbc7e8b1fb6fe95e0b | |
| parent | 61b45379e16ae67573a7c2fcb652546abc69df0b (diff) | |
| download | nautilus-6efe58f5fba6d78b8a5aac0ed17fb5a2b6a85b43.tar.gz | |
Use trash icons from the icon naming specification for trash related
2006-07-25 Martin Wehner <martin.wehner@gmail.com>
* libnautilus-private/nautilus-icon-factory.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-tree-view.c: (create_popup_menu):
* src/nautilus-window-menus.c:
Use trash icons from the icon naming specification for trash
related operations. (#340321)
Patch from Rodney Dawes <dobey@novell.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/fm-tree-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 2 |
5 files changed, 19 insertions, 8 deletions
@@ -1,5 +1,16 @@ 2006-07-25 Martin Wehner <martin.wehner@gmail.com> + * libnautilus-private/nautilus-icon-factory.c: + * src/file-manager/fm-directory-view.c: + * src/file-manager/fm-tree-view.c: (create_popup_menu): + * src/nautilus-window-menus.c: + Use trash icons from the icon naming specification for trash + related operations. (#340321) + + Patch from Rodney Dawes <dobey@novell.com> + +2006-07-25 Martin Wehner <martin.wehner@gmail.com> + * src/nautilus-places-sidebar.c: (add_place), (update_places): Take the sidebar as parameter and refilter it after adding. diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index e38c2b761..7716338a0 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -68,9 +68,9 @@ #define CACHE_SELF_CHECKS 0 #define ICON_NAME_THUMBNAIL_LOADING "gnome-fs-loading-icon" -#define ICON_NAME_TRASH_EMPTY "gnome-fs-trash-empty" -#define ICON_NAME_TRASH_FULL "gnome-fs-trash-full" -#define ICON_NAME_HOME "gnome-fs-home" +#define ICON_NAME_TRASH_EMPTY "user-trash" +#define ICON_NAME_TRASH_FULL "user-trash-full" +#define ICON_NAME_HOME "user-home" #define NAUTILUS_EMBLEM_NAME_PREFIX "emblem-" diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index f7bc9fe8d..4cd2475f5 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -6872,7 +6872,7 @@ static const GtkActionEntry directory_view_entries[] = { "RenameSelectAll", "<shift>F2", /* label, accelerator */ NULL, /* tooltip */ G_CALLBACK (action_rename_select_all_callback) }, - { "Trash", GTK_STOCK_DELETE, /* name, stock id */ + { "Trash", "user-trash", /* name, stock id */ N_("Mo_ve to Trash"), "<control>T", /* label, accelerator */ N_("Move each selected item to the Trash"), /* tooltip */ G_CALLBACK (action_trash_callback) }, @@ -6948,7 +6948,7 @@ static const GtkActionEntry directory_view_entries[] = { N_("Prepare this folder to be copied with a Paste command"), /* tooltip */ G_CALLBACK (action_location_copy_callback) }, - { FM_ACTION_LOCATION_TRASH, GTK_STOCK_DELETE, /* name, stock id */ + { FM_ACTION_LOCATION_TRASH, "user-trash", /* name, stock id */ N_("Mo_ve to Trash"), "", /* label, accelerator */ N_("Move this folder to the Trash"), /* tooltip */ G_CALLBACK (action_location_trash_callback) }, diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index 271b04197..09f25cc16 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -1168,8 +1168,8 @@ create_popup_menu (FMTreeView *view) eel_gtk_menu_append_separator (GTK_MENU (popup)); /* add the "move to trash" menu item */ - menu_image = gtk_image_new_from_stock (GTK_STOCK_DELETE, - GTK_ICON_SIZE_MENU); + menu_image = gtk_image_new_from_icon_name ("user-trash", + GTK_ICON_SIZE_MENU); gtk_widget_show (menu_image); menu_item = gtk_image_menu_item_new_with_label (_("Move to Trash")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index f7f21e3a5..187e4a885 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -679,7 +679,7 @@ static const GtkActionEntry main_entries[] = { N_("T_emplates"), NULL, /* label, accelerator */ N_("Go to the templates folder"), /* tooltip */ G_CALLBACK (action_go_to_templates_callback) }, - { "Go to Trash", "gnome-fs-trash-empty", /* name, stock id */ + { "Go to Trash", "user-trash", /* name, stock id */ N_("_Trash"), NULL, /* label, accelerator */ N_("Go to the trash folder"), /* tooltip */ G_CALLBACK (action_go_to_trash_callback) }, |