[evolution] Rewrite the folder subscription editor.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Rewrite the folder subscription editor.
- Date: Sat, 2 Oct 2010 19:22:12 +0000 (UTC)
commit ec089b4a4129458f7140254607306eec0ef4aebf
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Oct 2 14:07:04 2010 -0400
Rewrite the folder subscription editor.
Redesign the "Folder Subscriptions" dialog and use Camel's async API
instead of the MailMsg infrastructure to simplify the implementation.
mail/Makefile.am | 4 +-
mail/e-mail-sidebar.c | 1 +
mail/em-subscribe-editor.c | 1223 ---------------------------
mail/em-subscribe-editor.h | 28 -
mail/em-subscription-editor.c | 1342 ++++++++++++++++++++++++++++++
mail/em-subscription-editor.h | 71 ++
mail/evolution-mail.schemas.in | 42 +-
mail/mail-dialogs.ui | 963 ++++++++-------------
modules/mail/e-mail-shell-view-actions.c | 20 +-
modules/mail/e-mail-shell-view-private.h | 2 +-
10 files changed, 1835 insertions(+), 1861 deletions(-)
---
diff --git a/mail/Makefile.am b/mail/Makefile.am
index d50f9bd..79db282 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -80,7 +80,7 @@ mailinclude_HEADERS = \
em-inline-filter.h \
em-junk.h \
em-search-context.h \
- em-subscribe-editor.h \
+ em-subscription-editor.h \
em-sync-stream.h \
em-utils.h \
em-vfolder-context.h \
@@ -149,7 +149,7 @@ libevolution_mail_la_SOURCES = \
em-inline-filter.c \
em-junk.c \
em-search-context.c \
- em-subscribe-editor.c \
+ em-subscription-editor.c \
em-sync-stream.c \
em-utils.c \
em-vfolder-context.c \
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 5ed65f9..7f0a569 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -371,6 +371,7 @@ mail_sidebar_check_state (EMailSidebar *sidebar)
if (is_trash)
state |= E_MAIL_SIDEBAR_FOLDER_IS_TRASH;
+ g_object_unref (store);
g_free (full_name);
g_free (uri);
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
new file mode 100644
index 0000000..321d245
--- /dev/null
+++ b/mail/em-subscription-editor.c
@@ -0,0 +1,1342 @@
+/*
+ * em-subscription-editor.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "em-subscription-editor.h"
+
+#include <config.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+#include "mail-tools.h"
+#include "mail-ops.h"
+#include "mail-mt.h"
+
+#include <e-util/e-util.h>
+#include <e-util/e-binding.h>
+#include <e-util/e-account-utils.h>
+#include <e-util/e-util-private.h>
+#include <e-util/gconf-bridge.h>
+
+#include "em-folder-utils.h"
+
+#define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate))
+
+#define FOLDER_CAN_SELECT(folder_info) \
+ ((folder_info) != NULL && \
+ ((folder_info)->flags & CAMEL_FOLDER_NOSELECT) == 0)
+#define FOLDER_SUBSCRIBED(folder_info) \
+ ((folder_info) != NULL && \
+ ((folder_info)->flags & CAMEL_FOLDER_SUBSCRIBED) != 0)
+
+typedef struct _AsyncContext AsyncContext;
+typedef struct _StoreData StoreData;
+
+struct _EMSubscriptionEditorPrivate {
+ CamelSession *session;
+ EAccount *initial_account;
+
+ GtkWidget *combo_box; /* not referenced */
+ GtkWidget *entry; /* not referenced */
+ GtkWidget *notebook; /* not referenced */
+ GtkWidget *subscribe_button; /* not referenced */
+ GtkWidget *unsubscribe_button; /* not referenced */
+ GtkWidget *collapse_all_button; /* not referenced */
+ GtkWidget *expand_all_button; /* not referenced */
+ GtkWidget *refresh_button; /* not referenced */
+ GtkWidget *stop_button; /* not referenced */
+
+ /* Indicies coincide with the combo box. */
+ GPtrArray *stores;
+
+ /* Points at an item in the stores array. */
+ StoreData *active;
+
+ /* Casefolded search string. */
+ gchar *search_string;
+
+ guint timeout_id;
+};
+
+struct _AsyncContext {
+ EMSubscriptionEditor *editor;
+ CamelFolderInfo *folder_info;
+ GtkTreeRowReference *reference;
+};
+
+struct _StoreData {
+ EAccount *account;
+ CamelStore *store;
+ GtkTreeView *tree_view;
+ GtkTreeModel *list_store;
+ GtkTreeModel *tree_store;
+ GCancellable *cancellable;
+ CamelFolderInfo *folder_info;
+ gboolean filtered_view;
+ gboolean needs_refresh;
+};
+
+enum {
+ PROP_0,
+ PROP_ACCOUNT,
+ PROP_SESSION
+};
+
+enum {
+ COL_CASEFOLDED, /* G_TYPE_STRING */
+ COL_FOLDER_NAME, /* G_TYPE_STRING */
+ COL_FOLDER_ICON, /* G_TYPE_STRING */
+ COL_FOLDER_INFO, /* G_TYPE_POINTER */
+ N_COLUMNS
+};
+
+G_DEFINE_TYPE (EMSubscriptionEditor, em_subscription_editor, GTK_TYPE_DIALOG)
+
+static void
+async_context_free (AsyncContext *context)
+{
+ g_object_unref (context->editor);
+ gtk_tree_row_reference_free (context->reference);
+
+ g_slice_free (AsyncContext, context);
+}
+
+static void
+store_data_free (StoreData *data)
+{
+ if (data->account != NULL)
+ g_object_unref (data->account);
+
+ if (data->store != NULL)
+ g_object_unref (data->store);
+
+ if (data->tree_view != NULL)
+ g_object_unref (data->tree_view);
+
+ if (data->list_store != NULL)
+ g_object_unref (data->list_store);
+
+ if (data->tree_store != NULL)
+ g_object_unref (data->tree_store);
+
+ if (data->cancellable != NULL) {
+ g_cancellable_cancel (data->cancellable);
+ g_object_unref (data->cancellable);
+ }
+
+ camel_folder_info_free (data->folder_info);
+
+ g_slice_free (StoreData, data);
+}
+
+static void
+subscription_editor_populate (EMSubscriptionEditor *editor,
+ CamelFolderInfo *folder_info,
+ GtkTreeIter *parent)
+{
+ GtkTreeView *tree_view;
+ GtkListStore *list_store;
+ GtkTreeStore *tree_store;
+
+ tree_view = editor->priv->active->tree_view;
+ list_store = GTK_LIST_STORE (editor->priv->active->list_store);
+ tree_store = GTK_TREE_STORE (editor->priv->active->tree_store);
+
+ while (folder_info != NULL) {
+ GtkTreeIter iter;
+ const gchar *icon_name;
+ gchar *casefolded;
+
+ icon_name =
+ em_folder_utils_get_icon_name (folder_info->flags);
+
+ casefolded = g_utf8_casefold (folder_info->full_name, -1);
+
+ gtk_list_store_append (list_store, &iter);
+
+ gtk_list_store_set (
+ list_store, &iter,
+ COL_CASEFOLDED, casefolded,
+ COL_FOLDER_ICON, icon_name,
+ COL_FOLDER_NAME, folder_info->full_name,
+ COL_FOLDER_INFO, folder_info, -1);
+
+ gtk_tree_store_append (tree_store, &iter, parent);
+
+ gtk_tree_store_set (
+ tree_store, &iter,
+ COL_CASEFOLDED, NULL, /* not needed */
+ COL_FOLDER_ICON, icon_name,
+ COL_FOLDER_NAME, folder_info->name,
+ COL_FOLDER_INFO, folder_info, -1);
+
+ if (FOLDER_SUBSCRIBED (folder_info)) {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (
+ GTK_TREE_MODEL (tree_store), &iter);
+ gtk_tree_view_expand_to_path (tree_view, path);
+ gtk_tree_path_free (path);
+ }
+
+ g_free (casefolded);
+
+ if (folder_info->child != NULL)
+ subscription_editor_populate (
+ editor, folder_info->child, &iter);
+
+ folder_info = folder_info->next;
+ }
+}
+
+static void
+subscription_editor_get_folder_info_done (CamelStore *store,
+ GAsyncResult *result,
+ EMSubscriptionEditor *editor)
+{
+ GtkTreePath *path;
+ GtkTreeView *tree_view;
+ GtkTreeModel *list_store;
+ GtkTreeModel *tree_store;
+ GtkTreeSelection *selection;
+ CamelFolderInfo *folder_info;
+ GdkWindow *window;
+ GError *error = NULL;
+
+ folder_info = camel_store_get_folder_info_finish (
+ store, result, &error);
+
+ /* Just return quietly if we were cancelled. */
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_warn_if_fail (folder_info == NULL);
+ g_error_free (error);
+ goto exit;
+ }
+
+ gtk_widget_set_sensitive (editor->priv->notebook, TRUE);
+ gtk_widget_set_sensitive (editor->priv->refresh_button, TRUE);
+ gtk_widget_set_sensitive (editor->priv->stop_button, FALSE);
+
+ window = gtk_widget_get_window (GTK_WIDGET (editor));
+ gdk_window_set_cursor (window, NULL);
+
+ /* XXX Do something smarter with errors. */
+ if (error != NULL) {
+ g_warn_if_fail (folder_info == NULL);
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ goto exit;
+ }
+
+ g_return_if_fail (folder_info != NULL);
+
+ camel_folder_info_free (editor->priv->active->folder_info);
+ editor->priv->active->folder_info = folder_info;
+
+ tree_view = editor->priv->active->tree_view;
+ list_store = editor->priv->active->list_store;
+ tree_store = editor->priv->active->tree_store;
+
+ gtk_list_store_clear (GTK_LIST_STORE (list_store));
+ gtk_tree_store_clear (GTK_TREE_STORE (tree_store));
+ subscription_editor_populate (editor, folder_info, NULL);
+
+ path = gtk_tree_path_new_first ();
+ selection = gtk_tree_view_get_selection (tree_view);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+
+ gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+exit:
+ g_object_unref (editor);
+}
+
+static void
+subscription_editor_subscribe_folder_done (CamelStore *store,
+ GAsyncResult *result,
+ AsyncContext *context)
+{
+ GtkTreeView *tree_view;
+ GtkTreeModel *tree_model;
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GdkWindow *window;
+ GError *error = NULL;
+
+ camel_store_subscribe_folder_finish (store, result, &error);
+
+ /* Just return quietly if we were cancelled. */
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+ goto exit;
+ }
+
+ /* XXX Do something smarter with errors. */
+ if (error == NULL)
+ context->folder_info->flags |= CAMEL_FOLDER_SUBSCRIBED;
+ else {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
+ gtk_widget_set_sensitive (context->editor->priv->notebook, TRUE);
+ gtk_widget_set_sensitive (context->editor->priv->refresh_button, TRUE);
+ gtk_widget_set_sensitive (context->editor->priv->stop_button, FALSE);
+
+ window = gtk_widget_get_window (GTK_WIDGET (context->editor));
+ gdk_window_set_cursor (window, NULL);
+
+ /* Update the Subscription/Unsubscription buttons. */
+ tree_view = context->editor->priv->active->tree_view;
+ selection = gtk_tree_view_get_selection (tree_view);
+ g_signal_emit_by_name (selection, "changed");
+
+ /* Update the toggle renderer in the selected row. */
+ tree_model = gtk_tree_row_reference_get_model (context->reference);
+ path = gtk_tree_row_reference_get_path (context->reference);
+ gtk_tree_model_get_iter (tree_model, &iter, path);
+ gtk_tree_model_row_changed (tree_model, path, &iter);
+ gtk_tree_path_free (path);
+
+exit:
+ async_context_free (context);
+}
+
+static void
+subscription_editor_unsubscribe_folder_done (CamelStore *store,
+ GAsyncResult *result,
+ AsyncContext *context)
+{
+ GtkTreeView *tree_view;
+ GtkTreeModel *tree_model;
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GdkWindow *window;
+ GError *error = NULL;
+
+ camel_store_unsubscribe_folder_finish (store, result, &error);
+
+ /* Just return quietly if we were cancelled. */
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+ goto exit;
+ }
+
+ /* XXX Do something smarter with errors. */
+ if (error == NULL)
+ context->folder_info->flags &= ~CAMEL_FOLDER_SUBSCRIBED;
+ else {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
+ gtk_widget_set_sensitive (context->editor->priv->notebook, TRUE);
+ gtk_widget_set_sensitive (context->editor->priv->refresh_button, TRUE);
+ gtk_widget_set_sensitive (context->editor->priv->stop_button, FALSE);
+
+ window = gtk_widget_get_window (GTK_WIDGET (context->editor));
+ gdk_window_set_cursor (window, NULL);
+
+ /* Update the Subscription/Unsubscription buttons. */
+ tree_view = context->editor->priv->active->tree_view;
+ selection = gtk_tree_view_get_selection (tree_view);
+ g_signal_emit_by_name (selection, "changed");
+
+ /* Update the toggle renderer in the selected row. */
+ tree_model = gtk_tree_row_reference_get_model (context->reference);
+ path = gtk_tree_row_reference_get_path (context->reference);
+ gtk_tree_model_get_iter (tree_model, &iter, path);
+ gtk_tree_model_row_changed (tree_model, path, &iter);
+ gtk_tree_path_free (path);
+
+exit:
+ async_context_free (context);
+}
+
+static void
+subscription_editor_subscribe (EMSubscriptionEditor *editor)
+{
+ CamelFolderInfo *folder_info;
+ GtkTreeRowReference *reference;
+ GtkTreeSelection *selection;
+ GtkTreeModel *tree_model;
+ GtkTreeView *tree_view;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GdkCursor *cursor;
+ GdkWindow *window;
+ AsyncContext *context;
+ gboolean have_selection;
+
+ tree_view = editor->priv->active->tree_view;
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ have_selection = gtk_tree_selection_get_selected (
+ selection, &tree_model, &iter);
+ g_return_if_fail (have_selection);
+
+ /* Cancel any operation on this store still in progress. */
+ gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
+
+ /* Start a new 'subscription' operation. */
+ editor->priv->active->cancellable = g_cancellable_new ();
+
+ gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
+ gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
+
+ cursor = gdk_cursor_new (GDK_WATCH);
+ window = gtk_widget_get_window (GTK_WIDGET (editor));
+ gdk_window_set_cursor (window, cursor);
+ gdk_cursor_unref (cursor);
+
+ gtk_tree_model_get (
+ tree_model, &iter, COL_FOLDER_INFO, &folder_info, -1);
+
+ path = gtk_tree_model_get_path (tree_model, &iter);
+ reference = gtk_tree_row_reference_new (tree_model, path);
+ gtk_tree_path_free (path);
+
+ context = g_slice_new0 (AsyncContext);
+ context->editor = g_object_ref (editor);
+ context->folder_info = folder_info;
+ context->reference = reference;
+
+ camel_store_subscribe_folder (
+ editor->priv->active->store,
+ folder_info->full_name, G_PRIORITY_DEFAULT,
+ editor->priv->active->cancellable, (GAsyncReadyCallback)
+ subscription_editor_subscribe_folder_done, context);
+}
+
+static void
+subscription_editor_unsubscribe (EMSubscriptionEditor *editor)
+{
+ CamelFolderInfo *folder_info;
+ GtkTreeRowReference *reference;
+ GtkTreeSelection *selection;
+ GtkTreeModel *tree_model;
+ GtkTreeView *tree_view;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GdkCursor *cursor;
+ GdkWindow *window;
+ AsyncContext *context;
+ gboolean have_selection;
+
+ tree_view = editor->priv->active->tree_view;
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ have_selection = gtk_tree_selection_get_selected (
+ selection, &tree_model, &iter);
+ g_return_if_fail (have_selection);
+
+ /* Cancel any operation on this store still in progress. */
+ gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
+
+ /* Start a new 'unsubscription' operation. */
+ editor->priv->active->cancellable = g_cancellable_new ();
+
+ gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
+ gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
+
+ cursor = gdk_cursor_new (GDK_WATCH);
+ window = gtk_widget_get_window (GTK_WIDGET (editor));
+ gdk_window_set_cursor (window, cursor);
+ gdk_cursor_unref (cursor);
+
+ gtk_tree_model_get (
+ tree_model, &iter, COL_FOLDER_INFO, &folder_info, -1);
+
+ path = gtk_tree_model_get_path (tree_model, &iter);
+ reference = gtk_tree_row_reference_new (tree_model, path);
+ gtk_tree_path_free (path);
+
+ context = g_slice_new0 (AsyncContext);
+ context->editor = g_object_ref (editor);
+ context->folder_info = folder_info;
+ context->reference = reference;
+
+ camel_store_unsubscribe_folder (
+ editor->priv->active->store,
+ folder_info->full_name, G_PRIORITY_DEFAULT,
+ editor->priv->active->cancellable, (GAsyncReadyCallback)
+ subscription_editor_unsubscribe_folder_done, context);
+}
+
+static void
+subscription_editor_collapse_all (EMSubscriptionEditor *editor)
+{
+ gtk_tree_view_collapse_all (editor->priv->active->tree_view);
+}
+
+static void
+subscription_editor_expand_all (EMSubscriptionEditor *editor)
+{
+ gtk_tree_view_expand_all (editor->priv->active->tree_view);
+}
+
+static void
+subscription_editor_refresh (EMSubscriptionEditor *editor)
+{
+ GdkCursor *cursor;
+ GdkWindow *window;
+
+ /* Cancel any operation on this store still in progress. */
+ gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
+
+ /* Start a new 'refresh' operation. */
+ editor->priv->active->cancellable = g_cancellable_new ();
+
+ gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
+ gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
+ gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
+
+ cursor = gdk_cursor_new (GDK_WATCH);
+ window = gtk_widget_get_window (GTK_WIDGET (editor));
+ gdk_window_set_cursor (window, cursor);
+ gdk_cursor_unref (cursor);
+
+ camel_store_get_folder_info (
+ editor->priv->active->store, NULL,
+ CAMEL_STORE_FOLDER_INFO_RECURSIVE |
+ CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL |
+ CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST,
+ G_PRIORITY_DEFAULT, editor->priv->active->cancellable,
+ (GAsyncReadyCallback) subscription_editor_get_folder_info_done,
+ g_object_ref (editor));
+}
+
+static void
+subscription_editor_stop (EMSubscriptionEditor *editor)
+{
+ GdkWindow *window;
+
+ if (editor->priv->active->cancellable != NULL) {
+ g_cancellable_cancel (editor->priv->active->cancellable);
+ g_object_unref (editor->priv->active->cancellable);
+ editor->priv->active->cancellable = NULL;
+ }
+
+ gtk_widget_set_sensitive (editor->priv->notebook, TRUE);
+ gtk_widget_set_sensitive (editor->priv->subscribe_button, TRUE);
+ gtk_widget_set_sensitive (editor->priv->unsubscribe_button, TRUE);
+ gtk_widget_set_sensitive (editor->priv->refresh_button, TRUE);
+ gtk_widget_set_sensitive (editor->priv->stop_button, FALSE);
+
+ window = gtk_widget_get_window (GTK_WIDGET (editor));
+ gdk_window_set_cursor (window, NULL);
+}
+
+static gboolean
+subscription_editor_filter_cb (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ EMSubscriptionEditor *editor)
+{
+ CamelFolderInfo *folder_info;
+ gchar *casefolded;
+ gboolean match;
+
+ /* If there's no search string let everything through. */
+ if (editor->priv->search_string == NULL)
+ return TRUE;
+
+ gtk_tree_model_get (
+ tree_model, iter,
+ COL_CASEFOLDED, &casefolded,
+ COL_FOLDER_INFO, &folder_info, -1);
+
+ match = FOLDER_CAN_SELECT (folder_info) &&
+ (casefolded != NULL) && (*casefolded != '\0') &&
+ (strstr (casefolded, editor->priv->search_string) != NULL);
+
+ g_free (casefolded);
+
+ return match;
+}
+
+static void
+subscription_editor_update_view (EMSubscriptionEditor *editor)
+{
+ GtkEntry *entry;
+ GtkTreeView *tree_view;
+ GtkTreeModel *tree_model;
+ const gchar *text;
+
+ entry = GTK_ENTRY (editor->priv->entry);
+ tree_view = editor->priv->active->tree_view;
+
+ editor->priv->timeout_id = 0;
+
+ text = gtk_entry_get_text (entry);
+
+ if (text != NULL && *text != '\0') {
+ g_free (editor->priv->search_string);
+ editor->priv->search_string = g_utf8_casefold (text, -1);
+
+ /* Install the list store in the tree view if needed. */
+ if (!editor->priv->active->filtered_view) {
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+
+ tree_model = gtk_tree_model_filter_new (
+ editor->priv->active->list_store, NULL);
+ gtk_tree_model_filter_set_visible_func (
+ GTK_TREE_MODEL_FILTER (tree_model),
+ (GtkTreeModelFilterVisibleFunc)
+ subscription_editor_filter_cb, editor,
+ (GDestroyNotify) NULL);
+ gtk_tree_view_set_model (tree_view, tree_model);
+ g_object_unref (tree_model);
+
+ path = gtk_tree_path_new_first ();
+ selection = gtk_tree_view_get_selection (tree_view);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+
+ editor->priv->active->filtered_view = TRUE;
+ }
+
+ tree_model = gtk_tree_view_get_model (tree_view);
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (tree_model));
+
+ gtk_entry_set_icon_sensitive (
+ entry, GTK_ENTRY_ICON_SECONDARY, TRUE);
+
+ gtk_widget_set_sensitive (
+ editor->priv->collapse_all_button, FALSE);
+ gtk_widget_set_sensitive (
+ editor->priv->expand_all_button, FALSE);
+
+ } else {
+ /* Install the tree store in the tree view if needed. */
+ if (editor->priv->active->filtered_view) {
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+
+ tree_model = editor->priv->active->tree_store;
+ gtk_tree_view_set_model (tree_view, tree_model);
+
+ path = gtk_tree_path_new_first ();
+ selection = gtk_tree_view_get_selection (tree_view);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+
+ editor->priv->active->filtered_view = FALSE;
+ }
+
+ gtk_entry_set_icon_sensitive (
+ entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
+
+ gtk_widget_set_sensitive (
+ editor->priv->collapse_all_button, TRUE);
+ gtk_widget_set_sensitive (
+ editor->priv->expand_all_button, TRUE);
+ }
+}
+
+static gboolean
+subscription_editor_timeout_cb (EMSubscriptionEditor *editor)
+{
+ subscription_editor_update_view (editor);
+ editor->priv->timeout_id = 0;
+
+ return FALSE;
+}
+
+static void
+subscription_editor_combo_box_changed_cb (GtkComboBox *combo_box,
+ EMSubscriptionEditor *editor)
+{
+ StoreData *data;
+ gint index;
+
+ index = gtk_combo_box_get_active (combo_box);
+ g_return_if_fail (index < editor->priv->stores->len);
+
+ data = g_ptr_array_index (editor->priv->stores, index);
+ g_return_if_fail (data != NULL);
+
+ editor->priv->active = data;
+
+ subscription_editor_stop (editor);
+ subscription_editor_update_view (editor);
+
+ g_object_notify (G_OBJECT (editor), "account");
+
+ if (data->needs_refresh) {
+ subscription_editor_refresh (editor);
+ data->needs_refresh = FALSE;
+ }
+}
+
+static void
+subscription_editor_entry_changed_cb (GtkEntry *entry,
+ EMSubscriptionEditor *editor)
+{
+ const gchar *text;
+
+ if (editor->priv->timeout_id > 0) {
+ g_source_remove (editor->priv->timeout_id);
+ editor->priv->timeout_id = 0;
+ }
+
+ text = gtk_entry_get_text (entry);
+
+ if (text != NULL && *text != '\0')
+ editor->priv->timeout_id = g_timeout_add_seconds (
+ 1, (GSourceFunc) subscription_editor_timeout_cb, editor);
+ else
+ subscription_editor_update_view (editor);
+}
+
+static void
+subscription_editor_icon_release_cb (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ GdkEvent *event,
+ EMSubscriptionEditor *editor)
+{
+ if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
+ gtk_entry_set_text (entry, "");
+}
+
+static void
+subscription_editor_renderer_toggled_cb (GtkCellRendererToggle *renderer,
+ const gchar *path_string,
+ EMSubscriptionEditor *editor)
+{
+ GtkTreeSelection *selection;
+ GtkTreeView *tree_view;
+ GtkTreePath *path;
+
+ tree_view = editor->priv->active->tree_view;
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ path = gtk_tree_path_new_from_string (path_string);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+
+ if (gtk_cell_renderer_toggle_get_active (renderer))
+ subscription_editor_unsubscribe (editor);
+ else
+ subscription_editor_subscribe (editor);
+}
+
+static void
+subscription_editor_render_toggle_cb (GtkCellLayout *cell_layout,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
+{
+ CamelFolderInfo *folder_info;
+
+ gtk_tree_model_get (
+ tree_model, iter, COL_FOLDER_INFO, &folder_info, -1);
+
+ g_object_set (
+ renderer, "active", FOLDER_SUBSCRIBED (folder_info),
+ "visible", FOLDER_CAN_SELECT (folder_info), NULL);
+}
+
+static void
+subscription_editor_selection_changed_cb (GtkTreeSelection *selection,
+ EMSubscriptionEditor *editor)
+{
+ GtkTreeModel *tree_model;
+ GtkTreeIter iter;
+
+ if (gtk_tree_selection_get_selected (selection, &tree_model, &iter)) {
+ CamelFolderInfo *folder_info;
+
+ gtk_tree_model_get (
+ tree_model, &iter,
+ COL_FOLDER_INFO, &folder_info, -1);
+ gtk_widget_set_sensitive (
+ editor->priv->subscribe_button,
+ FOLDER_CAN_SELECT (folder_info) &&
+ !FOLDER_SUBSCRIBED (folder_info));
+ gtk_widget_set_sensitive (
+ editor->priv->unsubscribe_button,
+ FOLDER_CAN_SELECT (folder_info) &&
+ FOLDER_SUBSCRIBED (folder_info));
+ } else {
+ gtk_widget_set_sensitive (
+ editor->priv->subscribe_button, FALSE);
+ gtk_widget_set_sensitive (
+ editor->priv->subscribe_button, FALSE);
+ }
+}
+
+static void
+subscription_editor_add_account (EMSubscriptionEditor *editor,
+ EAccount *account)
+{
+ StoreData *data;
+ CamelStore *store;
+ CamelSession *session;
+ GtkComboBox *combo_box;
+ GtkListStore *list_store;
+ GtkTreeStore *tree_store;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
+ GtkCellRenderer *renderer;
+ GtkWidget *container;
+ GtkWidget *widget;
+ const gchar *url;
+
+ combo_box = GTK_COMBO_BOX (editor->priv->combo_box);
+ gtk_combo_box_append_text (combo_box, account->name);
+
+ session = em_subscription_editor_get_session (editor);
+ url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+
+ store = (CamelStore *) camel_session_get_service (
+ session, url, CAMEL_PROVIDER_STORE, NULL);
+
+ tree_store = gtk_tree_store_new (
+ N_COLUMNS,
+ /* COL_CASEFOLDED */ G_TYPE_STRING,
+ /* COL_FOLDER_ICON */ G_TYPE_STRING,
+ /* COL_FOLDER_NAME */ G_TYPE_STRING,
+ /* COL_FOLDER_INFO */ G_TYPE_POINTER);
+
+ list_store = gtk_list_store_new (
+ N_COLUMNS,
+ /* COL_CASEFOLDED */ G_TYPE_STRING,
+ /* COL_FOLDER_ICON */ G_TYPE_STRING,
+ /* COL_FOLDER_NAME */ G_TYPE_STRING,
+ /* COL_FOLDER_INFO */ G_TYPE_POINTER);
+
+ container = editor->priv->notebook;
+
+ widget = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (
+ GTK_SCROLLED_WINDOW (widget),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (
+ GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+ gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+ gtk_widget_show (widget);
+
+ container = widget;
+
+ widget = gtk_tree_view_new_with_model (GTK_TREE_MODEL (tree_store));
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget), TRUE);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (widget), FALSE);
+ gtk_tree_view_set_search_column (
+ GTK_TREE_VIEW (widget), COL_FOLDER_NAME);
+ gtk_container_add (GTK_CONTAINER (container), widget);
+ gtk_widget_show (widget);
+
+ column = gtk_tree_view_column_new ();
+ gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
+
+ renderer = gtk_cell_renderer_toggle_new ();
+ g_object_set (renderer, "activatable", TRUE, NULL);
+ gtk_tree_view_column_pack_start (column, renderer, FALSE);
+
+ gtk_cell_layout_set_cell_data_func (
+ GTK_CELL_LAYOUT (column), renderer,
+ (GtkCellLayoutDataFunc) subscription_editor_render_toggle_cb,
+ NULL, (GDestroyNotify) NULL);
+
+ g_signal_connect (
+ renderer, "toggled",
+ G_CALLBACK (subscription_editor_renderer_toggled_cb), editor);
+
+ column = gtk_tree_view_column_new ();
+ gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
+ gtk_tree_view_set_expander_column (GTK_TREE_VIEW (widget), column);
+
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (column, renderer, FALSE);
+ gtk_tree_view_column_add_attribute (
+ column, renderer, "icon-name", COL_FOLDER_ICON);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
+ gtk_tree_view_column_add_attribute (
+ column, renderer, "text", COL_FOLDER_NAME);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+
+ g_signal_connect (
+ selection, "changed",
+ G_CALLBACK (subscription_editor_selection_changed_cb), editor);
+
+ data = g_slice_new0 (StoreData);
+ data->account = g_object_ref (account);
+ data->store = g_object_ref (store);
+ data->tree_view = g_object_ref (widget);
+ data->list_store = GTK_TREE_MODEL (list_store);
+ data->tree_store = GTK_TREE_MODEL (tree_store);
+ data->needs_refresh = TRUE;
+
+ g_ptr_array_add (editor->priv->stores, data);
+}
+
+static gboolean
+subscription_editor_test_account (EMSubscriptionEditor *editor,
+ EAccount *account)
+{
+ CamelSession *session;
+ CamelStore *store;
+ const gchar *url;
+
+ /* Account must be enabled. */
+ if (!account->enabled)
+ return FALSE;
+
+ session = em_subscription_editor_get_session (editor);
+ url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+
+ store = (CamelStore *) camel_session_get_service (
+ session, url, CAMEL_PROVIDER_STORE, NULL);
+
+ /* Corresponding CamelStore must support subscriptions. */
+ return (store != NULL) && camel_store_supports_subscriptions (store);
+}
+
+static void
+subscription_editor_set_account (EMSubscriptionEditor *editor,
+ EAccount *account)
+{
+ g_return_if_fail (editor->priv->initial_account == NULL);
+
+ if (account == NULL)
+ account = e_get_default_account ();
+
+ if (E_IS_ACCOUNT (account))
+ editor->priv->initial_account = g_object_ref (account);
+}
+
+static void
+subscription_editor_set_session (EMSubscriptionEditor *editor,
+ CamelSession *session)
+{
+ g_return_if_fail (CAMEL_IS_SESSION (session));
+ g_return_if_fail (editor->priv->session == NULL);
+
+ editor->priv->session = g_object_ref (session);
+}
+
+static void
+subscription_editor_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id) {
+ case PROP_ACCOUNT:
+ subscription_editor_set_account (
+ EM_SUBSCRIPTION_EDITOR (object),
+ g_value_get_object (value));
+ return;
+
+ case PROP_SESSION:
+ subscription_editor_set_session (
+ EM_SUBSCRIPTION_EDITOR (object),
+ g_value_get_object (value));
+ return;
+ }
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+subscription_editor_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id) {
+ case PROP_ACCOUNT:
+ g_value_set_object (
+ value,
+ em_subscription_editor_get_account (
+ EM_SUBSCRIPTION_EDITOR (object)));
+ return;
+
+ case PROP_SESSION:
+ g_value_set_object (
+ value,
+ em_subscription_editor_get_session (
+ EM_SUBSCRIPTION_EDITOR (object)));
+ return;
+ }
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+subscription_editor_dispose (GObject *object)
+{
+ EMSubscriptionEditorPrivate *priv;
+
+ priv = EM_SUBSCRIPTION_EDITOR_GET_PRIVATE (object);
+
+ if (priv->session != NULL) {
+ g_object_unref (priv->session);
+ priv->session = NULL;
+ }
+
+ if (priv->initial_account != NULL) {
+ g_object_unref (priv->initial_account);
+ priv->initial_account = NULL;
+ }
+
+ if (priv->timeout_id > 0) {
+ g_source_remove (priv->timeout_id);
+ priv->timeout_id = 0;
+ }
+
+ g_ptr_array_set_size (priv->stores, 0);
+
+ /* Chain up to parent's dispose() method. */
+ G_OBJECT_CLASS (em_subscription_editor_parent_class)->dispose (object);
+}
+
+static void
+subscription_editor_finalize (GObject *object)
+{
+ EMSubscriptionEditorPrivate *priv;
+
+ priv = EM_SUBSCRIPTION_EDITOR_GET_PRIVATE (object);
+
+ g_ptr_array_free (priv->stores, TRUE);
+
+ g_free (priv->search_string);
+
+ /* Chain up to parent's finalize() method. */
+ G_OBJECT_CLASS (em_subscription_editor_parent_class)->finalize (object);
+}
+
+static void
+subscription_editor_realize (GtkWidget *widget)
+{
+ EMSubscriptionEditor *editor;
+ EAccountList *account_list;
+ EIterator *account_iter;
+ GtkComboBox *combo_box;
+ gint initial_index = 0;
+
+ editor = EM_SUBSCRIPTION_EDITOR (widget);
+
+ /* Chain up to parent's realize() method. */
+ GTK_WIDGET_CLASS (em_subscription_editor_parent_class)->realize (widget);
+
+ /* Find accounts to display, and watch for the default account. */
+ account_list = e_get_account_list ();
+ account_iter = e_list_get_iterator (E_LIST (account_list));
+ while (e_iterator_is_valid (account_iter)) {
+ EAccount *account;
+
+ /* XXX EIterator misuses const. */
+ account = (EAccount *) e_iterator_get (account_iter);
+ if (subscription_editor_test_account (editor, account)) {
+ if (account == editor->priv->initial_account)
+ initial_index = editor->priv->stores->len;
+ subscription_editor_add_account (editor, account);
+ }
+ e_iterator_next (account_iter);
+ }
+ g_object_unref (account_iter);
+
+ combo_box = GTK_COMBO_BOX (editor->priv->combo_box);
+ gtk_combo_box_set_active (combo_box, initial_index);
+}
+
+static void
+em_subscription_editor_class_init (EMSubscriptionEditorClass *class)
+{
+ GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+
+ g_type_class_add_private (class, sizeof (EMSubscriptionEditorPrivate));
+
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = subscription_editor_set_property;
+ object_class->get_property = subscription_editor_get_property;
+ object_class->dispose = subscription_editor_dispose;
+ object_class->finalize = subscription_editor_finalize;
+
+ widget_class = GTK_WIDGET_CLASS (class);
+ widget_class->realize = subscription_editor_realize;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_ACCOUNT,
+ g_param_spec_object (
+ "account",
+ NULL,
+ NULL,
+ E_TYPE_ACCOUNT,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SESSION,
+ g_param_spec_object (
+ "session",
+ NULL,
+ NULL,
+ CAMEL_TYPE_SESSION,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+em_subscription_editor_init (EMSubscriptionEditor *editor)
+{
+ GtkWidget *container;
+ GtkWidget *widget;
+ GtkWidget *box;
+ const gchar *tooltip;
+
+ editor->priv = EM_SUBSCRIPTION_EDITOR_GET_PRIVATE (editor);
+ editor->priv->stores = g_ptr_array_new_with_free_func (
+ (GDestroyNotify) store_data_free);
+
+ gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
+ gtk_window_set_title (GTK_WINDOW (editor), _("Folder Subscriptions"));
+
+ gconf_bridge_bind_window_size (
+ gconf_bridge_get (),
+ "/apps/evolution/mail/subscription_editor",
+ GTK_WINDOW (editor));
+
+ gtk_dialog_add_button (
+ GTK_DIALOG (editor),
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+
+ container = gtk_dialog_get_content_area (GTK_DIALOG (editor));
+
+ widget = gtk_vbox_new (FALSE, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
+ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+ gtk_widget_show (widget);
+
+ container = box = widget;
+
+ widget = gtk_table_new (2, 3, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (widget), 6);
+ gtk_table_set_row_spacings (GTK_TABLE (widget), 6);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ gtk_widget_show (widget);
+
+ container = widget;
+
+ widget = gtk_combo_box_new_text ();
+ gtk_table_attach (
+ GTK_TABLE (container), widget,
+ 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ editor->priv->combo_box = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect (
+ widget, "changed",
+ G_CALLBACK (subscription_editor_combo_box_changed_cb), editor);
+
+ widget = gtk_label_new_with_mnemonic (_("_Account:"));
+ gtk_label_set_mnemonic_widget (
+ GTK_LABEL (widget), editor->priv->combo_box);
+ gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
+ gtk_table_attach (
+ GTK_TABLE (container), widget,
+ 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (widget);
+
+ widget = gtk_entry_new ();
+ gtk_entry_set_icon_from_stock (
+ GTK_ENTRY (widget),
+ GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ gtk_entry_set_icon_tooltip_text (
+ GTK_ENTRY (widget),
+ GTK_ENTRY_ICON_SECONDARY, _("Clear Search"));
+ gtk_entry_set_icon_sensitive (
+ GTK_ENTRY (widget),
+ GTK_ENTRY_ICON_SECONDARY, FALSE);
+ gtk_table_attach (
+ GTK_TABLE (container), widget,
+ 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ editor->priv->entry = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect (
+ widget, "changed",
+ G_CALLBACK (subscription_editor_entry_changed_cb), editor);
+
+ g_signal_connect (
+ widget, "icon-release",
+ G_CALLBACK (subscription_editor_icon_release_cb), editor);
+
+ widget = gtk_label_new_with_mnemonic (_("Sho_w items that contain:"));
+ gtk_label_set_mnemonic_widget (
+ GTK_LABEL (widget), editor->priv->entry);
+ gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
+ gtk_table_attach (
+ GTK_TABLE (container), widget,
+ 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (widget);
+
+ container = box;
+
+ widget = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+ gtk_widget_show (widget);
+
+ container = widget;
+
+ widget = gtk_notebook_new ();
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
+ gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE);
+ gtk_container_add (GTK_CONTAINER (container), widget);
+ editor->priv->notebook = widget;
+ gtk_widget_show (widget);
+
+ e_mutual_binding_new (
+ editor->priv->combo_box, "active",
+ editor->priv->notebook, "page");
+
+ widget = gtk_vbutton_box_new ();
+ gtk_box_set_spacing (GTK_BOX (widget), 6);
+ gtk_button_box_set_layout (
+ GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+ gtk_widget_show (widget);
+
+ container = widget;
+
+ tooltip = _("Subscribe to the selected folder");
+ widget = gtk_button_new_with_mnemonic (_("Su_bscribe"));
+ gtk_widget_set_sensitive (widget, FALSE);
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ editor->priv->subscribe_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_subscribe), editor);
+
+ tooltip = _("Unsubscribe from the selected folder");
+ widget = gtk_button_new_with_mnemonic (_("_Unsubscribe"));
+ gtk_widget_set_sensitive (widget, FALSE);
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ editor->priv->unsubscribe_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_unsubscribe), editor);
+
+ tooltip = _("Collapse all folders");
+ widget = gtk_button_new_with_mnemonic (_("C_ollapse All"));
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ editor->priv->collapse_all_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_collapse_all), editor);
+
+ tooltip = _("Expand all folders");
+ widget = gtk_button_new_with_mnemonic (_("E_xpand All"));
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ editor->priv->expand_all_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_expand_all), editor);
+
+ tooltip = _("Refresh the folder list");
+ widget = gtk_button_new_from_stock (GTK_STOCK_REFRESH);
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ gtk_widget_set_sensitive (widget, FALSE);
+ editor->priv->refresh_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_refresh), editor);
+
+ tooltip = _("Stop the current operation");
+ widget = gtk_button_new_from_stock (GTK_STOCK_STOP);
+ gtk_widget_set_tooltip_text (widget, tooltip);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ gtk_widget_set_sensitive (widget, FALSE);
+ editor->priv->stop_button = widget;
+ gtk_widget_show (widget);
+
+ g_signal_connect_swapped (
+ widget, "clicked",
+ G_CALLBACK (subscription_editor_stop), editor);
+}
+
+GtkWidget *
+em_subscription_editor_new (GtkWindow *parent,
+ CamelSession *session,
+ EAccount *account)
+{
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+ g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
+
+ return g_object_new (
+ EM_TYPE_SUBSCRIPTION_EDITOR,
+ "account", account,
+ "session", session,
+ "transient-for", parent,
+ NULL);
+}
+
+EAccount *
+em_subscription_editor_get_account (EMSubscriptionEditor *editor)
+{
+ g_return_val_if_fail (EM_IS_SUBSCRIPTION_EDITOR (editor), NULL);
+
+ if (editor->priv->active == NULL)
+ return NULL;
+
+ return editor->priv->active->account;
+}
+
+CamelSession *
+em_subscription_editor_get_session (EMSubscriptionEditor *editor)
+{
+ g_return_val_if_fail (EM_IS_SUBSCRIPTION_EDITOR (editor), NULL);
+
+ return editor->priv->session;
+}
diff --git a/mail/em-subscription-editor.h b/mail/em-subscription-editor.h
new file mode 100644
index 0000000..618a617
--- /dev/null
+++ b/mail/em-subscription-editor.h
@@ -0,0 +1,71 @@
+/*
+ * em-subscription-editor.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef EM_SUBSCRIPTION_EDITOR_H
+#define EM_SUBSCRIPTION_EDITOR_H
+
+#include <gtk/gtk.h>
+#include <camel/camel.h>
+#include <libedataserver/e-account.h>
+
+/* Standard GObject macros */
+#define EM_TYPE_SUBSCRIPTION_EDITOR \
+ (em_subscription_editor_get_type ())
+#define EM_SUBSCRIPTION_EDITOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditor))
+#define EM_SUBSCRIPTION_EDITOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorClass))
+#define EM_IS_SUBSCRIPTION_EDITOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), EM_TYPE_SUBSCRIPTION_EDITOR))
+#define EM_IS_SUBSCRIPTION_EDITOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), EM_TYPE_SUBSCRIPTION_EDITOR))
+#define EM_IS_SUBSCRIPTION_EDITOR_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EMSubscriptionEditor EMSubscriptionEditor;
+typedef struct _EMSubscriptionEditorClass EMSubscriptionEditorClass;
+typedef struct _EMSubscriptionEditorPrivate EMSubscriptionEditorPrivate;
+
+struct _EMSubscriptionEditor {
+ GtkDialog parent;
+ EMSubscriptionEditorPrivate *priv;
+};
+
+struct _EMSubscriptionEditorClass {
+ GtkDialogClass parent_class;
+};
+
+GType em_subscription_editor_get_type (void);
+GtkWidget * em_subscription_editor_new (GtkWindow *parent,
+ CamelSession *session,
+ EAccount *account);
+EAccount * em_subscription_editor_get_account
+ (EMSubscriptionEditor *editor);
+CamelSession * em_subscription_editor_get_session
+ (EMSubscriptionEditor *editor);
+
+G_END_DECLS
+
+#endif /* EM_SUBSCRIPTION_EDITOR_H */
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 2cc0fb0..737dcfa 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -871,26 +871,48 @@
<!-- Subscribe dialog -->
<schema>
- <key>/schemas/apps/evolution/mail/subscribe_window/width</key>
- <applyto>/apps/evolution/mail/subscribe_window/width</applyto>
+ <key>/schemas/apps/evolution/mail/subscription_editor_height</key>
+ <applyto>/apps/evolution/mail/subscription_editor_height</applyto>
<owner>evolution-mail</owner>
<type>int</type>
- <default>600</default>
+ <default>400</default>
<locale name="C">
- <short>Subscribe dialog default width</short>
- <long>Default width of the subscribe dialog.</long>
+ <short>"Folder Subscriptions" window height</short>
+ <long>
+ Initial height of the "Folder Subscriptions" window.
+ The value updates as the user resizes the window vertically.
+ </long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/evolution/mail/subscribe_window/height</key>
- <applyto>/apps/evolution/mail/subscribe_window/height</applyto>
+ <key>/schemas/apps/evolution/mail/subscription_editor_maximized</key>
+ <applyto>/apps/evolution/mail/subscription_editor_maximized</applyto>
+ <type>bool</type>
+ <locale name="C">
+ <short>"Folder Subscriptions" window maximize state</short>
+ <long>
+ Initial maximize state of the "Folder Subscriptions" window.
+ The value updates when the user maximizes or unmaximizes the
+ window. Note, this particular value is not used by Evolution
+ since the "Folder Subscriptions" window cannot be maximized.
+ This key exists only as an implementation detail.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/evolution/mail/subscription_editor_width</key>
+ <applyto>/apps/evolution/mail/subscription_editor_width</applyto>
<owner>evolution-mail</owner>
<type>int</type>
- <default>400</default>
+ <default>600</default>
<locale name="C">
- <short>Subscribe dialog default height</short>
- <long>Default height of the subscribe dialog.</long>
+ <short>"Folder Subscriptions" window width</short>
+ <long>
+ Initial width of the "Folder Subscriptions" window.
+ The value updates as the user resizes the window horizontally.
+ </long>
</locale>
</schema>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index fa7eda0..82e9928 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -1,320 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkDialog" id="message_security_dialog">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Security Information</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="vfolder_source_frame">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkVBox" id="vbox161">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="frame5">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label464">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Digital Signature</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox170">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label465">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkVBox" id="signature_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="frame6">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label477">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Encryption</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox171">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label478">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkVBox" id="encryption_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search Folder Sources</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="-5">okbutton1</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="subscribe_dialog">
- <property name="title" translatable="yes">Folder Subscriptions</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <child>
+ <object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkTable" id="top_items_table">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">S_erver:</property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="store_combobox">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkProgressBar" id="progress_bar">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="filterlabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">S_how only items containing:</property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="filter_entry">
- <property name="visible">True</property>
- <property name="secondary_icon_stock">gtk-clear</property>
- <property name="secondary_icon_activatable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="tree_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label"> </property>
</object>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <child>
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="expand_button">
- <property name="label" translatable="yes">E_xpand all</property>
+ <object class="GtkRadioButton" id="local_rb">
+ <property name="label" translatable="yes">All local folders</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -323,13 +55,14 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="collapse_button">
- <property name="label" translatable="yes">Collapse _all</property>
+ <object class="GtkRadioButton" id="remote_rb">
+ <property name="label" translatable="yes">All active remote folders</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">local_rb</property>
</object>
<packing>
<property name="expand">False</property>
@@ -338,13 +71,14 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="refresh_button">
- <property name="label">gtk-refresh</property>
+ <object class="GtkRadioButton" id="local_and_remote_rb">
+ <property name="label" translatable="yes">All local and active remote folders</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">local_rb</property>
</object>
<packing>
<property name="expand">False</property>
@@ -353,13 +87,14 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
+ <object class="GtkRadioButton" id="specific_rb">
+ <property name="label" translatable="yes">Specific folders</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">local_rb</property>
</object>
<packing>
<property name="expand">False</property>
@@ -367,116 +102,57 @@
<property name="position">3</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">refresh_button</action-widget>
- <action-widget response="-7">close_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="license_dialog">
- <property name="title" translatable="yes">License Agreement</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="license_top_label">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <object class="GtkScrolledWindow" id="lic_scrolledwindow">
+ <object class="GtkHBox" id="source_selector">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTextView" id="license_textview">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <object class="GtkScrolledWindow" id="source_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="source_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">source_model</property>
+ <property name="headers_visible">False</property>
+ <child>
+ <object class="GtkTreeViewColumn" id="source_column">
+ <property name="title">column</property>
+ <child>
+ <object class="GtkCellRendererText" id="source_renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="license_checkbutton">
- <property name="label" translatable="yes">_Tick this to accept the license agreement</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="lic_no_button">
- <property name="label">gtk-no</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="lic_yes_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="spacing">1</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkButton" id="source_add">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
- <property name="stock">gtk-yes</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -485,10 +161,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkButton" id="source_remove">
+ <property name="label">gtk-remove</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">_Accept License</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -497,80 +176,38 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="-6">lic_no_button</action-widget>
- <action-widget response="-3">lic_yes_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkListStore" id="source_model">
- <columns>
- <!-- column-name Translated -->
- <column type="gchararray"/>
- <!-- column-name Raw -->
- <column type="gpointer"/>
- </columns>
- </object>
- <object class="GtkListStore" id="combo_model">
- <columns>
- <!-- column-name Flag -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Call</col>
- </row>
- <row>
- <col id="0" translatable="yes">Do Not Forward</col>
- </row>
- <row>
- <col id="0" translatable="yes">Follow-Up</col>
- </row>
- <row>
- <col id="0" translatable="yes">For Your Information</col>
- </row>
- <row>
- <col id="0" translatable="yes">Forward</col>
- </row>
- <row>
- <col id="0" translatable="yes">No Response Necessary</col>
- </row>
- <row>
- <col id="0" translatable="yes" comments="Past tense, as in "has been read".">Read</col>
- </row>
- <row>
- <col id="0" translatable="yes">Reply</col>
- </row>
- <row>
- <col id="0" translatable="yes">Reply to All</col>
- </row>
- <row>
- <col id="0" translatable="yes">Review</col>
- </row>
- </data>
</object>
<object class="GtkVBox" id="toplevel">
<property name="visible">True</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox2">
@@ -676,19 +313,6 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
<child>
- <object class="EDateEdit" id="target_date">
- <property name="allow-no-date-set">True</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="completed">
<property name="label" translatable="yes">Co_mpleted</property>
<property name="visible">True</property>
@@ -735,53 +359,64 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
</object>
- <object class="GtkVBox" id="vfolder_source_frame">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Search Folder Sources</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox9">
+ <object class="GtkListStore" id="combo_model">
+ <columns>
+ <!-- column-name Flag -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Call</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Do Not Forward</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Follow-Up</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">For Your Information</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Forward</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">No Response Necessary</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes" comments="Past tense, as in "has been read".">Read</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Reply</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Reply to All</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Review</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="source_model">
+ <columns>
+ <!-- column-name Translated -->
+ <column type="gchararray"/>
+ <!-- column-name Raw -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkDialog" id="license_dialog">
+ <property name="title" translatable="yes">License Agreement</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog_vbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="label" translatable="no"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="local_rb">
- <property name="label" translatable="yes">All local folders</property>
+ <object class="GtkLabel" id="license_top_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -790,30 +425,30 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="remote_rb">
- <property name="label" translatable="yes">All active remote folders</property>
+ <object class="GtkScrolledWindow" id="lic_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">local_rb</property>
+ <child>
+ <object class="GtkTextView" id="license_textview">
+ <property name="width_request">500</property>
+ <property name="height_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="local_and_remote_rb">
- <property name="label" translatable="yes">All local and active remote folders</property>
+ <object class="GtkCheckButton" id="license_checkbutton">
+ <property name="label" translatable="yes">_Tick this to accept the license agreement</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">local_rb</property>
</object>
<packing>
<property name="expand">False</property>
@@ -821,75 +456,49 @@ Please select a follow up action from the "Flag" menu.</property>
<property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area4">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkRadioButton" id="specific_rb">
- <property name="label" translatable="yes">Specific folders</property>
+ <object class="GtkButton" id="lic_no_button">
+ <property name="label">gtk-no</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">local_rb</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="source_selector">
+ <object class="GtkButton" id="lic_yes_button">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkScrolledWindow" id="source_scrolled_window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="source_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="model">source_model</property>
- <property name="headers_visible">False</property>
- <child>
- <object class="GtkTreeViewColumn" id="source_column">
- <property name="title">column</property>
- <child>
- <object class="GtkCellRendererText" id="source_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkVButtonBox" id="vbuttonbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkButton" id="source_add">
- <property name="label">gtk-add</property>
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="stock">gtk-yes</property>
</object>
<packing>
<property name="expand">False</property>
@@ -898,13 +507,10 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="source_remove">
- <property name="label">gtk-remove</property>
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">_Accept License</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -913,22 +519,167 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
</object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">lic_no_button</action-widget>
+ <action-widget response="-3">lic_yes_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="message_security_dialog">
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Security Information</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox161">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="frame5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label464">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Digital Signature</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox170">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label465">
+ <property name="visible">True</property>
+ <property name="xpad">12</property>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkTable" id="table10">
+ <property name="visible">True</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="signature_vbox">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="frame6">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label477">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Encryption</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox171">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label478">
+ <property name="visible">True</property>
+ <property name="xpad">12</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table11">
+ <property name="visible">True</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="encryption_vbox">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -936,10 +687,36 @@ Please select a follow up action from the "Flag" menu.</property>
<property name="position">1</property>
</packing>
</child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
+ <action-widgets>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index da8b0d7..b521dc3 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -833,18 +833,30 @@ static void
action_mail_tools_subscriptions_cb (GtkAction *action,
EMailShellView *mail_shell_view)
{
+ EMailShellSidebar *mail_shell_sidebar;
EShellWindow *shell_window;
EShellView *shell_view;
+ EMFolderTree *folder_tree;
+ EAccount *account = NULL;
GtkWidget *dialog;
+ gchar *uri;
shell_view = E_SHELL_VIEW (mail_shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
- dialog = em_subscribe_editor_new ();
- gtk_window_set_transient_for (
- GTK_WINDOW (dialog), GTK_WINDOW (shell_window));
+ mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar;
+ folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
+
+ uri = em_folder_tree_get_selected_uri (folder_tree);
+ if (uri != NULL) {
+ account = mail_config_get_account_by_source_url (uri);
+ g_free (uri);
+ }
+
+ dialog = em_subscription_editor_new (
+ GTK_WINDOW (shell_window), session, account);
gtk_dialog_run (GTK_DIALOG (dialog));
- /* XXX Dialog destroys itself. */
+ gtk_widget_destroy (dialog);
}
static void
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 9fbfadd..816fcef 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -50,7 +50,7 @@
#include "em-folder-selector.h"
#include "em-folder-utils.h"
#include "em-search-context.h"
-#include "em-subscribe-editor.h"
+#include "em-subscription-editor.h"
#include "em-utils.h"
#include "mail-autofilter.h"
#include "mail-config.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
