diff options
60 files changed, 483 insertions, 302 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ad55546d75..251f14982b 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,16 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * gui/component/addressbook-component.c: + * gui/component/addressbook-view.c: + * gui/contact-editor/e-contact-editor-address.c: + * gui/contact-editor/e-contact-editor-fullname.c: + * gui/contact-editor/e-contact-editor-im.c: + * gui/widgets/e-addressbook-view.c: + * gui/widgets/eab-contact-display.c: + Use standard icon names where applicable. + 2007-09-21 Milan Crha <mcrha@redhat.com> ** Fix for bug #411125 diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 3fc5dea7a5..bd42bf8960 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].menuDescription = _("_Contact"); list->_buffer[0].tooltip = _("Create a new contact"); list->_buffer[0].menuShortcut = 'c'; - list->_buffer[0].iconName = "stock_contact"; + list->_buffer[0].iconName = "contact-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; list->_buffer[1].id = "contact_list"; diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index dea1aa9a22..cbd8efb822 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -71,7 +71,7 @@ static GObjectClass *parent_class = NULL; /* This is used for the addressbook status bar */ -#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "stock_contact" +#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new" static GdkPixbuf *progress_icon = NULL; #define d(x) @@ -614,26 +614,24 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save-as", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/Print/ContactsPrint", "stock_print", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "stock_print-preview", E_ICON_SIZE_MENU), - - E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "stock_cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU), - - E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU), - + E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactDelete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrint", "document-print", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP_END }; @@ -953,10 +951,10 @@ primary_source_selection_changed_callback (ESourceSelector *selector, } static EPopupItem abv_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "stock_delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 }, + { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, { E_POPUP_BAR, "40.bar"}, - { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"stock_save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, { E_POPUP_BAR, "30.bar"}, { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, }; @@ -1334,7 +1332,7 @@ addressbook_view_init (AddressbookView *view) e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (priv->statusbar_widget)); - priv->info_widget = e_info_label_new("stock_contact"); + priv->info_widget = e_info_label_new("contact-new"); e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), ""); gtk_widget_show (priv->info_widget); diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index fbcc4fcc1e..b3cd0880e0 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("stock_contact"); + icon_list = e_icon_factory_get_icon_list ("contact-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 261b98aea7..25aa8a6f14 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("stock_contact"); + icon_list = e_icon_factory_get_icon_list ("contact-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index 205ab80343..c6bc9d951b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username")); /* set the icon */ - icon_list = e_icon_factory_get_icon_list ("stock_contact"); + icon_list = e_icon_factory_get_icon_list ("contact-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 6cb1a994d2..ec4895f2e0 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem eabv_popup_items[] = { { E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, { E_POPUP_BAR, "10.bar" }, - { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE}, + { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE}, { E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE }, { E_POPUP_BAR, "20.bar" }, - { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, - { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "document-save-as", 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, + { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, + { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, + { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "document-print", 0, EAB_POPUP_SELECT_ANY }, { E_POPUP_BAR, "70.bar" }, { E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY }, { E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, { E_POPUP_BAR, "a0.bar" }, - { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "edit-copy", 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, }; static void diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 7f86e609fe..f2d201c8af 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContac static EPopupItem eab_uri_popups[] = { { E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO }, - { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "gtk-copy", EAB_POPUP_URI_NOT_MAILTO }, - { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "stock_mail-compose", EAB_POPUP_URI_MAILTO}, - { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "gtk-copy", EAB_POPUP_URI_MAILTO}, + { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO}, + { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO}, }; diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 005901f43a..a58079e3f4 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,25 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * gui/calendar-commands.c: + * gui/calendar-component.c: + * gui/dialogs/cal-attachment-select-file.c: + * gui/dialogs/comp-editor.c: + * gui/dialogs/event-editor.c: + * gui/dialogs/task-editor.c: + * gui/e-cal-popup.c: + * gui/e-calendar-table.c: + * gui/e-calendar-view.c: + * gui/e-day-view.c: + * gui/e-memo-table.c: + * gui/e-week-view.c: + * gui/memos-component.c: + * gui/memos-control.c: + * gui/tasks-component.c: + * gui/tasks-control.c: + Use standard icon names where applicable. + 2007-09-27 Milan Crha <mcrha@redhat.com> ** Fix for bug #346686 diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 640c0fc096..e4ee6d0b71 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; -static EPixmap pixmaps [] = -{ - E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Prev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Next", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), +static EPixmap pixmaps [] = { + E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b73d4ecd14..ae0dc63e6a 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -604,7 +604,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem ecc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, + { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; @@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].menuDescription = _("_Appointment"); list->_buffer[0].tooltip = _("Create a new appointment"); list->_buffer[0].menuShortcut = 'a'; - list->_buffer[0].iconName = "stock_new-appointment"; + list->_buffer[0].iconName = "appointment-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; list->_buffer[1].id = CREATE_MEETING_ID; diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index 720abb10ef..aa57f95dc7 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -98,7 +98,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); gtk_window_set_modal ((GtkWindow *) selection, TRUE); - icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); + icon_list = e_icon_factory_get_icon_list ("mail-message-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index d54c06347f..27555145d8 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps[] = { + E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), E_PIXMAP_END }; @@ -2257,7 +2266,7 @@ make_icon_from_comp (ECalComponent *comp) type = e_cal_component_get_vtype (comp); switch (type) { case E_CAL_COMPONENT_EVENT: - return "stock_new-appointment"; + return "appointment-new"; case E_CAL_COMPONENT_TODO: return "stock_task"; case E_CAL_COMPONENT_JOURNAL: diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index d689ec6be9..eb86ea07b4 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -428,18 +428,19 @@ static EPixmap pixmaps[] = { * icons is filled in at run-time in event_editor_init() are * updated, too. */ + E_PIXMAP ("/commands/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), + /* These two will have an absolute path to the png file filled * in at run-time, see event_editor_init(). */ E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), E_PIXMAP_END }; @@ -561,12 +562,12 @@ event_editor_init (EventEditor *ee) editor->uic, "ActionFreeBusy", menu_action_freebusy_cb, editor); - /* NOTE: Make sure the 7 and 8 below correspond to the correct + /* NOTE: Make sure the 6 and 7 below correspond to the correct * elements in the pixmaps array. */ - if (!pixmaps[7].name) { + if (!pixmaps[6].name) { + pixmaps[6].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); - pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); } e_pixmaps_update (editor->uic, pixmaps); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index f43adfe5f8..84512eaba1 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps[] = { + E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ViewTimeZone", "stock_timezone", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index d7b275c275..5a398f6818 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *ep, EPopupItem *item, void *data) static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; static ECalPopupItem ecalp_attachment_object_popups[] = { - { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, + { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE }, - { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, + { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, { E_POPUP_BAR, "05.attach", }, }; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 90dff52288..742820e46a 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1334,7 +1334,7 @@ static EPopupItem tasks_popup_items [] = { { E_POPUP_BAR, "70.bar" }, { E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE }, - { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, { E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE}, { E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE }, { E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE}, diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 157c1ea6e1..b5bf116be3 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1657,7 +1657,7 @@ on_paste (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem ecv_main_items [] = { - { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 }, + { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 }, { E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0}, { E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0}, { E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0}, @@ -1693,9 +1693,9 @@ static EPopupItem ecv_child_items [] = { { E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, { E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING}, { E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING }, - { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, { E_POPUP_BAR, "50." }, diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 2d8d7a6c9c..73708129d0 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1416,7 +1416,7 @@ e_day_view_realize (GtkWidget *widget) /* Create the pixmaps. */ day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); @@ -1490,7 +1490,7 @@ e_day_view_realize (GtkWidget *widget) /* Create the pixmaps. */ day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 144e774591..50d02e7758 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -928,7 +928,7 @@ static EPopupItem memos_popup_items [] = { { E_POPUP_BAR, "70.bar" }, - { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, { E_POPUP_BAR, "90.bar" }, diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 4df59338a6..f2fe95c2b7 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -691,7 +691,7 @@ e_week_view_realize (GtkWidget *widget) /* Create the pixmaps. */ week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index bd78b56293..4138c83f03 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -463,7 +463,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem emc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 1ecdf82127..0335f6304a 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -39,6 +39,7 @@ #include <bonobo/bonobo-ui-util.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-print.h> +#include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include "calendar-config.h" @@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; +static EPixmap pixmaps [] = { + E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + + E_PIXMAP_END +}; + void memos_control_activate (BonoboControl *control, EMemos *memos) { @@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *control, EMemos *memos) NULL); g_free (xmlfile); + e_pixmaps_update (uic, pixmaps); + e_memos_setup_view_menus (memos, uic); /* Signals from the memos widget; also sensitize the menu items as appropriate */ diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index c7fbf0c4f0..30571774cc 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem etc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 53637048c6..ff0460cf4b 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -38,7 +38,7 @@ #include <bonobo/bonobo-ui-util.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-print.h> -#include "e-util/e-icon-factory.h" +#include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include "dialogs/cal-prefs-dialog.h" #include "calendar-config.h" @@ -253,7 +253,19 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/composer/ChangeLog b/composer/ChangeLog index 371fd1cd7f..8f214152da 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,11 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * e-msg-composer-select-file.c: + * e-msg-composer.c: + Use standard icon names where applicable. + 2007-09-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #476231 diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c index 302897d517..1d02f2bd8a 100644 --- a/composer/e-msg-composer-select-file.c +++ b/composer/e-msg-composer-select-file.c @@ -100,7 +100,7 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags) gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer"); gtk_window_set_modal ((GtkWindow *) selection, FALSE); - icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); + icon_list = e_icon_factory_get_icon_list ("mail-message-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index b113ccc2f9..3561233eae 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixcache [] = { + E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSend", "mail-send", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/FileSend", "mail-send", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSaveDraft", "document-save", E_ICON_SIZE_LARGE_TOOLBAR) , E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , - -/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ - E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), E_PIXMAP_END }; @@ -3591,6 +3594,17 @@ static BonoboUIVerb entry_verbs [] = { BONOBO_UI_VERB_END }; +static EPixmap entry_pixcache [] = { + E_PIXMAP ("/Toolbar/EditCut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/EditCopy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/EditPaste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), + + E_PIXMAP_END +}; + /* All this snot is so that Cut/Copy/Paste work. */ static gboolean composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data) @@ -3614,6 +3628,8 @@ composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpoin xmlfile, "evolution-composer-entries", NULL); g_free (xmlfile); + + e_pixmaps_update (p->entry_uic, entry_pixcache); bonobo_ui_component_thaw (p->entry_uic, NULL); @@ -3879,7 +3895,7 @@ create_composer (int visible_mask) G_CALLBACK (msg_composer_destroy_notify), NULL); - icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); + icon_list = e_icon_factory_get_icon_list ("mail-message-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); diff --git a/mail/ChangeLog b/mail/ChangeLog index 4de5ec16de..f7e5c693bc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * em-folder-tree.c: + * em-folder-view.c: + * em-popup.c: + * mail-component.c: + * mail-mt.c: + * mail-send-recv.c: + * message-list.c: + Use standard icon names where applicable. + 2007-09-21 Matthew Barnes <mbarnes@redhat.com> * Makefile.am: diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 17c617e8e3..bdbd6bfe76 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -206,7 +206,7 @@ enum { /* Options for View */ static EMFBSearchBarItem emfb_view_items[] = { {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, - {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"}, + {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, {{ NULL, 0, 0 }, NULL}, {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, {{ NULL, -1, 0 }, NULL} @@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items[] = { /* TODO: Following options should be customizable */ static EMFBSearchBarItem temp_view_items[] = { {{ NULL, 0, 0 }, NULL}, - {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, + {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, - {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, + {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "mail-mark-important"}, + {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, /* { NULL, 0, NULL }, */ /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ {{ NULL, -1, 0 }, NULL} diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index fa0955a832..b04fecf272 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, guint32 flags; if (!initialised) { - folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU); @@ -988,7 +988,7 @@ static EPopupItem emft_drop_popup_menu[] = { { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 }, { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 }, { E_POPUP_BAR, "10.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 }, + { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, }; static void @@ -2104,12 +2104,12 @@ static EPopupItem emft_popup_items[] = { { E_POPUP_BAR, "20.emc" }, /* FIXME: need to disable for nochildren folders */ - { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }, + { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, /* FIXME: need to disable for undeletable folders */ - { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, - { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, + { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, + { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, { E_POPUP_BAR, "80.emc" }, diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index b895927916..200422848a 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1215,30 +1215,30 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current, emfv_popup_filter_mlist, AUTO_MLIST) /* TODO: Move some of these to be 'standard' menu's */ static EPopupItem emfv_popup_items[] = { - { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "stock_copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, + { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY }, { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL }, /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */ { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "stock_save-as", EM_POPUP_SELECT_MANY }, - { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "stock_print", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE }, { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "mail-mark-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, { E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, @@ -1949,43 +1949,47 @@ static BonoboUIVerb emfv_message_verbs[] = { BONOBO_UI_VERB_END }; static EPixmap emfv_message_pixmaps[] = { - E_PIXMAP ("/commands/EditCut", "stock_cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/EditCopy", "stock_copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/EditPaste", "stock_paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageForward", "stock_mail-forward", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageSearch", "stock_search", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsImportant", "mail-mark-important", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MailCompose", "stock_mail-compose", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-unread", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageSearch", "edit-find", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/PrintMessage", "document-print", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomReset", "zoom-reset", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ViewLoadImages", "insert-image", E_ICON_SIZE_MENU), + + E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; @@ -2600,7 +2604,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem emfv_uri_popups[] = { { E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO }, - { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "gtk-copy", EM_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, diff --git a/mail/em-popup.c b/mail/em-popup.c index bfdf708121..d9c11bd5c4 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPopupItem *item, void *data) } static EMPopupItem emp_standard_object_popups[] = { - { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, + { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, - { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE}, + { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE}, { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE }, }; static EMPopupItem emp_attachment_object_popups[] = { - { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, + { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_ATTACHMENTS_IMAGE }, { E_POPUP_BAR, "05.attach", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, - { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE }, + { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_ATTACHMENTS_MESSAGE }, { E_POPUP_ITEM, "05.attach.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE}, - { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE}, + { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_ATTACHMENTS_MESSAGE}, { E_POPUP_BAR, "05.attach.10", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, - { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, + { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, }; static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; @@ -631,8 +631,8 @@ emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, void *data) static EPopupItem emp_standard_uri_popups[] = { { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, - { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "edit-add", EM_POPUP_URI_MAILTO }, }; /* ********************************************************************** */ diff --git a/mail/mail-component.c b/mail/mail-component.c index e3adcc9b09..c27fee6250 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment list->_buffer[0].menuDescription = _("_Mail Message"); list->_buffer[0].tooltip = _("Compose a new mail message"); list->_buffer[0].menuShortcut = 'm'; - list->_buffer[0].iconName = "stock_mail-compose"; + list->_buffer[0].iconName = "mail-message-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; list->_buffer[1].id = "folder"; @@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment list->_buffer[1].menuDescription = _("Mail _Folder"); list->_buffer[1].tooltip = _("Create a new mail folder"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = "stock_new-dir"; + list->_buffer[1].iconName = "folder-new"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; return list; diff --git a/mail/mail-mt.c b/mail/mail-mt.c index a8f4c71391..1f9a9e4696 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -983,7 +983,7 @@ static void do_op_status(struct _mail_msg *mm) data->activity_state = 1; if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); + progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); if (msg->ops->describe_msg) diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 073751eaa3..f55415323f 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati gtk_widget_show (cancel_button); gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL); - icon_list = e_icon_factory_get_icon_list ("stock_mail-send-receive"); + icon_list = e_icon_factory_get_icon_list ("mail-send-receive"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); @@ -560,7 +560,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); send_icon = e_icon_factory_get_image ( - "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); + "mail-send", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( diff --git a/mail/message-list.c b/mail/message-list.c index 3b500a8280..d359bb40d4 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -217,14 +217,14 @@ static struct { char *icon_name; GdkPixbuf *pixbuf; } states_pixmaps[] = { - { "stock_mail-unread", NULL }, - { "stock_mail-open", NULL }, - { "stock_mail-replied", NULL }, + { "mail-unread", NULL }, + { "mail-read", NULL }, + { "mail-replied", NULL }, { "stock_mail-unread-multiple", NULL }, { "stock_mail-open-multiple", NULL }, { NULL, NULL }, { "mail-attachment", NULL }, - { "emblem-important", NULL }, + { "mail-mark-important", NULL }, { "stock_score-lowest", NULL }, { "stock_score-lower", NULL }, { "stock_score-low", NULL }, diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 8db2146ce8..5c1bef7517 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * exchange-folder-permission.c: + * exchange-folder.c: + Use standard icon names where applicable. + 2007-09-10 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #301044 (Novell Bugzilla) diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 4646d47d5c..5748dd491f 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect gchar *selected_exchange_folder_uri = NULL; static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 8b19a095d5..8cb64c26a5 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -63,7 +63,7 @@ static void exchange_get_folder (char *uri, CamelFolder *folder, void *data); static EPopupItem popup_inbox_items[] = { - { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -232,7 +232,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar } static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -242,7 +242,7 @@ popup_free (EPopup *ep, GSList *items, void *data) } static EPopupItem popup_ab_items[] = { - { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 1d2575c22a..6af2116224 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * share-folder-common.c: + Use standard icon names where applicable. + 2007-08-17 Johnny Jacob <jjohnny@novell.com> ** Fix for bug #458715. diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 95c8dd5fd8..5db802ffc3 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -339,7 +339,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } +{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index 9df802f364..43d58eb51d 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * org-gnome-save-calendar.eplug.xml: + Use standard icon names where applicable. + 2007-09-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #476231 diff --git a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml index 4242ba2fd1..85f7b2c1b6 100644 --- a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml +++ b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml @@ -8,10 +8,10 @@ <hook class="org.gnome.evolution.calendar.popup:1.0"> <menu id="org.gnome.evolution.tasks.source.popup" target="source"> - <item type="item" path="19.save_tasks" _label="_Save to Disk" icon="stock_save" activate="org_gnome_save_tasks"/> + <item type="item" path="19.save_tasks" _label="_Save to Disk" icon="document-save" activate="org_gnome_save_tasks"/> </menu> <menu id="org.gnome.evolution.calendar.source.popup" target="source"> - <item type="item" path="19.save_calendar" _label="_Save to Disk" icon="stock_save" activate="org_gnome_save_calendar"/> + <item type="item" path="19.save_calendar" _label="_Save to Disk" icon="document-save" activate="org_gnome_save_calendar"/> </menu> </hook> </e-plugin> diff --git a/shell/ChangeLog b/shell/ChangeLog index e5d3ca3115..d870742ffc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * e-shell-window-commands.c: + Use standard icon names where applicable. + 2007-09-11 Matthew Barnes <mbarnes@redhat.com> * Move the test component to a 'test' subdirectory (#469992). diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 49db1dffa0..5354ba6d4a 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_MENU), - E_PIXMAP ("/Toolbar/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/File/OpenNewWindow", "stock_new-window", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), E_PIXMAP_END }; diff --git a/ui/ChangeLog b/ui/ChangeLog index e001abd2cf..0c35eca261 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,22 @@ +2007-09-27 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #477045 + + * evolution-composer-entries.xml: + * evolution-addressbook.xml: + * evolution.xml: + * evolution-mail-message.xml: + * evolution-event-editor.xml: + * evolution-message-composer.xml: + * evolution-calendar.xml: + * evolution-memos.xml: + * evolution-subscribe.xml: + * evolution-tasks.xml: + * evolution-editor.xml: + * evolution-task-editor.xml: + * evolution-mail-list.xml: + Use standard icon names where applicable. + 2007-07-06 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #446894 diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml index 5c31d09276..6f837b8c4f 100644 --- a/ui/evolution-addressbook.xml +++ b/ui/evolution-addressbook.xml @@ -1,18 +1,17 @@ <Root> <commands> + <cmd name="ContactDelete" _tip="Delete selected contacts" - pixtype="stock" pixname="gtk-delete" - accel="*Control*d"/> + accel="*Control*d" pixtype="pixbuf"/> <cmd name="ContactsPrint" _tip="Print selected contacts" - pixtype="stock" pixname="gtk-print" - accel="*Control*p"/> + accel="*Control*p" pixtype="pixbuf"/> <cmd name="ContactsPrintPreview" _tip="Previews the contacts to be printed" - pixtype="stock" pixname="gtk-print-preview"/> + pixtype="pixbuf"/> <cmd name="ContactsView" _tip="View the current contact" @@ -22,19 +21,17 @@ _tip="Stop Loading" pixtype="stock" pixname="gtk-stop"/> - <cmd name="ContactsCut" _label="Cut" _tip="Cut the selection" - pixtype="stock" pixname="gtk-cut" - accel="*Control*x"/> + <cmd name="ContactsCut" _label="Cut" + _tip="Cut the selection" + accel="*Control*x" pixtype="pixbuf"/> <cmd name="ContactsCopy" _label="Copy" _tip="Copy the selection" - pixtype="stock" pixname="gtk-copy" - accel="*Control*c"/> + accel="*Control*c" pixtype="pixbuf"/> <cmd name="ContactsPaste" _label="Paste" _tip="Paste the clipboard" - pixtype="stock" pixname="gtk-paste" - accel="*Control*v"/> + accel="*Control*v" pixtype="pixbuf"/> <cmd name="ContactsSelectAll" _label="Select All" _tip="Select all contacts" @@ -42,14 +39,15 @@ <cmd name="ContactsSaveAsVCard" _label="Save as VCard..." _tip="Save selected contacts as a VCard." - pixtype="stock" pixname="gtk-save-as" - accel="*Control*s"/> + accel="*Control*s" pixtype="pixbuf"/> <cmd name="ContactsSendContactToOther" _label="Forward Contact" - _tip="Send selected contacts to another person."/> + _tip="Send selected contacts to another person." + pixtype="pixbuf"/> <cmd name="ContactsSendMessageToContact" _label="Send message to contact" - _tip="Send a message to the selected contacts."/> + _tip="Send a message to the selected contacts." + pixtype="pixbuf"/> <cmd name="ContactsCopyToFolder" _label="Copy to Folder..." _tip="Copy Selected Contacts to Another Folder..." @@ -75,19 +73,24 @@ <cmd name="FolderMove" _label="_Move Folder Contacts To" _tip="Move the contacts of the selected folder into another folder" pixtype="pixbuf"/> + <cmd name="FolderSave" _label="_Save Folder Contacts As VCard" _tip="Save the contacts of the selected folder as VCard" pixtype="pixbuf"/> + <cmd name="FolderDelete" _label="_Delete" _tip="Delete the selected folder" - pixtype="pixbuf"/> + pixtype="pixbuf"/> + <cmd name="FolderRename" _label="_Rename" _tip="Rename the selected folder" pixtype="pixbuf" accel="F2"/> + <cmd name="ChangeFolderProperties" _label="_Properties" _tip="Change the properties of the selected folder" pixtype="pixbuf"/> + </commands> <menu> @@ -98,14 +101,12 @@ <menuitem name="ContactsSaveAsVCard" verb="" _label="_Save Contact as VCard..."/> <menuitem name="FolderSave" - verb="" _label="S_ave Address Book As VCard" pixtype="pixbuf"/> + verb="" _label="S_ave Address Book As VCard"/> </placeholder> <placeholder name="Print"> - <menuitem name="ContactsPrintPreview" verb="" - _label="Print Pre_view"/> - <menuitem name="ContactsPrint" verb="" - _label="_Print..."/> + <menuitem name="ContactsPrintPreview" verb="" _label="Print Pre_view"/> + <menuitem name="ContactsPrint" verb="" _label="_Print..."/> </placeholder> </submenu> @@ -130,7 +131,7 @@ <menuitem name="ContactDelete" verb="" _label="_Delete Contact"/> - <menuitem name="FolderDelete" verb="" _label="Del_ete Address Book" pixtype="stock" pixname="gtk-delete"/> + <menuitem name="FolderDelete" verb="" _label="Del_ete Address Book"/> </placeholder> </submenu> @@ -140,10 +141,10 @@ <placeholder name="ActionsPlaceholder"> <submenu name="Actions" _label="_Actions"> <menuitem name="ContactsSendContactToOther" - _label="_Forward Contact..." verb="" pixtype="pixbuf"/> + _label="_Forward Contact..." verb=""/> <menuitem name="ContactsSendMessageToContact" - _label="_Send Message to Contact..." verb="" pixtype="pixbuf"/> + _label="_Send Message to Contact..." verb=""/> <menuitem name="ContactActionStop" verb="ContactStop" _label="St_op"/> <separator f="" name="eadbk5"/> @@ -153,13 +154,13 @@ <separator f="" name="eadbk4"/> - <menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..." pixtype="pixbuf"/> + <menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..."/> - <menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..." pixtype="pixbuf"/> + <menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..."/> <separator f="" name="eadbk3"/> - <menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties" pixtype="pixbuf"/> + <menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties"/> </submenu> </placeholder> @@ -168,10 +169,10 @@ <dockitem name="Toolbar"> <toolitem name="ContactsPrint" verb="" - _label="Print"/> + _label="Print" pixtype="pixbuf"/> <toolitem name="ContactDelete" verb="" - _label="Delete"/> + _label="Delete" pixtype="pixbuf"/> <toolitem name="ContactStop" verb="" _label="Stop"/> diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml index 3a7c94feb8..662a9206c4 100644 --- a/ui/evolution-calendar.xml +++ b/ui/evolution-calendar.xml @@ -1,14 +1,14 @@ <Root> <commands> <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o"/> - <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="stock" pixname="gtk-print" + <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf" accel="*Control*p"/> - <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="stock" pixname="gtk-print-preview"/> + <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/> <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/> <cmd name="CalendarToday" _tip="Select today" pixtype="stock" pixname="Home"/> <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/> - <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="stock" pixname="gtk-jump-to"/> + <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="pixbuf"/> <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/> <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/> @@ -16,13 +16,13 @@ <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/> <cmd name="ShowListView" _tip="Show as list" pixtype="pixbuf"/> - <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> - <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> - <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="pixbuf"/> + <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="pixbuf"/> + <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="pixbuf"/> - <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete"/> - <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="stock" pixname="gtk-delete"/> - <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="stock" pixname="gtk-delete"/> + <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="pixbuf"/> + <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="pixbuf"/> + <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="pixbuf"/> <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/> </commands> @@ -75,8 +75,8 @@ <dockitem name="Toolbar"> - <toolitem name="Print" verb="CalendarPrint" _label="Print"/> - <toolitem name="Delete" verb="" _label="Delete"/> + <toolitem name="Print" verb="CalendarPrint" _label="Print" pixtype="pixbuf"/> + <toolitem name="Delete" verb="" _label="Delete" pixtype="pixbuf"/> <separator f="" name="ecal2"/> @@ -86,7 +86,7 @@ <separator f="" name="ecal3"/> - <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/> + <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/> <separator f="" name="ecal4"/> diff --git a/ui/evolution-composer-entries.xml b/ui/evolution-composer-entries.xml index f38dfa3589..f8cc923bf7 100644 --- a/ui/evolution-composer-entries.xml +++ b/ui/evolution-composer-entries.xml @@ -3,15 +3,15 @@ <cmd name="EditCut" _tip="Cut selected text to the clipboard" - accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> + accel="*Control*x" pixtype="pixbuf"/> <cmd name="EditCopy" _tip="Copy selected text to the clipboard" - accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> + accel="*Control*c" pixtype="pixbuf"/> <cmd name="EditPaste" _tip="Paste text from the clipboard" - accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + accel="*Control*v" pixtype="pixbuf"/> <cmd name="EditSelectAll" _tip="Select all text" @@ -37,4 +37,4 @@ <toolitem name="EditPaste" verb="" _label="Paste" _tip="Paste from clipboard"/> </dockitem> -</Root>
\ No newline at end of file +</Root> diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml index 4f819b78f9..d16b8b5d29 100644 --- a/ui/evolution-editor.xml +++ b/ui/evolution-editor.xml @@ -1,15 +1,15 @@ <Root> <commands> - <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="stock" pixname="gtk-save"/> - <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="stock" pixname="gtk-close"/> + <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="pixbuf"/> + <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="pixbuf"/> - <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> - <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> - <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="pixbuf"/> + <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="pixbuf"/> + <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="pixbuf"/> <cmd name="EditSelectAll" _tip="Select all text" accel="*Control*a"/> <cmd name="InsertAttachments" _tip="Click here to attach a file" accel="*Control*m" pixtype="pixbuf"/> - <cmd name="Help" _tip="Click here to view help available" accel="F1" pixtype="stock" pixname="gtk-help"/> + <cmd name="Help" _tip="Click here to view help available" accel="F1" pixtype="pixbuf"/> </commands> @@ -39,7 +39,7 @@ <submenu name="Insert" _label="I_nsert"> <placeholder name="Attachments"> - <menuitem name="InsertAttachments" verb="" _label="_Attachment..." pixtype="pixbuf"/> + <menuitem name="InsertAttachments" verb="" _label="_Attachment..."/> </placeholder> </submenu> @@ -53,8 +53,8 @@ <dockitem name="Toolbar"> - <toolitem name="FileSave" verb="" _label="Save"/> - <toolitem name="FileClose" verb="" _label="Close"/> + <toolitem name="FileSave" verb="" _label="Save" pixtype="pixbuf"/> + <toolitem name="FileClose" verb="" _label="Close" pixtype="pixbuf"/> <separator f="" name="editor1"/> <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/> diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml index f50fe084c8..fa43cb56b2 100644 --- a/ui/evolution-event-editor.xml +++ b/ui/evolution-event-editor.xml @@ -45,13 +45,15 @@ _tip="Make this a recurring event" pixtype="pixbuf"/> <cmd name="ActionFreeBusy" _label="_Free/Busy" - _tip="Query free / busy information for the attendees" pixtype="pixbuf"/> + _tip="Query free / busy information for the attendees" + pixtype="pixbuf"/> <cmd name="InsertSendOptions" _label="Send Options" _tip="Insert advanced send options"/> <cmd name="ActionAlarm" _label="_Alarms" - _tip="Click here to set or unset alarms for this event" /> + _tip="Click here to set or unset alarms for this event" + pixtype="pixbuf"/> </commands> @@ -71,7 +73,7 @@ <menuitem name="InsertSendOptions" verb="" _label="Send _Options"/> </submenu> <submenu name="Options"> - <menuitem name="ActionAlarm" verb="" _label="_Alarms" pixtype="pixbuf"/> + <menuitem name="ActionAlarm" verb="" _label="_Alarms"/> <menuitem name="ActionShowTimeBusy" verb="" _label="Show time as _busy"/> <menuitem name="ActionAllDayEvent" verb="" _label="All _Day Event"/> <submenu name="Classification" _label="_Classification"> @@ -79,8 +81,8 @@ <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/> <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/> </submenu> - <menuitem name="ActionRecurrence" verb="" _label="_Recurrence" pixtype="pixbuf"/> - <menuitem name="ActionFreeBusy" verb="" _label="_Free/Busy" pixtype="pixbuf"/> + <menuitem name="ActionRecurrence" verb="" _label="_Recurrence"/> + <menuitem name="ActionFreeBusy" verb="" _label="_Free/Busy"/> </submenu> </menu> diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml index 11cfe7c439..c39ee83b31 100644 --- a/ui/evolution-mail-list.xml +++ b/ui/evolution-mail-list.xml @@ -4,15 +4,15 @@ <cmd name="EditCut" _tip="Cut selected message(s) to the clipboard" - accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> + accel="*Control*x" pixtype="pixbuf"/> <cmd name="EditCopy" _tip="Copy selected message(s) to the clipboard" - accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> + accel="*Control*c" pixtype="pixbuf"/> <cmd name="EditPaste" _tip="Paste message(s) from the clipboard" - accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + accel="*Control*v" pixtype="pixbuf"/> <cmd name="EditInvertSelection" _tip="Select all and only the messages that are not currently selected" @@ -119,8 +119,8 @@ <placeholder name="FolderOps"> <menuitem name="FolderRename" verb="" _label="_Rename..."/> - <menuitem name="FolderRefresh" verb="" _label="Re_fresh..." pixtype="stock" pixname="stock_refresh"/> - <menuitem name="FolderDelete" verb="" _label="_Delete" pixtype="stock" pixname="gtk-delete"/> + <menuitem name="FolderRefresh" verb="" _label="Re_fresh..." pixtype="pixbuf"/> + <menuitem name="FolderDelete" verb="" _label="_Delete" pixtype="pixbuf"/> <separator f="" name="FolderOps1"/> <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/> diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 1663b795b1..f6fade2f39 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -11,15 +11,15 @@ <cmd name="EditCut" _tip="Cut selected messages to the clipboard" - accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> + accel="*Control*x" pixtype="pixbuf"/> <cmd name="EditCopy" _tip="Copy selected messages to the clipboard" - accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> + accel="*Control*c" pixtype="pixbuf"/> <cmd name="EditPaste" _tip="Paste messages from the clipboard" - accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + accel="*Control*v" pixtype="pixbuf"/> <cmd name="MailNext" _tip="Display the next message" @@ -126,8 +126,7 @@ <cmd name="MessageOpen" _tip="Open the selected messages in a new window" - accel="*Control*o" - pixtype="pixbuf"/> + accel="*Control*o"/> <cmd name="MailPost" _tip="Post a message to a Public folder"/> @@ -157,12 +156,12 @@ <cmd name="MessageSaveAs" _tip="Save the selected messages as a text file" accel="*Control*s" - pixtype="stock" pixname="gtk-save-as"/> + pixtype="pixbuf"/> <cmd name="MessageSearch" _tip="Search for text in the body of the displayed message" accel="*Control**Shift*f" - pixtype="stock" pixname="gtk-find"/> + pixtype="pixbuf"/> <cmd name="MessageUndelete" _tip="Undelete the selected messages" @@ -171,15 +170,14 @@ <cmd name="PrintMessage" _tip="Print this message" accel="*Control*p" - pixtype="stock" pixname="gtk-print"/> + pixtype="pixbuf"/> <cmd name="PrintPreviewMessage" _tip="Preview the message to be printed" - pixtype="stock" pixname="gtk-print-preview"/> + pixtype="pixbuf"/> <cmd name="PrintSetup" - _tip="Set up the page settings for your current printer" - pixtype="pixbuf"/> + _tip="Set up the page settings for your current printer"/> <cmd name="SelectAllText" _tip="Select all the text in a message" @@ -227,15 +225,15 @@ <cmd name="TextZoomIn" _tip="Increase the text size" - accel="*Control*plus"/> + accel="*Control*plus" pixtype="pixbuf"/> <cmd name="TextZoomOut" _tip="Decrease the text size" - accel="*Control*minus"/> + accel="*Control*minus" pixtype="pixbuf"/> <cmd name="TextZoomReset" _tip="Reset the text to its original size" - accel="*Control*0"/> + accel="*Control*0" pixtype="pixbuf"/> </commands> @@ -287,13 +285,9 @@ <submenu name="View"> <placeholder name="MailMessageZoom"> <submenu name="zoom" _label="_Zoom"> - <menuitem name="TextZoomIn" verb="" _label="_Zoom In" - pixtype="stock" pixname="gtk-zoom-in"/> - <menuitem name="TextZoomOut" verb="" _label="Zoom _Out" - pixtype="stock" pixname="gtk-zoom-out"/> - - <menuitem name="TextZoomReset" verb="" _label="_Normal Size" - pixtype="stock" pixname="gtk-zoom-100"/> + <menuitem name="TextZoomIn" verb="" _label="_Zoom In"/> + <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"/> + <menuitem name="TextZoomReset" verb="" _label="_Normal Size"/> </submenu> </placeholder> @@ -318,7 +312,7 @@ </placeholder> <placeholder name="MessageNavigation"> - <submenu name="GoTo" _label="_Go To" pixtype="stock" pixname="gtk-jump-to"> + <submenu name="GoTo" _label="_Go To" pixtype="pixbuf"> <menuitem name="MailNext" verb="" _label="_Next Message"/> <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/> <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/> @@ -370,7 +364,7 @@ <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/> <menuitem name="MessageFollowUpClear" verb="" _label="_Clear Flag"/> - <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed" pixtype="pixbuf"/> + <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed"/> </submenu> <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/> @@ -416,7 +410,7 @@ <toolitem name="PrintMessage" verb="" _label="Print" - pixtype="stock" pixname="gtk-print"/> + pixtype="pixbuf"/> <toolitem name="MessageDelete" verb="" _label="Delete" diff --git a/ui/evolution-memos.xml b/ui/evolution-memos.xml index 0065a8dad4..9a132d2add 100644 --- a/ui/evolution-memos.xml +++ b/ui/evolution-memos.xml @@ -1,15 +1,15 @@ <Root> <commands> <cmd name="MemosOpenMemo" _tip="View the selected memo" accel="*Control*o"/> - <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="stock" pixname="gtk-print" + <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="pixbuf" accel="*Control*p"/> - <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="stock" pixname="gtk-print-preview"/> + <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="pixbuf"/> - <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> - <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> - <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="pixbuf"/> + <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="pixbuf"/> + <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="pixbuf"/> <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0" - pixtype="stock" pixname="gtk-delete"/> + pixtype="pixbuf"/> </commands> @@ -41,15 +41,15 @@ </menu> <dockitem name="Toolbar"> - <toolitem name="Cut" _label="Cut" verb="MemosCut"/> - <toolitem name="Copy" _label="Copy" verb="MemosCopy"/> - <toolitem name="Paste" _label="Paste" verb="MemosPaste"/> + <toolitem name="Cut" _label="Cut" verb="MemosCut" pixtype="pixbuf"/> + <toolitem name="Copy" _label="Copy" verb="MemosCopy" pixtype="pixbuf"/> + <toolitem name="Paste" _label="Paste" verb="MemosPaste" pixtype="pixbuf"/> <separator/> - <toolitem name="Print" _label="Print" verb="MemosPrint"/> + <toolitem name="Print" _label="Print" verb="MemosPrint" pixtype="pixbuf"/> - <toolitem name="Delete" _label="Delete" verb="MemosDelete"/> + <toolitem name="Delete" _label="Delete" verb="MemosDelete" pixtype="pixbuf"/> </dockitem> diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml index 33f4c3ecd0..0533a0e486 100644 --- a/ui/evolution-message-composer.xml +++ b/ui/evolution-message-composer.xml @@ -2,22 +2,22 @@ <commands> <cmd name="FileOpen" _label="Open" hidden="1" - _tip="Open a file" pixtype="stock" pixname="gtk-open" accel="*Control*o"/> + _tip="Open a file" pixtype="pixbuf" accel="*Control*o"/> <cmd name="FileSave" _label="Save" - _tip="Save the current file" pixtype="stock" pixname="gtk-save" + _tip="Save the current file" pixtype="pixbuf" accel="*Ctrl*s"/> <cmd name="FileSaveDraft" _label="Save Draft" - _tip="Save as draft" pixtype="pixbuf" + _tip="Save as draft" pixtype="pixbuf" accel="*Ctrl**Shift*s"/> <cmd name="FileSaveAs" _label="Save As" _tip="Save the current file with a different name" - pixtype="stock" pixname="gtk-save-as"/> + pixtype="pixbuf"/> <cmd name="FileClose" _label="Close" - _tip="Close the current file" pixtype="stock" pixname="gtk-close" + _tip="Close the current file" pixtype="pixbuf" accel="*Ctrl*w"/> <cmd name="FileSaveInFolder" _label="Save in folder..." @@ -32,7 +32,7 @@ pixtype="pixbuf"/> <cmd name="DeleteAll" _label="_Delete all" - pixtype="stock" pixname="gtk-delete" + pixtype="pixbuf" _tip="Delete all but signature"/> <cmd name="RequestReceipt" _label="R_equest Read Receipt" @@ -84,8 +84,7 @@ _tip="Encrypt this message with your S/MIME Encryption Certificate" type="toggle" state="0" hidden="1"/> - <cmd name="InsertXSendOptions" _tip="Insert Send options" - pixtype="pixbuf"/> + <cmd name="InsertXSendOptions" _tip="Insert Send options"/> </commands> @@ -101,8 +100,8 @@ <separator f="" name="emailcomposer1"/> - <menuitem name="FileSave" verb="" _label="_Save" pixtype="stock" pixname="gtk-save"/> - <menuitem name="FileSaveAs" verb="" _label="Save _As..." pixtype="stock" pixname="gtk-save-as"/> + <menuitem name="FileSave" verb="" _label="_Save"/> + <menuitem name="FileSaveAs" verb="" _label="Save _As..."/> <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/> <placeholder name="Print" delimit="top"/> @@ -134,7 +133,7 @@ <submenu name="Insert" _label="I_nsert"> <menuitem name="FileAttach" verb="" - _label="_Attachment..." pixtype="pixbuf"/> + _label="_Attachment..."/> <separator/> <menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/> <separator/> diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml index 4a423e7d36..414bfb7001 100644 --- a/ui/evolution-subscribe.xml +++ b/ui/evolution-subscribe.xml @@ -3,7 +3,7 @@ <submenu name="File" _label="_File"> <menuitem name="FileCloseWin" verb="" - pixtype="stock" pixname="gtk-close" _label="_Close" accel="*Control*w"/> + pixtype="pixbuf" _label="_Close" accel="*Control*w"/> </submenu> diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml index 925a1dd7bc..7793e018e8 100644 --- a/ui/evolution-task-editor.xml +++ b/ui/evolution-task-editor.xml @@ -61,7 +61,7 @@ <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/> <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/> </submenu> - <menuitem name="OptionStatus" verb="" _label="_Status Details" pixtype="pixbuf"/> + <menuitem name="OptionStatus" verb="" _label="_Status Details"/> </submenu> </menu> diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml index b0f278d4fd..e0902b6806 100644 --- a/ui/evolution-tasks.xml +++ b/ui/evolution-tasks.xml @@ -1,20 +1,20 @@ <Root> <commands> <cmd name="TasksOpenTask" _tip="View the selected task" accel="*Control*o"/> - <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="stock" pixname="gtk-print" + <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf" accel="*Control*p"/> - <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="stock" pixname="gtk-print-preview"/> + <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/> - <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/> - <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/> - <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/> + <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="pixbuf"/> + <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="pixbuf"/> + <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="pixbuf"/> <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0" - pixtype="stock" pixname="gtk-delete"/> + pixtype="pixbuf"/> <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/> <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/> <cmd name="TasksAssign" _label="_Assign Task"/> - <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f"/> + <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f" pixtype="pixbuf"/> <cmd name="ViewPreview" _tip="Show task preview window" accel="*Control*m" type="toggle"/> @@ -59,22 +59,22 @@ <submenu name="Actions" _label="_Actions"> <menuitem name="TasksPurge" verb=""/> <menuitem name="TasksAssign" verb=""/> - <menuitem name="TasksForward" verb="" pixtype="pixbuf"/> + <menuitem name="TasksForward" verb=""/> </submenu> </placeholder> </menu> <dockitem name="Toolbar"> - <toolitem name="Cut" _label="Cut" verb="TasksCut"/> - <toolitem name="Copy" _label="Copy" verb="TasksCopy"/> - <toolitem name="Paste" _label="Paste" verb="TasksPaste"/> + <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/> + <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/> + <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/> <separator/> - <toolitem name="Print" _label="Print" verb="TasksPrint"/> + <toolitem name="Print" _label="Print" verb="TasksPrint" pixtype="pixbuf"/> - <toolitem name="Delete" _label="Delete" verb="TasksDelete"/> + <toolitem name="Delete" _label="Delete" verb="TasksDelete" pixtype="pixbuf"/> </dockitem> diff --git a/ui/evolution.xml b/ui/evolution.xml index f50d74c2ac..db43ae7c6a 100644 --- a/ui/evolution.xml +++ b/ui/evolution.xml @@ -7,10 +7,10 @@ <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/> <cmd name="FileClose" _label="_Close Window" _tip="Close this window" - pixtype="stock" pixname="gtk-close" accel="*Control*w"/> + accel="*Control*w"/> <cmd name="FileExit" _label="_Quit" _tip="Exit the program" - pixtype="stock" pixname="gtk-quit" accel="*Control*q"/> + accel="*Control*q"/> <cmd name="ViewButtonsIconText" _label="Icons _and text" type="radio" group="button_display" _tip="Display window buttons with icons and text"/> @@ -67,7 +67,8 @@ <separator f="" name="eshell4"/> - <menuitem name="SendReceive" verb="" _label="Send / _Receive" accel="F9"/> + <menuitem name="SendReceive" verb="" _label="Send / _Receive" + pixtype="pixbuf" accel="F9"/> <placeholder name="FileOps"/> @@ -98,9 +99,11 @@ pixtype="pixbuf"/> <menuitem name="FileClose" verb="" - _label="_Close Window"/> + _label="_Close Window" + pixtype="pixbuf"/> - <menuitem name="FileExit" verb="FileExit"/> + <menuitem name="FileExit" verb="FileExit" + pixtype="pixbuf"/> </submenu> <submenu name="Edit" _label="_Edit"> |