diff options
| -rw-r--r-- | art/Makefile.am | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 6 | ||||
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 2 | ||||
| -rw-r--r-- | ui/ChangeLog | 8 | ||||
| -rw-r--r-- | ui/evolution-mail-message.xml | 9 | ||||
| -rw-r--r-- | ui/evolution-message-composer.xml | 8 | ||||
| -rw-r--r-- | ui/evolution.xml | 2 |
8 files changed, 32 insertions, 11 deletions
diff --git a/art/Makefile.am b/art/Makefile.am index 7ef6458a98..df8922cc4b 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -79,6 +79,10 @@ images_DATA = \ new_appointment.xpm \ new_contact.xpm \ new-message.xpm \ + save-16.png \ + save-as-16.png \ + search-16.png \ + search-and-replace-16.png \ send-16.png \ send-later-16.png \ send-receive.xpm \ @@ -97,6 +101,7 @@ images_DATA = \ thankyou.png \ undelete_message.xpm \ work_offline.xpm \ + work_online-16.png \ world_map-960.png buttonsdir = $(datadir)/images/evolution/buttons diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index fdf9cefe4d..95bfc1541a 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1685,8 +1685,10 @@ static EPixmap pixcache [] = { E_PIXMAP ("/Toolbar/FileSend", "buttons/send-24.png"), /* E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */ - E_PIXMAP ("/menu/File/FileSend", "send-16.png"), - E_PIXMAP ("/menu/File/FileSendLater", "send-later-16.png"), + E_PIXMAP ("/commands/FileSend", "send-16.png"), + E_PIXMAP ("/commands/FileSendLater", "send-later-16.png"), + E_PIXMAP ("/commands/FileSave", "save-16.png"), + E_PIXMAP ("/commands/FileSaveAs", "save-as-16.png"), E_PIXMAP_END }; diff --git a/mail/ChangeLog b/mail/ChangeLog index fa12d5dfe7..618a57f702 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2001-08-01 Jason Leach <jleach@ximian.com> + * folder-browser-ui.c: Use the new Save As and Message Search + icons from Jakub. + * mail-callbacks.c (delete_msg): Don't move cursors around when deleting last message and Hide Deleted Messages isn't enabled. Bug #5928. diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 8c659b5fe9..204630962d 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -123,6 +123,8 @@ static EPixmap message_pixcache [] = { E_PIXMAP ("/commands/MessageReplySender", "reply.xpm"), E_PIXMAP ("/commands/MessageForward", "forward.xpm"), E_PIXMAP ("/commands/MessageApplyFilters", "apply-filters-16.xpm"), + E_PIXMAP ("/commands/MessageSearch", "search-16.png"), + E_PIXMAP ("/commands/MessageSaveAs", "save-as-16.png"), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "buttons/reply.png"), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "buttons/reply-to-all.png"), diff --git a/ui/ChangeLog b/ui/ChangeLog index 5da755f176..5739e5b52a 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,11 @@ +2001-08-01 Jason Leach <jleach@ximian.com> + + * evolution-mail-message.xml: Use Jakub's new Find icon for + Edit/Search Message menu item. + + * evolution-message-composer.xml: And the new Save and Save As + icons for the composer. + 2001-07-31 Peter Williams <peterw@ximian.com> * evolution-message-composer.xml: Add "Customize Toolbars" menu item diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 298670286a..0b2cdcd020 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -36,7 +36,7 @@ <cmd name="MessageCopy" _tip="Copy selected messages to another folder" accel="*Control**Shift*c" - pixtype="pixbuf" /> + pixtype="pixbuf"/> <cmd name="MessageDelete" _tip="Mark the selected messages for deletion" @@ -45,7 +45,7 @@ <cmd name="MessageForward" _tip="Forward the selected message to someone" accel="*Control*f" - pixtype="pixbuf" /> + pixtype="pixbuf"/> <cmd name="MessageForwardAttached" _tip="Forward the selected message to someone as an attachment" @@ -102,11 +102,12 @@ <cmd name="MessageSaveAs" _tip="Save the message as a text file" accel="*Control**Alt*s" - pixtype="stock" pixname="Save"/> + pixtype="pixbuf"/> <cmd name="MessageSearch" _tip="Search for text in the body of the displayed message" - accel="*Control*e"/> + accel="*Control*e" + pixtype="pixbuf"/> <cmd name="MessageUndelete" _tip="Un-delete the selected messages" diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml index eb83c0a546..b3731d7937 100644 --- a/ui/evolution-message-composer.xml +++ b/ui/evolution-message-composer.xml @@ -5,12 +5,12 @@ _tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/> <cmd name="FileSave" _label="Save" - _tip="Save the current file" pixtype="stock" pixname="Save" + _tip="Save the current file" pixtype="pixbuf" accel="*Ctrl*s"/> <cmd name="FileSaveAs" _label="Save As" _tip="Save the current file with a different name" - pixtype="stock" pixname="Save As"/> + pixtype="pixbuf"/> <cmd name="FileClose" _label="Close" _tip="Close the current file" pixtype="stock" pixname="Close" @@ -89,9 +89,9 @@ <menuitem name="FileOpen" verb="" _label="_Open..."/> <placeholder name="FileOps"/> <menuitem name="FileSend" verb="" - _label="Send" pixtype="pixbuf"/> + _label="Send"/> <menuitem name="FileSendLater" verb="" - _label="Send _Later" pixtype="pixbuf"/> + _label="Send _Later"/> <separator/> <menuitem name="FileSave" verb="" _label="_Save"/> <menuitem name="FileSaveAs" verb="" _label="Save _As..."/> diff --git a/ui/evolution.xml b/ui/evolution.xml index bcfe4c6181..287a01ea79 100644 --- a/ui/evolution.xml +++ b/ui/evolution.xml @@ -15,7 +15,7 @@ _tip="Toggle whether to show the folder bar"/> <cmd name="HelpSubmitBug" _label="Submit Bug Report" - _tip="Submit bug report using Bug Buddy."/> + _tip="Submit a bug report using Bug Buddy"/> <cmd name="ToggleOffline" _type="Toggle" _label="_Work Offline" |