aboutsummaryrefslogtreecommitdiffstats
path: root/ui/evolution-mail-reader.ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-02-08 04:04:52 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-02-08 04:04:52 +0800
commit14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f (patch)
treeec49b42bc6e0cfb3115ca56f41106e63a0b67d85 /ui/evolution-mail-reader.ui
parentfee5916b60c605ff5086d8fdc2a85c5ea21351f6 (diff)
downloadgsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.gz
gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.zst
gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.zip
Rewrite the mail label code from top to bottom.
- Kill the e-util-labels API and read label information into a single-column GtkListStore. Use GConfBridge to automatically keep GConf synched with the list store. - The list store (a singleton instance) is stored in EShellSettings so it's available everywhere. - The list store serves as the model for EMailLabelTreeView, which itself is embedded in EMailLabelManager; a complete label management UI as seen in the preferences dialog. - EMailLabelDialog is used to add or edit a label. Avoid using a color button, instead embed a GtkColorSelection directly in the dialog so everything is in one window. Open issues: - The weird toggle/color/text menu items in the popup menu aren't there. For now they're just regular toggle items. I'll deal with it later. - Filter intergration is broken at the moment. svn path=/branches/kill-bonobo/; revision=37233
Diffstat (limited to 'ui/evolution-mail-reader.ui')
-rw-r--r--ui/evolution-mail-reader.ui30
1 files changed, 9 insertions, 21 deletions
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 55e7ee56db..b4eeb4a124 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -125,27 +125,15 @@
</placeholder>
</toolbar>
<popup name='mail-message-popup'>
- <menuitem action='mail-popup-reply-sender'/>
- <menuitem action='mail-popup-reply-all'/>
- <menuitem action='mail-popup-forward'/>
- <separator/>
- <menuitem action='mail-popup-message-edit'/>
- <menuitem action='mail-popup-save-as'/>
- <menuitem action='mail-popup-print'/>
- <separator/>
- <menuitem action='mail-popup-delete'/>
- <menuitem action='mail-popup-undelete'/>
- <menuitem action='mail-popup-copy'/>
- <menuitem action='mail-popup-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'/>
+ <placeholder name='mail-message-popup-common-actions'>
+ <menuitem action='mail-popup-reply-sender'/>
+ <menuitem action='mail-popup-reply-all'/>
+ <menuitem action='mail-popup-forward'/>
+ <separator/>
+ <menuitem action='mail-popup-message-edit'/>
+ <menuitem action='mail-popup-save-as'/>
+ <menuitem action='mail-popup-print'/>
+ </placeholder>
</popup>
<popup name='mail-uri-popup'>
<menuitem action='mail-uri-call-to'/>