X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=dea33a8d0e41947c123fd6ae16b3fc87f0e19e1d;hp=cba3df52b32e8a3af722294d2996314cfba44d05;hb=545c2344e9db7eb19d5deac4c1d6eb5ec2c68887;hpb=87fdab2eef15e510b0df401c2de24d4b94dd756e diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index cba3df5..dea33a8 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -29,7 +29,9 @@ #include #include + #include +#include #include #include #include @@ -37,12 +39,17 @@ #include "modest-widget-memory.h" #include #include +#include #include #include #include #include +#include #include +#include +#include #include +#include #include #include #include @@ -54,12 +61,14 @@ #include #include #include "modest-hildon2-sort-dialog.h" -#include +#include #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" @@ -69,6 +78,7 @@ #include #include #include +#include #ifdef MODEST_HAVE_MCE #include @@ -85,13 +95,19 @@ #define HILDON_OSSO_URI_ACTION "uri-action" #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 MODEST_ALARMD_APPID PACKAGE_NAME static void _modest_platform_play_email_tone (void); @@ -118,7 +134,7 @@ 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 (NULL); if (!mcc_file) { g_printerr ("modest: check for mcc file failed\n"); return FALSE; @@ -126,7 +142,7 @@ check_required_files (void) 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; } @@ -461,7 +477,7 @@ modest_platform_show_uri_popup (const gchar *uri) GSList *node; popup_info->actions = actions_list; popup_info->uri = g_strdup (uri); - + for (node = actions_list; node != NULL; node = g_slist_next (node)) { GtkWidget *menu_item; const gchar *action_name; @@ -473,7 +489,7 @@ modest_platform_show_uri_popup (const gchar *uri) g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name); /* hack */ g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), popup_info); - + if (hildon_uri_is_default_action (action, NULL)) { gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); } else { @@ -483,25 +499,15 @@ modest_platform_show_uri_popup (const gchar *uri) } } - /* always add the copy item */ - GtkWidget* menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri", - "uri_link_copy_link_location")); - g_object_set_data_full (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, - g_strconcat (URI_ACTION_COPY, uri, NULL), - g_free); - g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); - gtk_widget_show (menu_item); - /* and what to do when the link is deleted */ g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info); gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ()); - + } else { hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); } - + return TRUE; } @@ -520,7 +526,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size) */ if (!name || strlen(name) == 0) return NULL; - + current_theme = gtk_icon_theme_get_default (); pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size, GTK_ICON_LOOKUP_NO_SVG, @@ -570,6 +576,10 @@ entry_insert_text (GtkEditable *editable, g_free (msg); g_free (tmp); } else { + if (length >= 20) { + hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL, + _CS("ckdg_ib_maximum_characters_reached")); + } /* Write the text in the entry if it's valid */ g_signal_handlers_block_by_func (editable, (gpointer) entry_insert_text, data); @@ -597,11 +607,11 @@ entry_changed (GtkEditable *editable, g_return_if_fail (chars != NULL); - if (g_utf8_strlen (chars,-1) >= 20) + if (g_utf8_strlen (chars,-1) >= 20) { hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL, _CS("ckdg_ib_maximum_characters_reached")); - else - gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars)); + } + gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars)); /* Free */ g_list_free (buttons); @@ -622,27 +632,22 @@ 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 (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)) && @@ -651,9 +656,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")); @@ -663,7 +667,6 @@ on_response (GtkDialog *dialog, /* Do not close the dialog */ g_signal_stop_emission_by_name (dialog, "response"); } - } typedef struct _FolderChooserData { @@ -691,10 +694,11 @@ folder_chooser_dialog_run (ModestFolderView *original) userdata.dialog = hildon_dialog_new (); pannable = hildon_pannable_area_new (); folder_view = modest_platform_create_folder_view (NULL); - modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), - MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS); - modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), MODEST_FOLDER_VIEW (folder_view)); + 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 (folder_view)); visible_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)); @@ -703,10 +707,11 @@ folder_chooser_dialog_run (ModestFolderView *original) gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable); gtk_container_add (GTK_CONTAINER (pannable), folder_view); + gtk_widget_set_size_request (pannable, -1, 320); + gtk_widget_show (folder_view); gtk_widget_show (pannable); - gtk_widget_show_all (userdata.dialog); - gtk_widget_set_size_request (pannable, -1, 320); + gtk_widget_show (userdata.dialog); g_signal_connect (G_OBJECT (folder_view), "folder-activated", G_CALLBACK (folder_chooser_activated), (gpointer) &userdata); @@ -721,7 +726,11 @@ static gchar * folder_store_get_display_name (TnyFolderStore *store) { if (TNY_IS_ACCOUNT (store)) { - return g_strdup (tny_account_get_name (TNY_ACCOUNT (store))); + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store))) + return modest_conf_get_string (modest_runtime_get_conf(), + MODEST_CONF_DEVICE_NAME, NULL); + else + return g_strdup (tny_account_get_name (TNY_ACCOUNT (store))); } else { gchar *fname; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; @@ -752,6 +761,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_ACCOUNT; + } + } 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) { @@ -760,47 +824,108 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store) if (store == NULL) { g_object_set_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, NULL); } else { - g_object_ref (store); - g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, - store, (GDestroyNotify) g_object_unref); + GtkWidget *image; + + 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 */ + 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; + + if (suggested_name !=NULL) { + return g_strdup (suggested_name); + } + + 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; - store = folder_chooser_dialog_run (folder_view); + store = folder_chooser_dialog_run (helper->folder_view); if (store) { + const gchar *current_name; + gboolean exists; + folder_picker_set_store (GTK_BUTTON (button), store); + + /* Update the name of the folder */ + current_name = gtk_entry_get_text (helper->entry); + 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; - GdkPixbuf *pixbuf; button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL, - MODEST_ICON_SIZE_SMALL); - hildon_button_set_image (HILDON_BUTTON (button), - gtk_image_new_from_pixbuf (pixbuf)); hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0); - if (suggested) { + if (suggested) folder_picker_set_store (GTK_BUTTON (button), suggested); - } - g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (folder_picker_clicked), folder_view); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (folder_picker_clicked), + helper); return button; } @@ -826,13 +951,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, @@ -854,36 +985,40 @@ 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), _("mcen_ia_default_folder_name")); + gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub")); gtk_entry_set_width_chars (GTK_ENTRY (entry), MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1), - g_utf8_strlen (_("mcen_ia_default_folder_name"), -1))); + 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, @@ -895,20 +1030,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); } @@ -919,12 +1054,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)); @@ -940,6 +1079,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 (); @@ -953,74 +1095,47 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, gchar **folder_name, TnyFolderStore **parent_folder) { - gchar *real_suggested_name = NULL, *tmp = NULL; + gchar *real_suggested_name = NULL; gint result; ModestTnyAccountStore *acc_store; TnyAccount *account; + gboolean do_free = FALSE; - if(suggested_name == NULL) - { - const gchar *default_name = _("mcen_ia_default_folder_name"); - unsigned int i; - gchar num_str[3]; - - for(i = 0; i < 100; ++ i) { - gboolean exists = FALSE; - - sprintf(num_str, "%.2u", i); - - if (i == 0) - real_suggested_name = g_strdup (default_name); - else - real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"), - num_str); - 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, + 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); + } - tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL); - result = modest_platform_run_folder_common_dialog (parent_window, + result = modest_platform_run_folder_common_dialog (parent_window, suggested_folder, - _("mcen_ti_new_folder"), - tmp, + _HL("ckdg_ti_new_folder"), + _FM("ckdg_fi_new_folder_name"), real_suggested_name, TRUE, TRUE, folder_name, parent_folder); - g_free (tmp); - if (suggested_name == NULL) - g_free(real_suggested_name); + if (do_free) + g_object_unref (suggested_folder); + + g_free(real_suggested_name); return result; } @@ -1251,13 +1366,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; @@ -1323,7 +1436,7 @@ modest_platform_set_update_interval (guint minutes) /* Delete any existing alarm, * because we will replace it: */ if (alarm_cookie) { - if (alarmd_event_del(alarm_cookie) != 1) + if (alarmd_event_del(alarm_cookie) != 0) g_warning ("%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); @@ -1340,6 +1453,7 @@ modest_platform_set_update_interval (guint minutes) alarm_event_t *event = alarm_event_create (); alarm_event_add_actions (event, 1); alarm_action_t *action = alarm_event_get_action (event, 0); + alarm_event_set_alarm_appid (event, MODEST_ALARMD_APPID); event->alarm_time = minutes * 60; /* seconds */ /* Set recurrence every few minutes: */ @@ -1353,7 +1467,7 @@ modest_platform_set_update_interval (guint minutes) action->dbus_interface = g_strdup (MODEST_DBUS_IFACE); action->dbus_service = g_strdup (MODEST_DBUS_SERVICE); action->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE); - action->flags = ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION; + action->flags = ALARM_ACTION_WHEN_TRIGGERED | ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION; /* Use ALARM_EVENT_NO_DIALOG: Otherwise, a dialog will be shown if * exec_name or dbus_path is NULL, even though we have specified no dialog text. @@ -1386,11 +1500,13 @@ modest_platform_set_update_interval (guint minutes) void modest_platform_push_email_notification(void) { - gboolean screen_on = TRUE, app_in_foreground; + gboolean screen_on, app_in_foreground; /* 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)) { @@ -1412,60 +1528,48 @@ modest_platform_push_email_notification(void) } } -void +void modest_platform_on_new_headers_received (TnyList *header_list, gboolean show_visual) { - g_return_if_fail (TNY_IS_LIST(header_list)); + g_return_if_fail (TNY_IS_LIST (header_list)); - if (tny_list_get_length(header_list) == 0) { - g_warning ("%s: header list is empty", __FUNCTION__); + if (tny_list_get_length (header_list) < 1) return; - } - - if (!show_visual) { - modest_platform_push_email_notification (); - /* We do a return here to avoid indentation with an else */ + + /* If the window is in the foreground don't do anything */ + if (hildon_program_get_is_topmost (hildon_program_get_instance ())) return; - } #ifdef MODEST_HAVE_HILDON_NOTIFY + /* For any other case issue a notification */ HildonNotification *notification; TnyIterator *iter; GSList *notifications_list = NULL; /* Get previous notifications ids */ - notifications_list = modest_conf_get_list (modest_runtime_get_conf (), - MODEST_CONF_NOTIFICATION_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, *summary = NULL; - const gchar *display_date; + 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; - ModestDatetimeFormatter *datetime_formatter; - - /* constant string, don't free */ - datetime_formatter = modest_datetime_formatter_new (); - display_date = modest_datetime_formatter_display_datetime (datetime_formatter, - tny_header_get_date_received (header)); - g_object_unref (datetime_formatter); display_address = tny_header_dup_from (header); /* string is changed in-place */ modest_text_utils_get_display_address (display_address); - summary = g_strdup_printf ("%s - %s", display_date, display_address); str = tny_header_dup_subject (header); - notification = hildon_notification_new (summary, + notification = hildon_notification_new (display_address, str, "qgn_list_messagin", - "email-message"); + MODEST_NOTIFICATION_CATEGORY); g_free (str); /* Create the message URL */ str = tny_header_dup_uid (header); @@ -1486,37 +1590,32 @@ modest_platform_on_new_headers_received (TnyList *header_list, /* Play sound if the user wants. Show the LED pattern. Show and play just one */ if (G_UNLIKELY (first_notification)) { - gchar *active_profile; - gchar *mail_tone; - gchar *mail_volume; - gint mail_volume_int; + TnyAccount *account; first_notification = FALSE; - 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); - - if (mail_volume_int > 0) - notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "sound-file", mail_tone); - - g_free (mail_volume); - g_free (mail_tone); - g_free (active_profile); - /* 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); + MODEST_NEW_MAIL_LIGHTING_PATTERN); + + /* Set the account of the headers */ + account = tny_folder_get_account (folder); + if (account) { + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "email-account", + tny_account_get_id (account)); + g_object_unref (account); + } } /* 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); + if (!notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { + g_warning ("Failed to send notification"); + } /* Save id in the list */ g_object_get(G_OBJECT(notification), "id", ¬if_id, NULL); @@ -1524,10 +1623,9 @@ modest_platform_on_new_headers_received (TnyList *header_list, /* 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 (summary); g_free (url); g_object_unref (folder); g_object_unref (header); @@ -1540,7 +1638,7 @@ modest_platform_on_new_headers_received (TnyList *header_list, notifications_list, MODEST_CONF_VALUE_INT, NULL); g_slist_free (notifications_list); - + #endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -1641,10 +1739,10 @@ 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), @@ -1658,6 +1756,12 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) 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) { @@ -1859,7 +1963,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); } @@ -2170,12 +2274,19 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, gpointer user_data) { TnyAccount *account = NULL; - - if (!folder_store) { + + if (!folder_store || + (TNY_IS_MERGE_FOLDER (folder_store) && + (tny_folder_get_folder_type (TNY_FOLDER(folder_store)) == TNY_FOLDER_TYPE_OUTBOX))) { + /* We promise to instantly perform the callback, so ... */ if (callback) { - callback (FALSE, NULL, parent_window, NULL, user_data); - } + GError *error = NULL; + g_set_error (&error, TNY_ERROR_DOMAIN, TNY_SERVICE_ERROR_UNKNOWN, + "Unable to move or not found folder"); + callback (FALSE, error, parent_window, NULL, user_data); + g_error_free (error); + } return; } else if (TNY_IS_FOLDER (folder_store)) { @@ -2186,7 +2297,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) @@ -2297,7 +2408,7 @@ modest_platform_check_memory_low (ModestWindow *win, if (win && lowmem && visuals) modest_platform_run_information_dialog ( GTK_WINDOW(win), - dgettext("ke-recv","memr_ib_operation_disabled"), + _KR("memr_ib_operation_disabled"), TRUE); if (lowmem) @@ -2327,14 +2438,90 @@ 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 (), @@ -2356,18 +2543,34 @@ modest_platform_get_osso_context (void) static 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; + + tmp = g_strconcat ("/usr/share/sounds", mail_tone, NULL); + g_free (mail_tone); + mail_tone = tmp; + } if (mail_volume_int > 0) { @@ -2393,18 +2596,275 @@ _modest_platform_play_email_tone (void) 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_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 +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); + } + 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 *back_button; + GtkWidget *folder_view; + 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)); + + 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)); + + /* 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_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); } static void -on_move_to_dialog_folder_activated (GtkTreeView *tree_view, +move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) +{ + GtkWidget *back_button; + GtkWidget *folder_view; + TnyAccount *account; + const gchar *account_id; + 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)); + + 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); + 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); + 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); + 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); + } + + 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); +} + +static void +on_move_to_dialog_back_clicked (GtkButton *button, + gpointer userdata) +{ + GtkWidget *dialog = (GtkWidget *) userdata; + + /* Back to show accounts */ + move_to_dialog_show_accounts (dialog); +} + +static void +on_move_to_dialog_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) { - gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK); + 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_MESSAGE_ADD); + } + 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) { + 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) { + 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 * @@ -2412,6 +2872,13 @@ 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; + 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 */ @@ -2419,28 +2886,88 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, GTK_WINDOW (parent_window), GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - _("mcen_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER, + _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 ()); + + buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF); + back_button = gtk_button_new (); + back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG); + if (back_pixbuf) { + gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf)); + g_object_unref (back_pixbuf); + } - /* 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), - dialog); + 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), action_button, TRUE, TRUE, 0); + gtk_widget_set_sensitive (GTK_WIDGET (back_button), FALSE); + 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_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container); 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 (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_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_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); + + move_to_dialog_show_accounts (dialog); return dialog; } @@ -2448,16 +2975,16 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, TnyList * modest_platform_get_list_to_move (ModestWindow *window) { + TnyList *list = NULL; + if (MODEST_IS_HEADER_WINDOW (window)) { ModestHeaderView *header_view; header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (window)); - - return modest_header_view_get_selected_headers (header_view); + list = modest_header_view_get_selected_headers (header_view); } else if (MODEST_IS_FOLDER_WINDOW (window)) { ModestFolderView *folder_view; TnyFolderStore *selected_folder; - TnyList *list; list = TNY_LIST (tny_simple_list_new ()); folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)); @@ -2467,7 +2994,18 @@ modest_platform_get_list_to_move (ModestWindow *window) g_object_unref (selected_folder); } return list; + } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { + TnyHeader *header; + + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window)); + if (header) { + list = TNY_LIST (tny_simple_list_new ()); + tny_list_prepend (list, G_OBJECT (header)); + g_object_unref (header); + } } else { - return NULL; + g_return_val_if_reached (NULL); } + + return list; }