aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-01-11 22:20:50 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-11 22:20:50 +0800
commite0610b2e0cea191f631dc825cdc8023cdcd9433d (patch)
tree239b20ce4632d6538b9c664ddec883b6e19c11b5 /ui
parent59d1f3405c653eb45ca462508d5e6ed968513e42 (diff)
downloadgsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.gz
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.zst
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.zip
Continue chipping away at EMFolderView and EMFolderBrowser.
Migrate from gnome_url_show() to e_show_uri(). svn path=/branches/kill-bonobo/; revision=37038
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-mail-reader.ui31
-rw-r--r--ui/evolution-mail.ui28
2 files changed, 31 insertions, 28 deletions
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index e5ef5db624..a14db5090d 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -123,4 +123,35 @@
<toolitem action='mail-next'/>
</placeholder>
</toolbar>
+ <popup name='mail-message-popup'>
+ <menuitem action='mail-reply-sender'/>
+ <menuitem action='mail-reply-all'/>
+ <menuitem action='mail-forward'/>
+ <separator/>
+ <menuitem action='mail-message-edit'/>
+ <menuitem action='mail-save-as'/>
+ <menuitem action='mail-print'/>
+ <separator/>
+ <menuitem action='mail-delete'/>
+ <menuitem action='mail-copy'/>
+ <menuitem action='mail-move'/>
+ <separator/>
+ <menuitem action='mail-popup-mark-read'/>
+ <menuitem action='mail-popup-mark-unread'/>
+ <menuitem action='mail-popup-mark-important'/>
+ <menuitem action='mail-popup-mark-unimportant'/>
+ <menuitem action='mail-popup-mark-junk'/>
+ <menuitem action='mail-popup-mark-notjunk'/>
+ <menuitem action='mail-popup-flag-for-followup'/>
+ <menu action='mail-label-menu'/>
+ </popup>
+ <popup name='mail-uri-popup'>
+ <menuitem action='mail-uri-call-to'/>
+ <menuitem action='mail-uri-copy'/>
+ <menuitem action='mail-uri-copy-address'/>
+ <menu action='mail-uri-to-search-folder-menu'>
+ <menuitem action='mail-uri-to-search-folder-sender'/>
+ <menuitem action='mail-uri-to-search-folder-recipient'/>
+ </menu>
+ </popup>
</ui>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 665d8900ad..76e93a43b4 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -80,34 +80,6 @@
<separator/>
<menuitem action='mail-folder-properties'/>
</popup>
- <popup name='mail-message-popup'>
- <menuitem action='mail-reply-sender'/>
- <menuitem action='mail-reply-all'/>
- <menuitem action='mail-forward'/>
- <separator/>
- <menuitem action='mail-message-edit'/>
- <menuitem action='mail-save-as'/>
- <menuitem action='mail-print'/>
- <separator/>
- <menuitem action='mail-delete'/>
- <menuitem action='mail-copy'/>
- <menuitem action='mail-move'/>
- <separator/>
- <menuitem action='mail-mark-unread'/>
- <menuitem action='mail-mark-important'/>
- <menuitem action='mail-mark-junk'/>
- <menuitem action='mail-flag-for-followup'/>
- <menu action='mail-label-menu'/>
- </popup>
- <popup name='mail-uri-popup'>
- <menuitem action='mail-uri-call-to'/>
- <menuitem action='mail-uri-copy'/>
- <menuitem action='mail-uri-copy-address'/>
- <menu action='mail-uri-to-search-folder-menu'>
- <menuitem action='mail-uri-to-search-folder-sender'/>
- <menuitem action='mail-uri-to-search-folder-recipient'/>
- </menu>
- </popup>
<popup name='mail-search-options'>
<menuitem action='mail-search-subject-or-sender-contains'/>
<menuitem action='mail-search-subject-or-recipients-contains'/>