aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-21 10:04:39 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-21 13:31:56 +0800
commitd6ad0c22a24fd871f31db3edff98b83765ce32ad (patch)
tree77ff4e08bbf9ed9f0e68ae3bd104f82d5ab51a10 /ui
parent50a5e067d50806371110f54dce77628cbc548ab1 (diff)
downloadgsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar.gz
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar.bz2
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar.lz
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar.xz
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.tar.zst
gsoc2013-evolution-d6ad0c22a24fd871f31db3edff98b83765ce32ad.zip
Bug 678397 - Move "mail-to-task" actions to a submenu
Shortens the Message menu a little for low screen resolutions.
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-mail-reader.ui16
-rw-r--r--ui/evolution-mail.ui14
2 files changed, 15 insertions, 15 deletions
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ffc16a980d..4096b8cd10 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -96,14 +96,16 @@
</menu>
<menuitem action='mail-filters-apply'/>
<menuitem action='mail-check-for-junk'/>
- <menuitem action='mail-remove-attachments'/>
+ <menuitem action='mail-remove-attachments'/>
<menuitem action='mail-remove-duplicates'/>
<separator/>
- <menu action='mail-create-rule-menu'>
- <menuitem action='mail-filter-on-subject'/>
- <menuitem action='mail-filter-on-sender'/>
- <menuitem action='mail-filter-on-recipients'/>
- <menuitem action='mail-filter-on-mailing-list'/>
+ <menu action='mail-create-menu'>
+ <placeholder action='mail-conversion-actions'/>
+ <separator/>
+ <menuitem action='mail-filter-rule-for-subject'/>
+ <menuitem action='mail-filter-rule-for-sender'/>
+ <menuitem action='mail-filter-rule-for-recipients'/>
+ <menuitem action='mail-filter-rule-for-mailing-list'/>
<separator/>
<menuitem action='mail-search-folder-from-subject'/>
<menuitem action='mail-search-folder-from-sender'/>
@@ -111,8 +113,6 @@
<menuitem action='mail-search-folder-from-mailing-list'/>
</menu>
<placeholder name='mail-message-custom-menus'/>
- <separator/>
- <placeholder name='mail-message-actions'/>
</menu>
</placeholder>
</menubar>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 0f0969d87a..83490ba883 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -128,11 +128,13 @@
<menuitem action='mail-label-new'/>
</menu>
<separator/>
- <menu action='mail-create-rule-menu'>
- <menuitem action='mail-filter-on-subject'/>
- <menuitem action='mail-filter-on-sender'/>
- <menuitem action='mail-filter-on-recipients'/>
- <menuitem action='mail-filter-on-mailing-list'/>
+ <menu action='mail-create-menu'>
+ <placeholder name='mail-conversion-actions'/>
+ <separator/>
+ <menuitem action='mail-filter-rule-for-subject'/>
+ <menuitem action='mail-filter-rule-for-sender'/>
+ <menuitem action='mail-filter-rule-for-recipients'/>
+ <menuitem action='mail-filter-rule-for-mailing-list'/>
<separator/>
<menuitem action='mail-search-folder-from-subject'/>
<menuitem action='mail-search-folder-from-sender'/>
@@ -141,8 +143,6 @@
</menu>
<separator/>
<placeholder name='mail-message-templates'/>
- <separator/>
- <placeholder name='mail-message-popup-actions'/>
</popup>
<popup name='mail-search-options'>
<menuitem action='mail-search-advanced-hidden'/>