diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-08 04:04:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-08 04:04:52 +0800 |
| commit | 14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f (patch) | |
| tree | ec49b42bc6e0cfb3115ca56f41106e63a0b67d85 /mail/e-mail-shell-view-actions.h | |
| parent | fee5916b60c605ff5086d8fdc2a85c5ea21351f6 (diff) | |
| download | gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.gz gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.bz2 gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.lz gsoc2013-evolution-14e8637d6b1a98b4ed6bedc70d0fca744b7b3e0f.tar.xz 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 'mail/e-mail-shell-view-actions.h')
| -rw-r--r-- | mail/e-mail-shell-view-actions.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mail/e-mail-shell-view-actions.h b/mail/e-mail-shell-view-actions.h index 3760b39da9..16490fe38b 100644 --- a/mail/e-mail-shell-view-actions.h +++ b/mail/e-mail-shell-view-actions.h @@ -103,6 +103,10 @@ E_SHELL_WINDOW_ACTION ((window), "mail-hide-read") #define E_SHELL_WINDOW_ACTION_MAIL_HIDE_SELECTED(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-hide-selected") +#define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NEW(window) \ + E_SHELL_WINDOW_ACTION ((window), "mail-label-new") +#define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NONE(window) \ + E_SHELL_WINDOW_ACTION ((window), "mail-label-none") #define E_SHELL_WINDOW_ACTION_MAIL_LOAD_IMAGES(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-load-images") #define E_SHELL_WINDOW_ACTION_MAIL_MARK_IMPORTANT(window) \ @@ -205,16 +209,6 @@ E_SHELL_WINDOW_ACTION ((window), "mail-filter-all-messages") #define E_SHELL_WINDOW_ACTION_MAIL_FILTER_IMPORTANT_MESSAGES(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-filter-important-messages") -#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LABEL_IMPORTANT(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-filter-label-important") -#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LABEL_LATER(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-filter-label-later") -#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LABEL_PERSONAL(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-filter-label-personal") -#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LABEL_TO_DO(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-filter-label-to-do") -#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LABEL_WORK(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-filter-label-work") #define E_SHELL_WINDOW_ACTION_MAIL_FILTER_LAST_5_DAYS_MESSAGES(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-filter-last-5-days-messages") #define E_SHELL_WINDOW_ACTION_MAIL_FILTER_MESSAGES_NOT_JUNK(window) \ @@ -257,5 +251,7 @@ E_SHELL_WINDOW_ACTION_GROUP ((window), "mail") #define E_SHELL_WINDOW_ACTION_GROUP_MAIL_FILTER(window) \ E_SHELL_WINDOW_ACTION_GROUP ((window), "mail-filter") +#define E_SHELL_WINDOW_ACTION_GROUP_MAIL_LABEL(window) \ + E_SHELL_WINDOW_ACTION_GROUP ((window), "mail-label") #endif /* E_MAIL_SHELL_VIEW_ACTIONS_H */ |