diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 2 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 15 | ||||
| -rw-r--r-- | ui/ChangeLog | 6 | ||||
| -rw-r--r-- | ui/evolution-mail.xml | 9 | ||||
| -rw-r--r-- | widgets/misc/e-search-bar.c | 4 |
8 files changed, 41 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 672cec0df7..1ffe5dceb0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-05-12 Gediminas Paulauskas <menesis@delfi.lt> + + * folder-browser-factory.c: load pixmaps for MessageCopy and + MessageForwardAttached. Thanks Wayne Davis <wfdavis@seas.upenn.edu> + for a patch. + 2001-05-11 Dan Winship <danw@ximian.com> * mail-display.c (load_http): callback to use GNOME-VFS to load diff --git a/mail/Makefile.am b/mail/Makefile.am index 2b66e3573c..d39fca9307 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -30,7 +30,6 @@ INCLUDES = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \ -DG_LOG_DOMAIN=\"evolution-mail\" diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index e26e3595ea..ac0970319b 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -132,9 +132,11 @@ static EPixmap pixcache [] = { E_PIXMAP ("/menu/View/MessageHideClear", "show_all_messages.xpm"), E_PIXMAP ("/menu/Actions/Component/SendReceive", "send-receive.xpm"), + E_PIXMAP ("/menu/Actions/Component/MessageCopy", "copy_16_message.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageMove", "move_message.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageReplyAll", "reply_to_all.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageReplySender", "reply.xpm"), + E_PIXMAP ("/menu/Actions/Component/MessageForwardAttached", "forward.xpm"), E_PIXMAP ("/menu/Tools/Component/SetMailConfig", "configure_16_mail.xpm"), diff --git a/po/ChangeLog b/po/ChangeLog index 4721bb5e14..9c8614c697 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2001-05-12 Gediminas Paulauskas <menesis@delfi.lt> + + * po/POTFILES.in: update with new/moved files. + 2001-05-10 Christian Rose <menthos@menthos.com> * sv.po: Updated Swedish translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 69860e44d3..a4ee44114c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -29,6 +29,7 @@ addressbook/gui/widgets/e-addressbook-view.c addressbook/gui/widgets/e-minicard.c addressbook/gui/widgets/e-minicard-control.c addressbook/gui/widgets/e-minicard-view.c +addressbook/gui/widgets/e-minicard-view-model.c addressbook/gui/widgets/gal-view-factory-minicard.c addressbook/printing/e-contact-print.glade calendar/cal-util/timeutil.c @@ -71,6 +72,7 @@ calendar/gui/tasks-control.c calendar/gui/tasks-migrate.c calendar/gui/weekday-picker.c camel/camel-cipher-context.c +camel/camel-disco-store.c camel/camel-filter-driver.c camel/camel-filter-search.c camel/camel-folder-search.c @@ -78,6 +80,7 @@ camel/camel-lock.c camel/camel-movemail.c camel/camel-pgp-context.c camel/camel-pgp-mime.c +camel/camel-pkcs7-context.c camel/camel-provider.c camel/camel-remote-store.c camel/camel-sasl-anonymous.c @@ -89,8 +92,10 @@ camel/camel-sasl-plain.c camel/camel-search-private.c camel/camel-service.c camel/camel-session.c +camel/camel-smime-context.c camel/camel-store.c camel/camel-tcp-stream-ssl.c +camel/camel-tcp-stream-openssl.c camel/camel-url.c camel/camel-vee-folder.c camel/camel-vtrash-folder.c @@ -160,6 +165,13 @@ filter/score-editor.c filter/score-rule.c filter/vfolder-editor.c filter/vfolder-rule.c +importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in +importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in +importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in +importers/elm-importer.c +importers/evolution-gnomecard-importer.c +importers/netscape-importer.c +importers/pine-importer.c mail/component-factory.c mail/folder-browser.c mail/folder-browser-factory.c @@ -196,6 +208,8 @@ shell/e-shell.c shell/e-shell-folder-creation-dialog.c shell/e-shell-folder-selection-dialog.c shell/e-shell-folder-title-bar.c +shell/e-shell-importer.c +shell/e-shell-offline-handler.c shell/e-shell-view.c shell/e-shell-view-menu.c shell/e-shortcuts.c @@ -204,7 +218,6 @@ shell/e-storage.c shell/e-storage-set-view.c shell/glade/e-shell-folder-creation-dialog.glade shell/GNOME_Evolution_Shell.oaf.in -shell/importer/importer.c shell/importer/import.glade shell/importer/intelligent.c shell/main.c diff --git a/ui/ChangeLog b/ui/ChangeLog index 2c307d0f32..0ebc82d1fa 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,9 @@ +2001-05-12 Gediminas Paulauskas <menesis@delfi.lt> + + * evolution-mail.xml: add pixmaps for MessageCopy and + MessageForwardAttached. Thanks Wayne Davis <wfdavis@seas.upenn.edu> + for a patch. + 2001-05-07 Jon Trowbridge <trow@ximian.com> * evolution.xml: Added command entry for 'ToggleOffline'. diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml index 589067976a..1505d0172d 100644 --- a/ui/evolution-mail.xml +++ b/ui/evolution-mail.xml @@ -49,7 +49,8 @@ _tip="Send a single mail in reply to all the selected mail"/> <cmd name="MessageForwardAttached" _label="Forward" - _tip="Forward the selected mail to someone" accel="*Control*j"/> + pixtype="pixbuf" accel="*Control*j" + _tip="Forward the selected mail to someone"/> <cmd name="MessageForwardInlined" _label="Forward inline" _tip="Forward this message in-line with your mail, so you can edit it" @@ -65,7 +66,8 @@ _tip="Move selected messages to another folder" pixtype="pixbuf" accel="*Control*m"/> <cmd name="MessageCopy" _label="Copy" - _tip="Copy selected messages to another folder" accel="*Control*c"/> + pixtype="pixbuf" accel="*Control*c" + _tip="Copy selected messages to another folder"/> <cmd name="MessageDelete" _label="Delete" _tip="Delete the selected messages" accel="*Control*d"/> @@ -230,8 +232,10 @@ _label="Reply to _All" pixtype="pixbuf" accel="*Control**Shift*r"/> + <menuitem name="MessageForwardAttached" verb="" _label="_Forward" + pixtype="pixbuf" accel="*Control*f"/> <submenu name="ForwardAs" _label="Forward As"> @@ -260,6 +264,7 @@ <menuitem name="MessageCopy" verb="" _label="_Copy to Folder..." + pixtype="pixbuf" accel="*Control*c"/> <separator/> diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index c668082260..4d563208a2 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -123,7 +123,7 @@ static void add_dropdown(ESearchBar *esb, ESearchBarItem *items) str = _(items->text); if (str == items->text) { /* It may be english string, or utf8 rule name */ - item = e_utf8_gtk_menu_item_new_with_label (menu, str); + item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), str); } else item = gtk_menu_item_new_with_label (str); } @@ -201,7 +201,7 @@ set_option(ESearchBar *esb, ESearchBarItem *items) str = _(items[i].text); if (str == items[i].text) { /* It may be english string, or utf8 rule name */ - item = e_utf8_gtk_menu_item_new_with_label (menu, str); + item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), str); } else item = gtk_menu_item_new_with_label (str); } |