X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=8bf47cc49f68b888332ca780266def4e60d584b3;hp=f2661972da70aaebe8f7c1f35b37c4bb77f5479c;hb=d113e366426368f815589e3e641e9089a52f4798;hpb=a520f3c91ffa0a3a374058776474f6f0a4aa7fa6 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index f266197..8bf47cc 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -39,10 +39,12 @@ #include "modest-widget-memory.h" #include #include +#include #include #include #include #include +#include #include #include #include @@ -63,8 +65,10 @@ #include #include "hildon2/modest-hildon2-details-dialog.h" #include "hildon2/modest-hildon2-window-mgr.h" +#ifdef MODEST_USE_PROFILE #include #include +#endif #include #include #include "modest-header-window.h" @@ -74,6 +78,7 @@ #include #include #include +#include #ifdef MODEST_HAVE_MCE #include @@ -92,16 +97,23 @@ #define URI_ACTION_COPY "copy:" #define MODEST_NOTIFICATION_CATEGORY "email-message" #define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail" +#ifdef MODEST_USE_PROFILE #define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE #define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME +#else +#define MAIL_TONE "message-new-email" +#endif #define COMMON_FOLDER_DIALOG_ENTRY "entry" #define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker" #define FOLDER_PICKER_CURRENT_FOLDER "current-folder" +#define FOLDER_PICKER_ORIGINAL_ACCOUNT "original-account" #define MODEST_ALARMD_APPID PACKAGE_NAME +static ca_context *ca_con = NULL; -static void _modest_platform_play_email_tone (void); + +static void modest_platform_play_email_tone (void); static void @@ -125,15 +137,22 @@ on_modest_conf_update_interval_changed (ModestConf* self, static gboolean check_required_files (void) { - FILE *mcc_file = modest_maemo_open_mcc_mapping_file (); + FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL); if (!mcc_file) { - g_printerr ("modest: check for mcc file failed\n"); + g_printerr ("modest: check for mcc file (for LANG) failed\n"); + return FALSE; + } else + fclose (mcc_file); + + mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL); + if (!mcc_file) { + g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n"); return FALSE; } else fclose (mcc_file); if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 && - access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) { + access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) { g_printerr ("modest: cannot find providers data\n"); return FALSE; } @@ -147,23 +166,16 @@ gboolean modest_platform_init (int argc, char *argv[]) { osso_context_t *osso_context; - osso_hw_state_t hw_state = { 0 }; - DBusConnection *con; + DBusConnection *con; GSList *acc_names; - + if (!check_required_files ()) { g_printerr ("modest: missing required files\n"); return FALSE; } - - osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION, - FALSE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; - } - modest_maemo_utils_set_osso_context (osso_context); + + osso_context = modest_maemo_utils_get_osso_context(); if ((con = osso_get_dbus_connection (osso_context)) == NULL) { g_printerr ("modest: could not get dbus connection\n"); @@ -358,7 +370,7 @@ modest_platform_activate_uri (const gchar *uri) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL, _("mcen_ib_unsupported_link")); - g_warning ("%s: cannot open uri '%s'", __FUNCTION__,uri); + g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri); } return result; @@ -523,7 +535,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size) GTK_ICON_LOOKUP_NO_SVG, &err); if (!pixbuf) { - g_printerr ("modest: error loading theme icon '%s': %s\n", + g_warning ("Error loading theme icon '%s': %s\n", name, err->message); g_error_free (err); } @@ -623,27 +635,23 @@ on_response (GtkDialog *dialog, if (response != GTK_RESPONSE_ACCEPT) return; - + /* Get entry */ entry = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ENTRY); picker = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ACCOUNT_PICKER); - + parent = TNY_FOLDER_STORE (user_data); new_name = gtk_entry_get_text (GTK_ENTRY (entry)); exists = FALSE; - - if (picker != NULL) { + if (picker != NULL) parent = g_object_get_data (G_OBJECT (picker), FOLDER_PICKER_CURRENT_FOLDER); - } /* Look for another folder with the same name */ - if (modest_tny_folder_has_subfolder_with_name (parent, - new_name, - TRUE)) { + if (!TNY_IS_MERGE_FOLDER (parent) && + modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE)) exists = TRUE; - } - + if (!exists) { if (TNY_IS_ACCOUNT (parent) && modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent)) && @@ -652,9 +660,8 @@ on_response (GtkDialog *dialog, exists = TRUE; } } - + if (exists) { - /* Show an error */ hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), NULL, _CS("ckdg_ib_folder_already_exists")); @@ -664,7 +671,6 @@ on_response (GtkDialog *dialog, /* Do not close the dialog */ g_signal_stop_emission_by_name (dialog, "response"); } - } typedef struct _FolderChooserData { @@ -682,7 +688,9 @@ folder_chooser_activated (ModestFolderView *folder_view, } static TnyFolderStore * -folder_chooser_dialog_run (ModestFolderView *original) +folder_chooser_dialog_run (ModestFolderView *original, + TnyFolderStore *current, + GtkButton *picker) { GtkWidget *folder_view; FolderChooserData userdata = {NULL, NULL}; @@ -695,11 +703,34 @@ folder_chooser_dialog_run (ModestFolderView *original) gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder")); - modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), + modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), MODEST_FOLDER_VIEW (folder_view)); - visible_id = - modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)); + if (TNY_IS_ACCOUNT (current)) { + /* Local folders and MMC account are always shown + along with the currently visible server account */ + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (current)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (current))) + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); + else + visible_id = tny_account_get_id (TNY_ACCOUNT (current)); + } else if (TNY_IS_FOLDER (current)) { + TnyAccount *account; + account = modest_tny_folder_get_account ((TnyFolder *) current); + if (account) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) { + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); + } else { + visible_id = tny_account_get_id (account); + } + g_object_unref (account); + } + } else { + visible_id = + modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)); + } + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view), visible_id); @@ -759,6 +790,61 @@ folder_store_get_display_name (TnyFolderStore *store) } } +GtkWidget * +get_image_for_folder_store (TnyFolderStore *store, + gint size) +{ + GdkPixbuf *pixbuf; + const gchar *icon_name = NULL; + GtkWidget *image = NULL; + + if (TNY_IS_ACCOUNT (store)) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store))) + icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS; + else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store))) + icon_name = MODEST_FOLDER_ICON_MMC; + else + icon_name = MODEST_FOLDER_ICON_ACCOUNT; + } else { + TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store)); + if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) { + switch (type) { + case TNY_FOLDER_TYPE_INBOX: + icon_name = MODEST_FOLDER_ICON_INBOX; + break; + default: + icon_name = MODEST_FOLDER_ICON_REMOTE_FOLDER; + } + } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) { + switch (type) { + case TNY_FOLDER_TYPE_OUTBOX: + icon_name = MODEST_FOLDER_ICON_OUTBOX; + break; + case TNY_FOLDER_TYPE_DRAFTS: + icon_name = MODEST_FOLDER_ICON_DRAFTS; + break; + case TNY_FOLDER_TYPE_SENT: + icon_name = MODEST_FOLDER_ICON_SENT; + break; + default: + icon_name = MODEST_FOLDER_ICON_NORMAL; + } + } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) { + icon_name = MODEST_FOLDER_ICON_MMC_FOLDER; + } + } + + /* Set icon */ + pixbuf = modest_platform_get_icon (icon_name, size); + + if (pixbuf) { + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + } + + return image; +} + static void folder_picker_set_store (GtkButton *button, TnyFolderStore *store) { @@ -767,67 +853,101 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store) if (store == NULL) { g_object_set_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, NULL); } else { - GdkPixbuf *pixbuf; - const gchar *icon_name = NULL; + GtkWidget *image; - g_object_ref (store); - g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, - store, (GDestroyNotify) g_object_unref); + g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, + g_object_ref (store), + (GDestroyNotify) g_object_unref); name = folder_store_get_display_name (store); hildon_button_set_value (HILDON_BUTTON (button), name); g_free (name); /* Select icon */ - if (TNY_IS_ACCOUNT (store)) { - if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store))) - icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS; - else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store))) - icon_name = MODEST_FOLDER_ICON_MMC; - else - icon_name = MODEST_FOLDER_ICON_ACCOUNT; - } else { - if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) { - TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store)); - switch (type) { - case TNY_FOLDER_TYPE_INBOX: - icon_name = MODEST_FOLDER_ICON_INBOX; - break; - default: - icon_name = MODEST_FOLDER_ICON_ACCOUNT; - } - } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) - icon_name = MODEST_FOLDER_ICON_NORMAL; - else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) - icon_name = MODEST_FOLDER_ICON_MMC_FOLDER; - } + image = get_image_for_folder_store (store, MODEST_ICON_SIZE_SMALL); + if (image) + hildon_button_set_image (HILDON_BUTTON (button), image); + } +} + +/* Always returns DUPs so you must free the returned value */ +static gchar * +get_next_folder_name (const gchar *suggested_name, + TnyFolderStore *suggested_folder) +{ + const gchar *default_name = _FM("ckdg_va_new_folder_name_stub"); + unsigned int i; + gchar *real_suggested_name; - /* Set icon */ - pixbuf = modest_platform_get_icon (icon_name, MODEST_ICON_SIZE_SMALL); + if (suggested_name !=NULL) { + return g_strdup (suggested_name); + } - if (pixbuf) { - hildon_button_set_image (HILDON_BUTTON (button), - gtk_image_new_from_pixbuf (pixbuf)); - g_object_unref (pixbuf); - } + for(i = 0; i < 100; ++ i) { + gboolean exists = FALSE; + + if (i == 0) + real_suggested_name = g_strdup (default_name); + else + real_suggested_name = g_strdup_printf ("%s(%d)", + _FM("ckdg_va_new_folder_name_stub"), + i); + exists = modest_tny_folder_has_subfolder_with_name (suggested_folder, + real_suggested_name, + TRUE); + + if (!exists) + break; + + g_free (real_suggested_name); } + + /* Didn't find a free number */ + if (i == 100) + real_suggested_name = g_strdup (default_name); + + return real_suggested_name; } +typedef struct { + ModestFolderView *folder_view; + GtkEntry *entry; +} FolderPickerHelper; + static void folder_picker_clicked (GtkButton *button, - ModestFolderView *folder_view) + FolderPickerHelper *helper) { - TnyFolderStore *store; + TnyFolderStore *store, *current; + + current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER); - store = folder_chooser_dialog_run (folder_view); + store = folder_chooser_dialog_run (helper->folder_view, current, button); if (store) { + const gchar *current_name; + gboolean exists = FALSE; + folder_picker_set_store (GTK_BUTTON (button), store); + + /* Update the name of the folder */ + current_name = gtk_entry_get_text (helper->entry); + + if (TNY_IS_FOLDER_STORE (store)) + exists = modest_tny_folder_has_subfolder_with_name (store, + current_name, + TRUE); + if (exists) { + gchar *new_name = get_next_folder_name (NULL, store); + gtk_entry_set_text (helper->entry, new_name); + g_free (new_name); + } } } static GtkWidget * -folder_picker_new (ModestFolderView *folder_view, TnyFolderStore *suggested) +folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper) { GtkWidget *button; + const gchar *acc_id = NULL; button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); @@ -835,10 +955,32 @@ folder_picker_new (ModestFolderView *folder_view, TnyFolderStore *suggested) hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0); if (suggested) { + folder_picker_set_store (GTK_BUTTON (button), suggested); + + if (TNY_IS_ACCOUNT (suggested)) { + if (!modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (suggested)) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (suggested))) + acc_id = tny_account_get_id ((TnyAccount *) suggested); + } else { + TnyAccount *account = modest_tny_folder_get_account ((TnyFolder *) suggested); + if (account) { + acc_id = tny_account_get_id ((TnyAccount *) account); + g_object_unref (account); + } + } } - g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (folder_picker_clicked), folder_view); + if (!acc_id) + acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view)); + + g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT, + g_strdup (acc_id), (GDestroyNotify) g_free); + + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (folder_picker_clicked), + helper); return button; } @@ -864,13 +1006,19 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, ModestFolderView *folder_view; ModestWindow *folder_window; ModestHildon2WindowMgr *window_mgr; + FolderPickerHelper *helper = NULL; + GtkWidget *top_vbox, *top_align; window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr (); folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr); g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE); - + folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window)); - + + top_vbox = gtk_vbox_new (FALSE, 0); + top_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (top_align), 0, 0, MODEST_MARGIN_DOUBLE, 0); + /* Ask the user for the folder name */ dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, @@ -892,9 +1040,9 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5); gtk_size_group_add_widget (sizegroup, label_entry); - + if (suggested_name) - gtk_entry_set_text (GTK_ENTRY (entry), suggested_name); + gtk_entry_set_text (GTK_ENTRY (entry), suggested_name); else gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub")); gtk_entry_set_width_chars (GTK_ENTRY (entry), @@ -902,26 +1050,30 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, g_utf8_strlen (_FM("ckdg_va_new_folder_name_stub"), -1))); gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); } - + if (show_parent) { - + label_location = gtk_label_new (_FM("ckdg_fi_new_folder_location")); gtk_misc_set_alignment (GTK_MISC (label_location), 0.0, 0.5); gtk_size_group_add_widget (sizegroup, label_location); - account_picker = folder_picker_new (folder_view, suggested_parent); + helper = g_slice_new0 (FolderPickerHelper); + helper->folder_view = folder_view; + helper->entry = (GtkEntry *) entry; + + account_picker = folder_picker_new (suggested_parent, helper); } g_object_unref (sizegroup); - + /* Connect to the response method to avoid closing the dialog when an invalid name is selected*/ g_signal_connect (dialog, "response", G_CALLBACK (on_response), suggested_parent); - + if (show_name) { /* Track entry changes */ g_signal_connect (entry, @@ -933,20 +1085,20 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, G_CALLBACK (entry_changed), dialog); } - - + + /* Some locales like pt_BR need this to get the full window title shown */ gtk_widget_set_size_request (GTK_WIDGET (dialog), 300, -1); - + /* Create the hbox */ if (show_name) { hbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start (GTK_BOX (hbox), label_entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - + /* Add hbox to dialog */ - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, 0); g_object_set_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ENTRY, entry); } @@ -957,12 +1109,16 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (hbox), account_picker, TRUE, TRUE, 0); /* Add hbox to dialog */ - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, 0); g_object_set_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ACCOUNT_PICKER, account_picker); } modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), parent_window); + + gtk_container_add (GTK_CONTAINER (top_align), top_vbox); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), top_align, TRUE, TRUE, 0); + gtk_widget_show_all (GTK_WIDGET(dialog)); result = gtk_dialog_run (GTK_DIALOG(dialog)); @@ -978,6 +1134,9 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, gtk_widget_destroy (dialog); + if (helper) + g_slice_free (FolderPickerHelper, helper); + while (gtk_events_pending ()) gtk_main_iteration (); @@ -995,55 +1154,32 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, gint result; ModestTnyAccountStore *acc_store; TnyAccount *account; + gboolean do_free = FALSE; - if(suggested_name == NULL) - { - const gchar *default_name = _FM("ckdg_va_new_folder_name_stub"); - unsigned int i; - - for(i = 0; i < 100; ++ i) { - gboolean exists = FALSE; - - if (i == 0) - real_suggested_name = g_strdup (default_name); - else - real_suggested_name = g_strdup_printf ("%s(%d)", - _FM("ckdg_va_new_folder_name_stub"), - i); - exists = modest_tny_folder_has_subfolder_with_name (suggested_folder, - real_suggested_name, - TRUE); - - if (!exists) - break; - - g_free (real_suggested_name); - } - - /* Didn't find a free number */ - if (i == 100) - real_suggested_name = g_strdup (default_name); - } else { - real_suggested_name = suggested_name; - } + real_suggested_name = get_next_folder_name ((const gchar *) suggested_name, + suggested_folder); /* In hildon 2.2 we always suggest the archive folder as parent */ - acc_store = modest_runtime_get_account_store (); - account = modest_tny_account_store_get_mmc_folders_account (acc_store); - if (account) { - suggested_folder = (TnyFolderStore *) - modest_tny_account_get_special_folder (account, - TNY_FOLDER_TYPE_ARCHIVE); - g_object_unref (account); - account = NULL; + if (!suggested_folder) { + acc_store = modest_runtime_get_account_store (); + account = modest_tny_account_store_get_mmc_folders_account (acc_store); + if (account) { + suggested_folder = (TnyFolderStore *) + modest_tny_account_get_special_folder (account, + TNY_FOLDER_TYPE_ARCHIVE); + g_object_unref (account); + account = NULL; + } } - /* If there is not archive folder then fallback to local folders account */ - if (!suggested_folder) + /* If there is not archive folder then fallback to local folders account */ + if (!suggested_folder) { + do_free = TRUE; suggested_folder = (TnyFolderStore *) modest_tny_account_store_get_local_folders_account (acc_store); + } - result = modest_platform_run_folder_common_dialog (parent_window, + result = modest_platform_run_folder_common_dialog (parent_window, suggested_folder, _HL("ckdg_ti_new_folder"), _FM("ckdg_fi_new_folder_name"), @@ -1053,8 +1189,10 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, folder_name, parent_folder); - if (suggested_name == NULL) - g_free(real_suggested_name); + if (do_free) + g_object_unref (suggested_folder); + + g_free(real_suggested_name); return result; } @@ -1285,13 +1423,11 @@ modest_platform_connect_and_wait (GtkWindow *parent_window, g_mutex_unlock (data->mutex); frees: - if (data) { - if (g_signal_handler_is_connected (account, data->handler)) - g_signal_handler_disconnect (account, data->handler); - g_mutex_free (data->mutex); - g_main_loop_unref (data->wait_loop); - g_slice_free (ConnectAndWaitData, data); - } + if (g_signal_handler_is_connected (account, data->handler)) + g_signal_handler_disconnect (account, data->handler); + g_mutex_free (data->mutex); + g_main_loop_unref (data->wait_loop); + g_slice_free (ConnectAndWaitData, data); conn_status = tny_account_get_connection_status (account); return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE; @@ -1351,14 +1487,23 @@ modest_platform_set_update_interval (guint minutes) ModestConf *conf = modest_runtime_get_conf (); if (!conf) return FALSE; - + + if (minutes > 0) { + GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); + if (!acc_names) { + minutes = 0; + } else { + modest_account_mgr_free_account_names (acc_names); + } + } + cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); /* Delete any existing alarm, * because we will replace it: */ if (alarm_cookie) { if (alarmd_event_del(alarm_cookie) != 0) - g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); + g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); alarm_cookie = 0; modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL); } @@ -1410,7 +1555,7 @@ modest_platform_set_update_interval (guint minutes) if (!alarm_cookie) { /* Error */ - g_debug ("Error setting alarm event. \n"); + g_warning ("Error setting alarm event. \n"); return FALSE; } @@ -1432,7 +1577,7 @@ modest_platform_push_email_notification(void) foreground we don't show anything */ if (!(screen_on && app_in_foreground)) { - _modest_platform_play_email_tone (); + modest_platform_play_email_tone (); /* Activate LED. This must be deactivated by modest_platform_remove_new_mail_notifications */ @@ -1449,108 +1594,118 @@ modest_platform_push_email_notification(void) } } -void -modest_platform_on_new_headers_received (TnyList *header_list, +void +modest_platform_on_new_headers_received (GList *URI_list, gboolean show_visual) { - g_return_if_fail (TNY_IS_LIST(header_list)); + gboolean screen_on, app_in_foreground; - if (tny_list_get_length(header_list) == 0) { - g_warning ("%s: header list is empty", __FUNCTION__); + /* Get the window status */ + app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ()); + screen_on = modest_window_mgr_screen_is_on (modest_runtime_get_window_mgr ()); + + /* If the screen is on and the app is in the + foreground we don't show anything */ + if (screen_on && app_in_foreground) return; - } - if (!show_visual) { - modest_platform_push_email_notification (); - /* We do a return here to avoid indentation with an else */ + if (g_list_length (URI_list) == 0) return; - } #ifdef MODEST_HAVE_HILDON_NOTIFY + /* For any other case issue a notification */ HildonNotification *notification; - TnyIterator *iter; - GSList *notifications_list = NULL; + ModestMsgNotificationData *data; + gint notif_id; + gchar *from; + TnyAccountStore *acc_store; + TnyAccount *account; - /* Get previous notifications ids */ - notifications_list = modest_conf_get_list (modest_runtime_get_conf (), - MODEST_CONF_NOTIFICATION_IDS, - MODEST_CONF_VALUE_INT, NULL); - - iter = tny_list_create_iterator (header_list); - while (!tny_iterator_is_done (iter)) { - gchar *url = NULL, *display_address = NULL; - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - TnyFolder *folder = tny_header_get_folder (header); - gboolean first_notification = TRUE; - gint notif_id; - gchar *str; - - display_address = tny_header_dup_from (header); - /* string is changed in-place */ - modest_text_utils_get_display_address (display_address); - - str = tny_header_dup_subject (header); - notification = hildon_notification_new (display_address, - str, - "qgn_list_messagin", - MODEST_NOTIFICATION_CATEGORY); - g_free (str); - /* Create the message URL */ - str = tny_header_dup_uid (header); - url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), - str); - g_free (str); - - hildon_notification_add_dbus_action(notification, - "default", - "Cancel", - MODEST_DBUS_SERVICE, - MODEST_DBUS_OBJECT, - MODEST_DBUS_IFACE, - MODEST_DBUS_METHOD_OPEN_MESSAGE, - G_TYPE_STRING, url, - -1); - - /* Play sound if the user wants. Show the LED - pattern. Show and play just one */ - if (G_UNLIKELY (first_notification)) { - - first_notification = FALSE; - - /* Set the led pattern */ - notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), - "dialog-type", 4); - notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "led-pattern", - MODEST_NEW_MAIL_LIGHTING_PATTERN); - } + data = (ModestMsgNotificationData *) URI_list->data; + + /* String is changed in-place. There is no need to + actually dup the data->from string but we just do + it in order not to modify the original contents */ + from = g_strdup (data->from); + modest_text_utils_get_display_address (from); + + /* Create notification */ + notification = hildon_notification_new (from, + data->subject, + "qgn_list_messagin", + MODEST_NOTIFICATION_CATEGORY); + g_free (from); + + /* Add DBus action */ + hildon_notification_add_dbus_action(notification, + "default", + "Cancel", + MODEST_DBUS_SERVICE, + MODEST_DBUS_OBJECT, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_OPEN_MESSAGE, + G_TYPE_STRING, data->uri, + -1); + + /* Set the led pattern */ + if (data->time) + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "time", data->time); + + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "dialog-type", 4); + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "led-pattern", + MODEST_NEW_MAIL_LIGHTING_PATTERN); + + /* Make the notification persistent */ + notify_notification_set_hint_byte (NOTIFY_NOTIFICATION (notification), + "persistent", TRUE); + + /* Set the number of new notifications */ + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "amount", g_list_length (URI_list)); + + /* Set the account of the headers */ + acc_store = (TnyAccountStore *) modest_runtime_get_account_store (); + account = tny_account_store_find_account (acc_store, data->uri); + if (account) { + const gchar *acc_name; + acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "email-account", + acc_name); + g_object_unref (account); + } + + /* Play sound */ + modest_platform_play_email_tone (); + if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { + GSList *notifications_list = NULL; - /* Notify. We need to do this in an idle because this function - could be called from a thread */ - notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL); + /* Get previous notifications ids */ + notifications_list = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_NOTIFICATION_IDS, + MODEST_CONF_VALUE_INT, NULL); /* Save id in the list */ - g_object_get(G_OBJECT(notification), "id", ¬if_id, NULL); + g_object_get(G_OBJECT (notification), "id", ¬if_id, NULL); notifications_list = g_slist_prepend (notifications_list, GINT_TO_POINTER(notif_id)); + /* We don't listen for the "closed" signal, because we don't care about if the notification was removed or not to store the list in gconf */ - - /* Free & carry on */ - g_free (display_address); - g_free (url); - g_object_unref (folder); - g_object_unref (header); - tny_iterator_next (iter); - } - g_object_unref (iter); - /* Save the ids */ - modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, - notifications_list, MODEST_CONF_VALUE_INT, NULL); + /* Save the ids */ + modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, + notifications_list, MODEST_CONF_VALUE_INT, NULL); + + g_slist_free (notifications_list); + } else { + g_warning ("Failed to send notification"); + } - g_slist_free (notifications_list); - #endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -1651,23 +1806,24 @@ modest_platform_show_addressbook (GtkWindow *parent_window) } } -GtkWidget * -modest_platform_create_folder_view (TnyFolderStoreQuery *query) +static GtkWidget * +modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do_refresh) { - GtkWidget *widget = modest_folder_view_new (query); + GtkWidget *widget = modest_folder_view_new_full (query, do_refresh); /* Show one account by default */ modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); - /* Restore settings */ - modest_widget_memory_restore (modest_runtime_get_conf(), - G_OBJECT (widget), - MODEST_CONF_FOLDER_VIEW_KEY); - return widget; } +GtkWidget * +modest_platform_create_folder_view (TnyFolderStoreQuery *query) +{ + return modest_platform_create_folder_view_full (query, TRUE); +} + void banner_finish (gpointer data, GObject *object) { @@ -1681,7 +1837,7 @@ modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - GtkWidget *banner, *banner_parent = NULL; + GtkWidget *banner_parent = NULL; ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); if (modest_window_mgr_get_num_windows (mgr) == 0) @@ -1704,8 +1860,23 @@ modest_platform_information_banner (GtkWidget *parent, return; } + modest_platform_system_banner (banner_parent, icon_name, text); +} - banner = hildon_banner_show_information (banner_parent, icon_name, text); +void +modest_platform_system_banner (GtkWidget *parent, + const gchar *icon_name, + const gchar *text) +{ + GtkWidget *banner = NULL; + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + if (parent && GTK_IS_WINDOW (parent)) { + if (!gtk_window_is_active (GTK_WINDOW (parent))) + parent = NULL; + } + + banner = hildon_banner_show_information (parent, icon_name, text); modest_window_mgr_register_banner (mgr); g_object_ref (mgr); @@ -1869,7 +2040,7 @@ on_cert_dialog_response (GtkDialog *dialog, gint response_id, const gchar* cert g_signal_stop_emission_by_name (dialog, "response"); msg = g_strdup_printf (_("mcen_ni_view_unknown_certificate"), cert); - note = hildon_note_new_information (GTK_WINDOW(dialog), msg); + note = hildon_note_new_information (NULL, msg); gtk_dialog_run (GTK_DIALOG(note)); gtk_widget_destroy (note); } @@ -1889,8 +2060,8 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, win = MODEST_WINDOW (hildon_window_stack_peek (stack)); if (!win) { - g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", - __FUNCTION__); + g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", + __FUNCTION__); return FALSE; } @@ -1902,14 +2073,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, example. With GTK_RESPONSE_HELP the view button is aligned to the left while the other two to the right */ note = hildon_note_new_confirmation_add_buttons ( - NULL, + (GtkWindow *) win, question, _HL("wdgt_bd_yes"), GTK_RESPONSE_OK, _HL("wdgt_bd_view"), GTK_RESPONSE_APPLY, /* abusing this... */ _HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL, NULL, NULL); - g_signal_connect (G_OBJECT(note), "response", + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + (GtkWindow *) note, (GtkWindow *) win); + + g_signal_connect (G_OBJECT(note), "response", G_CALLBACK(on_cert_dialog_response), (gpointer) certificate); @@ -1932,8 +2106,8 @@ modest_platform_run_alert_dialog (const gchar* prompt, top_win = MODEST_WINDOW (hildon_window_stack_peek (stack)); if (!top_win) { - g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", - __FUNCTION__); + g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", + __FUNCTION__); return FALSE; } @@ -2203,7 +2377,7 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, account = TNY_ACCOUNT (g_object_ref (folder_store)); } - if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) { + if (account && (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE)) { if (!modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) { /* No need to connect a local account */ if (callback) @@ -2344,17 +2518,93 @@ modest_platform_run_folder_details_dialog (GtkWindow *parent_window, dialog); } +typedef struct _HeaderDetailsGetSizeInfo { + GtkWidget *dialog; + TnyMimePart *part; + guint total; +} HeaderDetailsGetSizeInfo; + +static void +header_details_dialog_destroy (gpointer userdata, + GObject *object) +{ + HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) userdata; + + info->dialog = NULL; +} + +static gboolean +idle_get_mime_part_size_cb (gpointer userdata) +{ + HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) userdata; + gdk_threads_enter (); + + if (info->dialog && GTK_WIDGET_VISIBLE (info->dialog)) { + modest_details_dialog_set_message_size (MODEST_DETAILS_DIALOG (info->dialog), + info->total); + } + + if (info->dialog) { + g_object_weak_unref (G_OBJECT (info->dialog), header_details_dialog_destroy, info); + info->dialog = NULL; + } + g_object_unref (info->part); + g_slice_free (HeaderDetailsGetSizeInfo, info); + + gdk_threads_leave (); + + return FALSE; +} + +static gpointer +get_mime_part_size_thread (gpointer thr_user_data) +{ + HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) thr_user_data; + gssize result = 0; + TnyStream *count_stream; + + count_stream = modest_count_stream_new (); + result = tny_mime_part_decode_to_stream (info->part, count_stream, NULL); + info->total = modest_count_stream_get_count(MODEST_COUNT_STREAM (count_stream)); + if (info->total == 0) { + modest_count_stream_reset_count(MODEST_COUNT_STREAM (count_stream)); + result = tny_mime_part_write_to_stream (info->part, count_stream, NULL); + info->total = modest_count_stream_get_count(MODEST_COUNT_STREAM (count_stream)); + } + + /* if there was an error, don't set the size (this is pretty uncommon) */ + if (result < 0) { + g_warning ("%s: error while writing mime part to stream\n", __FUNCTION__); + } + g_idle_add (idle_get_mime_part_size_cb, info); + + return NULL; +} + void modest_platform_run_header_details_dialog (GtkWindow *parent_window, - TnyHeader *header) + TnyHeader *header, + gboolean async_get_size, + TnyMsg *msg) { GtkWidget *dialog; /* Create dialog */ - dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header); + dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header, !async_get_size); + + if (async_get_size && msg && TNY_IS_MSG (msg)) { + HeaderDetailsGetSizeInfo *info; + info = g_slice_new (HeaderDetailsGetSizeInfo); + info->dialog = dialog; + info->total = 0; + info->part = TNY_MIME_PART (g_object_ref (msg)); + + g_object_weak_ref (G_OBJECT (dialog), header_details_dialog_destroy, info); + g_thread_create (get_mime_part_size_thread, info, FALSE, NULL); + } /* Run dialog */ - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), parent_window); gtk_widget_show_all (dialog); @@ -2371,20 +2621,27 @@ modest_platform_get_osso_context (void) } static void -_modest_platform_play_email_tone (void) +modest_platform_play_email_tone (void) { - gchar *active_profile; gchar *mail_tone; - gchar *mail_volume; gint mail_volume_int; int ret; - ca_context *ca_con = NULL; ca_proplist *pl = NULL; +#ifdef MODEST_USE_PROFILE + gchar *active_profile; + gchar *mail_volume; + active_profile = profile_get_profile (); mail_tone = profile_get_value (active_profile, PROFILE_MAIL_TONE); mail_volume = profile_get_value (active_profile, PROFILE_MAIL_VOLUME); mail_volume_int = profile_parse_int (mail_volume); + g_free (mail_volume); + g_free (active_profile); +#else + mail_tone = MAIL_TONE; + mail_volume_int = 100; +#endif if (mail_tone && !strstr (mail_tone, "/")) { gchar *tmp; @@ -2396,14 +2653,15 @@ _modest_platform_play_email_tone (void) if (mail_volume_int > 0) { - if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) { - g_warning("ca_context_create: %s\n", ca_strerror(ret)); - return; + if (ca_con == NULL) { + if ((ret = ca_context_create (&ca_con)) != CA_SUCCESS) { + g_warning("ca_context_create: %s\n", ca_strerror(ret)); + return; + } } if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) { g_warning("ca_context_open: %s\n", ca_strerror(ret)); - ca_context_destroy(ca_con); return; } @@ -2415,89 +2673,220 @@ _modest_platform_play_email_tone (void) g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret)); ca_proplist_destroy(pl); - ca_context_destroy(ca_con); } - g_free (mail_volume); g_free (mail_tone); - g_free (active_profile); } #define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view" #define MOVE_TO_DIALOG_BACK_BUTTON "back-button" -#define MOVE_TO_DIALOG_SELECTION_LABEL "selection-label" +#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button" #define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders" #define MOVE_TO_DIALOG_PANNABLE "pannable" +#define MOVE_TO_FOLDER_SEPARATOR "/" + +static void +translate_path (gchar **path) +{ + gchar **parts; + gchar **current; + GString *output; + gboolean add_separator; + + parts = g_strsplit (*path, MOVE_TO_FOLDER_SEPARATOR, 0); + g_free (*path); + + current = parts; + output = g_string_new (""); + add_separator = FALSE; + + while (*current != NULL) { + TnyFolderType folder_type; + gchar *downcase; + + if (add_separator) { + output = g_string_append (output, MOVE_TO_FOLDER_SEPARATOR); + } else { + add_separator = TRUE; + } + + downcase = g_ascii_strdown (*current, -1); + folder_type = modest_local_folder_info_get_type (downcase); + if (strcmp (downcase, "inbox") == 0) { + output = g_string_append (output, _("mcen_me_folder_inbox")); + } else if (folder_type == TNY_FOLDER_TYPE_ARCHIVE || + folder_type == TNY_FOLDER_TYPE_DRAFTS || + folder_type == TNY_FOLDER_TYPE_SENT || + folder_type == TNY_FOLDER_TYPE_OUTBOX) { + output = g_string_append (output, modest_local_folder_info_get_type_display_name (folder_type)); + } else { + output = g_string_append (output, *current); + } + g_free (downcase); + + current++; + } + + g_strfreev (parts); + *path = g_string_free (output, FALSE); +} + +static void +move_to_dialog_set_selected_folder_store (GtkWidget *dialog, + TnyFolderStore *folder_store) +{ + GtkWidget *action_button; + GtkWidget *image = NULL; + TnyAccount *account; + gchar *account_name = NULL, *short_name = NULL; + + action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON)); + + /* Get account name */ + if (TNY_IS_FOLDER (folder_store)) + account = tny_folder_get_account (TNY_FOLDER (folder_store)); + else + account = g_object_ref (folder_store); + + if (modest_tny_account_is_virtual_local_folders (account)) + account_name = modest_conf_get_string (modest_runtime_get_conf(), + MODEST_CONF_DEVICE_NAME, NULL); + + if (!account_name) + account_name = g_strdup (tny_account_get_name (account)); + + g_object_unref (account); + + /* Set title of button: account or folder name */ + if (TNY_IS_FOLDER (folder_store)) + short_name = folder_store_get_display_name (folder_store); + else + short_name = g_strdup (account_name); + + hildon_button_set_title (HILDON_BUTTON (action_button), short_name); + + /* Set value of button, folder full name */ + if (TNY_IS_CAMEL_FOLDER (folder_store)) { + const gchar *camel_full_name; + gchar *last_slash, *full_name; + + camel_full_name = tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store)); + last_slash = g_strrstr (camel_full_name, "/"); + if (last_slash) { + gchar *prefix = g_strndup (camel_full_name, last_slash - camel_full_name + 1); + full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR, prefix, short_name, NULL); + g_free (prefix); + } else { + full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR, + short_name, + NULL); + } + translate_path (&full_name); + hildon_button_set_value (HILDON_BUTTON (action_button), full_name); + g_free (full_name); + } + g_free (account_name); + g_free (short_name); + + /* Set image for the button */ + image = get_image_for_folder_store (folder_store, MODEST_ICON_SIZE_BIG); + if (image) + hildon_button_set_image (HILDON_BUTTON (action_button), image); +} static void move_to_dialog_show_accounts (GtkWidget *dialog) { - GtkWidget *selection_label; GtkWidget *back_button; GtkWidget *folder_view; GtkWidget *pannable; + GtkWidget *action_button; - selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL)); back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON)); + action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON)); folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW)); pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE)); - + gtk_widget_set_sensitive (back_button, FALSE); + gtk_widget_set_sensitive (action_button, FALSE); + + /* Need to set this here, otherwise callbacks called because + of filtering won't perform correctly */ + g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE)); - gtk_label_set_text (GTK_LABEL (selection_label), ""); + /* Reset action button */ + hildon_button_set_title (HILDON_BUTTON (action_button), NULL); + hildon_button_set_value (HILDON_BUTTON (action_button), NULL); + hildon_button_set_image (HILDON_BUTTON (action_button), NULL); + + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), NULL); modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE); modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); - modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS); - modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS); + modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS); + modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS); + modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS); hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0); - - g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE)); } static void move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) { - GtkWidget *selection_label; GtkWidget *back_button; GtkWidget *folder_view; TnyAccount *account; const gchar *account_id; - gchar *selection_label_text; GtkWidget *pannable; + GtkWidget *action_button; + + back_button = + GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON)); + action_button = + GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON)); + folder_view = + GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW)); + pannable = + GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE)); - selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL)); - back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON)); - folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW)); - pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE)); - gtk_widget_set_sensitive (back_button, TRUE); + gtk_widget_set_sensitive (action_button, TRUE); + + /* Need to set this here, otherwise callbacks called because + of filtering won't perform correctly */ + g_object_set_data (G_OBJECT (dialog), + MOVE_TO_DIALOG_SHOWING_FOLDERS, + GINT_TO_POINTER (TRUE)); account = TNY_ACCOUNT (folder_store); if (modest_tny_account_is_virtual_local_folders (account)) { account_id = tny_account_get_id (account); - selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS); } else if (modest_tny_account_is_memory_card_account (account)) { account_id = tny_account_get_id (account); - selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS); } else { account_id = tny_account_get_id (account); - - selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL); - modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS); } - gtk_label_set_text (GTK_LABEL (selection_label), selection_label_text); - g_free (selection_label_text); + move_to_dialog_set_selected_folder_store (dialog, folder_store); modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), account_id); modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), FALSE); modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS); modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS); hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0); - - g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE)); } static void @@ -2506,42 +2895,123 @@ on_move_to_dialog_back_clicked (GtkButton *button, { GtkWidget *dialog = (GtkWidget *) userdata; + /* Back to show accounts */ move_to_dialog_show_accounts (dialog); } static void -on_move_to_dialog_folder_activated (GtkTreeView *tree_view, +on_move_to_dialog_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) { - TnyFolderStore *selected; + TnyFolderStore *selected = NULL; GtkWidget *dialog; GtkWidget *folder_view; gboolean showing_folders; dialog = (GtkWidget *) user_data; + showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), + MOVE_TO_DIALOG_SHOWING_FOLDERS)); + + folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), + MOVE_TO_DIALOG_FOLDER_VIEW)); + + selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + if (!selected) + return; + + if (!showing_folders) { + gboolean valid = TRUE; + + if (TNY_IS_ACCOUNT (selected) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (selected))) { + ModestProtocolType protocol_type; + + protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (selected)); + valid = !modest_protocol_registry_protocol_type_has_tag + (modest_runtime_get_protocol_registry (), + protocol_type, + MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS); + } + if (valid) + move_to_dialog_show_folders (dialog, selected); + } else { + move_to_dialog_set_selected_folder_store (dialog, selected); + } +} + +static void +on_move_to_dialog_selection_changed (GtkTreeSelection *selection, + gpointer user_data) +{ + gboolean showing_folders; + GtkWidget *dialog; + + dialog = (GtkWidget *) user_data; showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS)); if (showing_folders) { - gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK); - } else { + TnyFolderStore *selected; + GtkWidget *folder_view; + folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW)); + selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + if (selected) { + move_to_dialog_set_selected_folder_store (dialog, selected); + g_object_unref (selected); + } + } +} + +static void +on_move_to_dialog_action_clicked (GtkButton *selection, + gpointer user_data) +{ + GtkWidget *dialog; + gboolean showing_folders; + dialog = (GtkWidget *) user_data; + showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS)); + if (showing_folders) { + TnyFolderStore *selected; + GtkWidget *folder_view; + + folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW)); selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + if (selected) { - move_to_dialog_show_folders (dialog, selected); + /* It's not possible to select root folders as + targets unless they're the local account or + the memory card account */ + if ((TNY_IS_FOLDER (selected) && !TNY_IS_MERGE_FOLDER (selected)) || + (TNY_IS_ACCOUNT (selected) && + (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (selected)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (selected))))) + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_object_unref (selected); } } } +static void +move_to_dialog_activity_changed (ModestFolderView *folder_view, gboolean activity, GtkDialog *dialog) +{ + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (dialog), activity?1:0); +} + GtkWidget * modest_platform_create_move_to_dialog (GtkWindow *parent_window, GtkWidget **folder_view) { GtkWidget *dialog, *folder_view_container; + GtkWidget *align; GtkWidget *buttons_hbox; - GtkWidget *back_button, *selection_label; + GtkWidget *back_button; GdkPixbuf *back_pixbuf; + GtkWidget *top_vbox; + GtkWidget *action_button; + GtkTreeSelection *selection; /* Create dialog. We cannot use a touch selector because we need to use here the folder view widget directly */ @@ -2552,9 +3022,19 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER, NULL); + align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_NONE); + top_vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + /* Create folder view */ - *folder_view = modest_platform_create_folder_view (NULL); + *folder_view = modest_platform_create_folder_view_full (NULL, FALSE); + g_signal_connect (G_OBJECT (*folder_view), "activity-changed", G_CALLBACK (move_to_dialog_activity_changed), + dialog); + modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view), + MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT); + modest_folder_view_show_message_count (MODEST_FOLDER_VIEW (*folder_view), + FALSE); tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (*folder_view), (TnyAccountStore *) modest_runtime_get_account_store ()); @@ -2565,38 +3045,57 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf)); g_object_unref (back_pixbuf); } - selection_label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5); + + action_button = hildon_button_new (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT, + HILDON_BUTTON_ARRANGEMENT_VERTICAL); + gtk_button_set_alignment (GTK_BUTTON (action_button), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (buttons_hbox), back_button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (buttons_hbox), selection_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (buttons_hbox), action_button, TRUE, TRUE, 0); gtk_widget_set_sensitive (GTK_WIDGET (back_button), FALSE); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), buttons_hbox, FALSE, FALSE, 0); + gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE); + gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0); /* Create pannable and add it to the dialog */ folder_view_container = hildon_pannable_area_new (); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), folder_view_container, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view); + gtk_box_pack_start (GTK_BOX (top_vbox), folder_view_container, TRUE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (align), top_vbox); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), align, TRUE, TRUE, 0); gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); gtk_widget_show (GTK_DIALOG (dialog)->vbox); gtk_widget_show (folder_view_container); + gtk_widget_show (align); + gtk_widget_show (top_vbox); gtk_widget_show (*folder_view); gtk_widget_show_all (back_button); - gtk_widget_show (selection_label); + gtk_widget_show (action_button); gtk_widget_show (buttons_hbox); + gtk_widget_show (dialog); g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view); g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button); - g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL, selection_label); + g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button); g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container); /* Simulate the behaviour of a HildonPickerDialog by emitting a response when a folder is selected */ g_signal_connect (*folder_view, "row-activated", - G_CALLBACK (on_move_to_dialog_folder_activated), + G_CALLBACK (on_move_to_dialog_row_activated), dialog); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*folder_view)); + g_signal_connect (selection, "changed", + G_CALLBACK (on_move_to_dialog_selection_changed), + dialog); + + g_signal_connect (action_button, "clicked", + G_CALLBACK (on_move_to_dialog_action_clicked), + dialog); + g_signal_connect (back_button, "clicked", G_CALLBACK (on_move_to_dialog_back_clicked), dialog);