aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mail-to-task
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-09-05 23:35:02 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-09-05 23:35:02 +0800
commit016805f54d602763358da78f45b4779bd85763b1 (patch)
tree87c21aa8b82ccee9dff6732de22b30b39c4810f5 /plugins/mail-to-task
parent7ec8fed125463d5eda4bcf306378d0cf528d0ca8 (diff)
downloadgsoc2013-evolution-016805f54d602763358da78f45b4779bd85763b1.tar.gz
gsoc2013-evolution-016805f54d602763358da78f45b4779bd85763b1.tar.zst
gsoc2013-evolution-016805f54d602763358da78f45b4779bd85763b1.zip
Get the mailing-list-actions plugin working.
Also get mail-to-task working for the message browser window. Came up with a new technique for managing actions and action groups in the process. Also gave the EMailReader interface an "update-actions" signal for plugins to connect to.
Diffstat (limited to 'plugins/mail-to-task')
-rw-r--r--plugins/mail-to-task/mail-to-task.c135
-rw-r--r--plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml26
2 files changed, 102 insertions, 59 deletions
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 1b8ad64768..cef866589d 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -46,6 +46,7 @@
#include <camel/camel-stream-mem.h>
#include <camel/camel-utf8.h>
+#include <mail/e-mail-browser.h>
#include <mail/em-utils.h>
#include <mail/em-format-html.h>
#include <mail/mail-config.h>
@@ -66,7 +67,9 @@
#define E_SHELL_WINDOW_ACTION_CONVERT_TO_TASK(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-task")
-gboolean e_plugin_ui_init (GtkUIManager *ui_manager,
+gboolean mail_browser_init (GtkUIManager *ui_manager,
+ EMailBrowser *browser);
+gboolean mail_shell_view_init (GtkUIManager *ui_manager,
EShellView *shell_view);
static gchar *
@@ -948,7 +951,11 @@ action_mail_convert_to_task_cb (GtkAction *action,
mail_to_event (E_CAL_SOURCE_TYPE_TODO, FALSE, shell_view);
}
-static GtkActionEntry entries[] = {
+/* Note, we're not using EPopupActions here because we update the state
+ * of entire actions groups instead of individual actions. EPopupActions
+ * just proxy the state of individual actions. */
+
+static GtkActionEntry multi_selection_entries[] = {
{ "mail-convert-to-event",
"appointment-new",
@@ -957,13 +964,6 @@ static GtkActionEntry entries[] = {
N_("Create a new event from the selected message"),
G_CALLBACK (action_mail_convert_to_event_cb) },
- { "mail-convert-to-meeting",
- "stock_new-meeting",
- N_("Create a _Meeting"),
- NULL,
- N_("Create a new meeting from the selected message"),
- G_CALLBACK (action_mail_convert_to_meeting_cb) },
-
{ "mail-convert-to-memo",
"stock_insert-note",
N_("Create a Mem_o"),
@@ -979,79 +979,106 @@ static GtkActionEntry entries[] = {
G_CALLBACK (action_mail_convert_to_task_cb) }
};
-static EPopupActionEntry popup_entries[] = {
-
- { "mail-popup-convert-to-event",
- NULL,
- "mail-convert-to-event" },
-
- { "mail-popup-convert-to-meeting",
- NULL,
- "mail-convert-to-meeting" },
-
- { "mail-popup-convert-to-memo",
- NULL,
- "mail-convert-to-memo" },
+static GtkActionEntry single_selection_entries[] = {
- { "mail-popup-convert-to-task",
+ { "mail-convert-to-meeting",
+ "stock_new-meeting",
+ N_("Create a _Meeting"),
NULL,
- "mail-convert-to-task" }
+ N_("Create a new meeting from the selected message"),
+ G_CALLBACK (action_mail_convert_to_meeting_cb) }
};
static void
-update_actions_cb (EShellView *shell_view)
+update_actions_any_cb (EMailReader *reader,
+ GtkActionGroup *action_group)
{
- EShellContent *shell_content;
- EShellWindow *shell_window;
- GtkAction *action;
gboolean sensitive;
guint32 state;
- shell_content = e_shell_view_get_shell_content (shell_view);
- shell_window = e_shell_view_get_shell_window (shell_view);
-
- state = e_mail_reader_check_state (E_MAIL_READER (shell_content));
+ state = e_mail_reader_check_state (reader);
sensitive =
(state & E_MAIL_READER_SELECTION_SINGLE) ||
(state & E_MAIL_READER_SELECTION_MULTIPLE);
- action = E_SHELL_WINDOW_ACTION_CONVERT_TO_EVENT (shell_window);
- gtk_action_set_sensitive (action, sensitive);
+ gtk_action_group_set_sensitive (action_group, sensitive);
+}
- action = E_SHELL_WINDOW_ACTION_CONVERT_TO_MEMO (shell_window);
- gtk_action_set_sensitive (action, sensitive);
+static void
+update_actions_one_cb (EMailReader *reader,
+ GtkActionGroup *action_group)
+{
+ gboolean sensitive;
+ guint32 state;
- action = E_SHELL_WINDOW_ACTION_CONVERT_TO_TASK (shell_window);
- gtk_action_set_sensitive (action, sensitive);
+ state = e_mail_reader_check_state (reader);
sensitive = (state & E_MAIL_READER_SELECTION_SINGLE);
- action = E_SHELL_WINDOW_ACTION_CONVERT_TO_MEETING (shell_window);
- gtk_action_set_sensitive (action, sensitive);
-
+ gtk_action_group_set_sensitive (action_group, sensitive);
}
-gboolean
-e_plugin_ui_init (GtkUIManager *ui_manager,
- EShellView *shell_view)
+static void
+setup_actions (EMailReader *reader,
+ GtkUIManager *ui_manager)
{
- EShellWindow *shell_window;
GtkActionGroup *action_group;
+ const gchar *domain = GETTEXT_PACKAGE;
+
+ action_group = gtk_action_group_new ("mail-convert-any");
+ gtk_action_group_set_translation_domain (action_group, domain);
+ gtk_action_group_add_actions (
+ action_group, multi_selection_entries,
+ G_N_ELEMENTS (multi_selection_entries), reader);
+ gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+ g_object_unref (action_group);
- shell_window = e_shell_view_get_shell_window (shell_view);
- action_group = e_shell_window_get_action_group (shell_window, "mail");
+ /* GtkUIManager now owns the action group reference.
+ * The signal we're connecting to will only be emitted
+ * during the GtkUIManager's lifetime, so the action
+ * group will not disappear on us. */
+ g_signal_connect (
+ reader, "update-actions",
+ G_CALLBACK (update_actions_any_cb), action_group);
+
+ action_group = gtk_action_group_new ("mail-convert-one");
+ gtk_action_group_set_translation_domain (action_group, domain);
gtk_action_group_add_actions (
- action_group, entries,
- G_N_ELEMENTS (entries), shell_view);
- e_action_group_add_popup_actions (
- action_group, popup_entries,
- G_N_ELEMENTS (popup_entries));
+ action_group, single_selection_entries,
+ G_N_ELEMENTS (single_selection_entries), reader);
+ gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+ g_object_unref (action_group);
+
+ /* GtkUIManager now owns the action group reference.
+ * The signal we're connecting to will only be emitted
+ * during the GtkUIManager's lifetime, so the action
+ * group will not disappear on us. */
g_signal_connect (
- shell_view, "update-actions",
- G_CALLBACK (update_actions_cb), NULL);
+ reader, "update-actions",
+ G_CALLBACK (update_actions_one_cb), action_group);
+}
+
+gboolean
+mail_browser_init (GtkUIManager *ui_manager,
+ EMailBrowser *browser)
+{
+ setup_actions (E_MAIL_READER (browser), ui_manager);
+
+ return TRUE;
+}
+
+gboolean
+mail_shell_view_init (GtkUIManager *ui_manager,
+ EShellView *shell_view)
+{
+ EShellContent *shell_content;
+
+ shell_content = e_shell_view_get_shell_content (shell_view);
+
+ setup_actions (E_MAIL_READER (shell_content), ui_manager);
return TRUE;
}
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index 0170b59c6e..a02e2a540f 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -5,7 +5,23 @@
<_description>Convert a mail message to a task.</_description>
<hook class="org.gnome.evolution.ui:1.0">
- <ui-manager id="org.gnome.evolution.mail">
+ <ui-manager id="org.gnome.evolution.mail.browser"
+ callback="mail_browser_init">
+ <menubar name='main-menu'>
+ <placeholder name='custom-menus'>
+ <menu action="mail-message-menu">
+ <placeholder name="mail-message-actions">
+ <menuitem action="mail-convert-to-event"/>
+ <menuitem action="mail-convert-to-meeting"/>
+ <menuitem action="mail-convert-to-task"/>
+ <menuitem action="mail-convert-to-memo"/>
+ </placeholder>
+ </menu>
+ </placeholder>
+ </menubar>
+ </ui-manager>
+ <ui-manager id="org.gnome.evolution.mail"
+ callback="mail_shell_view_init">
<menubar name='main-menu'>
<placeholder name='custom-menus'>
<menu action="mail-message-menu">
@@ -20,10 +36,10 @@
</menubar>
<popup name="mail-message-popup">
<placeholder name="mail-message-popup-actions">
- <menuitem action="mail-popup-convert-to-event"/>
- <menuitem action="mail-popup-convert-to-meeting"/>
- <menuitem action="mail-popup-convert-to-task"/>
- <menuitem action="mail-popup-convert-to-memo"/>
+ <menuitem action="mail-convert-to-event"/>
+ <menuitem action="mail-convert-to-meeting"/>
+ <menuitem action="mail-convert-to-task"/>
+ <menuitem action="mail-convert-to-memo"/>
</placeholder>
</popup>
</ui-manager>