#include <widgets/modest-main-window.h>
#include <widgets/modest-msg-view-window.h>
#include <widgets/modest-account-view-window.h>
-#include <widgets/modest-msg-view-details-dialog.h>
+#include <widgets/modest-details-dialog.h>
#include "modest-account-mgr-helpers.h"
#include "modest-mail-operation.h"
+#include "modest-text-utils.h"
#ifdef MODEST_HAVE_EASYSETUP
#include "easysetup/modest-easysetup-wizard.h"
static void get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err,
gpointer user_data);
static void reply_forward (ReplyForwardAction action, ModestWindow *win);
-static void modest_ui_actions_message_details_cb (gpointer msg_data,
- gpointer helper_data);
+
static gchar* ask_for_folder_name (GtkWindow *parent_window, const gchar *title);
gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(about),
_("a modest e-mail client\n\n"
"design and implementation: Dirk-Jan C. Binnema\n"
- "contributions from the fine people at KernelConcepts and Igalia\n"
+ "contributions from the fine people at KC and Ig\n"
"uses the tinymail email framework written by Philip van Hoof"));
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
}
}
+void
+modest_ui_actions_on_sort (GtkAction *action,
+ ModestWindow *window)
+{
+ ModestWindowMgr *mgr;
+
+ g_return_if_fail (MODEST_IS_WINDOW(window));
+
+ /* Show sorting dialog */
+ mgr = modest_runtime_get_window_mgr ();
+
+}
+
static gboolean
action_send (const gchar* account_name)
g_return_val_if_fail (account_name, FALSE);
+ /* Get the transport account according to the open connection,
+ * because the account might specify connection-specific SMTP servers.
+ */
tny_account =
- modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
- account_name,
- TNY_ACCOUNT_TYPE_TRANSPORT);
+ modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
+ account_name);
if (!tny_account) {
g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
return FALSE;
}
+
send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
if (!send_queue) {
g_object_unref (G_OBJECT(tny_account));
}
/* Create the mail operation */
+ /* TODO: The spec wants us to first do any pending deletions, before receiving. */
mail_op = modest_mail_operation_new ();
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
return TRUE;
}
+/** Check that an appropriate connection is open.
+ */
+gboolean check_for_connection (const gchar *account_name)
+{
+ TnyDevice *device = modest_runtime_get_device ();
+/*
+ g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+
+ TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
+*/
+
+ if (tny_device_is_online (device))
+ return TRUE;
+ else {
+ modest_platform_connect_and_wait (NULL);
+
+ /* TODO: Wait until a result. */
+ return TRUE;
+ }
+}
void
modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
gchar *account_name;
- g_message ("online? %s",
+ g_message ("%s: online? %s", __FUNCTION__,
tny_device_is_online(modest_runtime_get_device()) ? "yes":"no");
-
+
+ /* As per the UI spec, only the active account should be affected,
+ * else the default folder if there is no active account: */
account_name =
g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
if (!account_name)
account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
if (!account_name) {
- g_printerr ("modest: cannot get account\n");
+ g_printerr ("modest: cannot get default account\n");
return;
}
+
+ /* Do not continue if no suitable connection is open: */
+ if (!check_for_connection (account_name))
+ return;
- if (!action_send(account_name))
- g_printerr ("modest: failed to send\n");
+ /* As per the UI spec,
+ * for POP accounts, we should receive,
+ * for IMAP we should synchronize everything, including receiving,
+ * for SMTP we should send,
+ * first receiving, then sending:
+ */
if (!action_receive(account_name))
g_printerr ("modest: failed to receive\n");
+ if (!action_send(account_name))
+ g_printerr ("modest: failed to send\n");
+
}
modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
if (selected) {
- modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
+ modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
TNY_FOLDER (folder_store));
modest_widget_memory_restore (conf, G_OBJECT(header_view),
"header-view");
} else if (TNY_IS_ACCOUNT (folder_store)) {
modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
-
-/* if (selected) { */
-
-/* } else { */
-/* /\* TODO *\/ */
-/* } */
}
}
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-// tny_device_force_online (modest_runtime_get_device());
+// modest_platform_connect_and_wait ();;
}
}
gtk_widget_destroy (dialog);
return;
}
transport_account =
- TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
(modest_runtime_get_account_store(),
- account_name,
- TNY_ACCOUNT_TYPE_TRANSPORT));
+ account_name));
if (!transport_account) {
g_printerr ("modest: no transport account found for '%s'\n", account_name);
g_free (account_name);
parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
if (parent_folder) {
- gchar *folder_name;
-
- folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
- _("Please enter a name for the new folder"));
-
- if (folder_name != NULL && strlen (folder_name) > 0) {
- TnyFolder *new_folder;
- ModestMailOperation *mail_op;
-
- mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- new_folder = modest_mail_operation_create_folder (mail_op,
- parent_folder,
- (const gchar *) folder_name);
- if (new_folder)
- g_object_unref (new_folder);
- g_object_unref (mail_op);
+ gboolean finished = FALSE;
+ gint result;
+ gchar *folder_name = NULL, *suggested_name = NULL;
+
+ /* Run the new folder dialog */
+ while (!finished) {
+ result = modest_platform_run_new_folder_dialog (GTK_WINDOW (main_window),
+ parent_folder,
+ suggested_name,
+ &folder_name);
+
+ if (result == GTK_RESPONSE_REJECT) {
+ finished = TRUE;
+ } else {
+ ModestMailOperation *mail_op = modest_mail_operation_new ();
+ TnyFolder *new_folder = NULL;
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ new_folder = modest_mail_operation_create_folder (mail_op,
+ parent_folder,
+ (const gchar *) folder_name);
+ if (new_folder) {
+ g_object_unref (new_folder);
+ finished = TRUE;
+ }
+/* else { */
+/* /\* TODO: check error and follow proper actions *\/ */
+/* /\* suggested_name = X; *\/ */
+/* /\* Show error to the user *\/ */
+/* modest_platform_run_information_dialog (GTK_WINDOW (main_window), */
+/* MODEST_INFORMATION_CREATE_FOLDER); */
+/* } */
+ g_object_unref (mail_op);
+ }
g_free (folder_name);
+ folder_name = NULL;
}
+
g_object_unref (parent_folder);
}
}
delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
{
TnyFolderStore *folder;
- ModestMailOperation *mail_op;
GtkWidget *folder_view;
+ gint response;
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
return;
folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
- mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
- modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
- g_object_unref (G_OBJECT (mail_op));
+ /* Ask the user */
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (main_window),
+ MODEST_CONFIRMATION_DELETE_FOLDER,
+ folder);
+
+ if (response == GTK_RESPONSE_OK) {
+ ModestMailOperation *mail_op = modest_mail_operation_new ();
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+ modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
+
+ /* Show error if happened */
+ if (modest_mail_operation_get_error (mail_op))
+ modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+ MODEST_INFORMATION_DELETE_FOLDER);
+
+ g_object_unref (G_OBJECT (mail_op));
+ }
+
g_object_unref (G_OBJECT (folder));
}
gtk_window_present (GTK_WINDOW (window));
}
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
static void
-modest_ui_actions_message_details_cb (gpointer msg_data,
- gpointer helper_data)
+show_header_details (TnyHeader *header,
+ GtkWindow *window)
{
GtkWidget *dialog;
- TnyMsg *msg = (TnyMsg *) msg_data;
- TnyHeader *header;
- GetMsgAsyncHelper *helper = (GetMsgAsyncHelper *) helper_data;
-
- header = tny_msg_get_header (msg);
- dialog = modest_msg_view_details_dialog_new (GTK_WINDOW (helper->window), header);
- g_object_unref (header);
+ /* Create dialog */
+ dialog = modest_details_dialog_new_with_header (window, header);
+
+ /* Run dialog */
gtk_widget_show_all (dialog);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+}
+
+/*
+ * Show the folder details in a ModestDetailsDialog widget
+ */
+static void
+show_folder_details (TnyFolder *folder,
+ GtkWindow *window)
+{
+ GtkWidget *dialog;
+
+ /* Create dialog */
+ dialog = modest_details_dialog_new_with_folder (window, folder);
+
+ /* Run dialog */
+ gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
+
void
-modest_ui_actions_on_message_details (GtkAction *action,
- ModestWindow *win)
+modest_ui_actions_on_details (GtkAction *action,
+ ModestWindow *win)
{
TnyList * headers_list;
- GetMsgAsyncHelper *helper;
-
- headers_list = get_selected_headers (win);
- if (!headers_list)
- return;
-
- helper = g_slice_new0 (GetMsgAsyncHelper);
- helper->window = win;
- helper->func = modest_ui_actions_message_details_cb;
- helper->iter = tny_list_create_iterator (headers_list);
- helper->user_data = NULL;
+ TnyIterator *iter;
+ TnyHeader *header;
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
TnyMsg *msg;
msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
- if (!msg)
+ if (!msg) {
return;
- else {
- modest_ui_actions_message_details_cb (msg, helper);
+ } else {
+ headers_list = get_selected_headers (win);
+ if (!headers_list)
+ return;
+
+ iter = tny_list_create_iterator (headers_list);
+
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ show_header_details (header, GTK_WINDOW (win));
+ g_object_unref (header);
+
+ g_object_unref (iter);
+ }
+ } else if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *folder_view, *header_view;
+
+ /* Check which widget has the focus */
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (gtk_widget_is_focus (folder_view)) {
+ TnyFolder *folder;
+
+ folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ /* Show only when it's a folder */
+ if (!folder || !TNY_IS_FOLDER (folder))
+ return;
+
+ show_folder_details (folder, GTK_WINDOW (win));
+
+ } else {
+ header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_HEADER_VIEW);
+ if (!gtk_widget_is_focus (header_view))
+ return;
+
+ headers_list = get_selected_headers (win);
+ if (!headers_list)
+ return;
+
+ iter = tny_list_create_iterator (headers_list);
+ while (!tny_iterator_is_done (iter)) {
+
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ show_header_details (header, GTK_WINDOW (win));
+ g_object_unref (header);
+
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
}
- } else {
- /* here we should add an implementation to run the message details dialog
- from the main window */
- g_return_if_reached ();
}
}
the focus. This callback could be called even if the folder
view has not the focus, because the handled signal could be
emitted when the folder view is redrawn */
- if (GTK_WIDGET_HAS_FOCUS (folder_view)) {
+ if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
if (display_name)
gtk_window_set_title (window, display_name);
else
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
modest_msg_edit_window_select_contacts (window);
}
+
+
+void
+modest_ui_actions_on_move_to (GtkAction *action,
+ ModestWindow *win)
+{
+ GtkWidget *dialog, *scroll, *folder_view, *tree_view;
+ gint result;
+
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
+
+ dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
+ GTK_WINDOW (win),
+ GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ NULL);
+
+ /* Create scrolled window */
+ scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+
+ /* Create folder view */
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ tree_view = modest_folder_view_new (NULL);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+ gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
+
+ gtk_container_add (GTK_CONTAINER (scroll), tree_view);
+
+ /* Add scroll to dialog */
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ scroll, FALSE, FALSE, 0);
+
+ gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+
+ result = gtk_dialog_run (GTK_DIALOG(dialog));
+ if (result == GTK_RESPONSE_ACCEPT) {
+ TnyFolderStore *folder_store;
+ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
+ if (TNY_IS_ACCOUNT (folder_store)) {
+ } else {
+ ModestMailOperation *mail_op;
+
+ /* Create mail operation */
+ mail_op = modest_mail_operation_new ();
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ /* Get folder or messages to transfer */
+ if (gtk_widget_is_focus (folder_view)) {
+ TnyFolderStore *src_folder;
+ src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (TNY_IS_FOLDER (src_folder))
+ modest_mail_operation_xfer_folder (mail_op,
+ TNY_FOLDER (src_folder),
+ folder_store,
+ TRUE);
+
+ /* Frees */
+ g_object_unref (G_OBJECT (src_folder));
+ } else {
+ }
+ g_object_unref (G_OBJECT (mail_op));
+ }
+ g_object_unref (folder_store);
+ }
+
+ gtk_widget_destroy (dialog);
+}
projects / modest / blobdiff