X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=a8d881d9cd06733416d33efc4a3b84be6c41dc65;hp=bfdd3fe4882fe83c0d92fe1775364d90a9866611;hb=824e4de9c2cb7fa0b66c4df1f20c0e1451fa99da;hpb=04a8f75ba92f077cd0d408caed023eb49fd40ea0 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index bfdd3fe..a8d881d 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -63,8 +63,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" @@ -92,8 +94,12 @@ #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" @@ -125,7 +131,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_maemo_open_mcc_mapping_file (NULL); if (!mcc_file) { g_printerr ("modest: check for mcc file failed\n"); return FALSE; @@ -724,7 +730,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; @@ -782,8 +792,8 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store) 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))) { - TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store)); switch (type) { case TNY_FOLDER_TYPE_INBOX: icon_name = MODEST_FOLDER_ICON_INBOX; @@ -791,10 +801,23 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store) 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))) + } 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 */ @@ -808,20 +831,78 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store) } } +/* 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; @@ -834,7 +915,9 @@ folder_picker_new (ModestFolderView *folder_view, TnyFolderStore *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; } @@ -860,13 +943,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, @@ -888,9 +977,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), @@ -898,26 +987,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, @@ -929,20 +1022,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); } @@ -953,12 +1046,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)); @@ -974,6 +1071,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 (); @@ -992,54 +1092,26 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, ModestTnyAccountStore *acc_store; TnyAccount *account; - 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, + 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 there is not archive folder then fallback to local folders account */ if (!suggested_folder) 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"), @@ -1049,8 +1121,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, folder_name, parent_folder); - if (suggested_name == NULL) - g_free(real_suggested_name); + g_free(real_suggested_name); return result; } @@ -1281,13 +1352,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; @@ -1510,6 +1579,7 @@ 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)) { + TnyAccount *account; first_notification = FALSE; @@ -1518,12 +1588,23 @@ modest_platform_on_new_headers_received (TnyList *header_list, "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); @@ -1865,7 +1946,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); } @@ -2199,7 +2280,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) @@ -2369,18 +2450,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) { @@ -2406,13 +2503,12 @@ _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_SELECTION_LABEL "selection-label" #define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders" #define MOVE_TO_DIALOG_PANNABLE "pannable" @@ -2424,22 +2520,35 @@ move_to_dialog_show_accounts (GtkWidget *dialog) 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), ""); + 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_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); 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)); + g_object_set (G_OBJECT (folder_view), + "hildon-ui-mode", HILDON_UI_MODE_NORMAL, + NULL); } static void @@ -2452,27 +2561,52 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) const gchar *account_id; gchar *selection_label_text; 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, TRUE); + 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 (TRUE)); + + g_object_set (G_OBJECT (folder_view), + "hildon-ui-mode", HILDON_UI_MODE_EDIT, + NULL); account = TNY_ACCOUNT (folder_store); if (modest_tny_account_is_virtual_local_folders (account)) { + gchar *device_name; account_id = tny_account_get_id (account); - selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL); + device_name = modest_conf_get_string (modest_runtime_get_conf(), + MODEST_CONF_DEVICE_NAME, NULL); + if (device_name) { + selection_label_text = g_strconcat (device_name, "/", NULL); + g_free (device_name); + } else { + 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); @@ -2484,8 +2618,31 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); 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 +move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store) +{ + GtkWidget *selection_label; + GtkWidget *action_button; + gchar *folder_name; + + selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL)); + action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON)); + + gtk_widget_set_sensitive (action_button, TRUE); + + if (TNY_IS_FOLDER (folder_store)) { + folder_name = modest_tny_folder_get_display_name (TNY_FOLDER (folder_store)); + } else if (TNY_IS_ACCOUNT (folder_store)) { + folder_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (folder_store))); + } else { + folder_name = g_strdup (""); + } + + gtk_label_set_text (GTK_LABEL (selection_label), folder_name); + g_free (folder_name); - g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE)); } static void @@ -2494,6 +2651,7 @@ on_move_to_dialog_back_clicked (GtkButton *button, { GtkWidget *dialog = (GtkWidget *) userdata; + /* Back to show accounts */ move_to_dialog_show_accounts (dialog); } @@ -2510,26 +2668,86 @@ on_move_to_dialog_folder_activated (GtkTreeView *tree_view, 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 { + if (!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) { - move_to_dialog_show_folders (dialog, selected); + gboolean valid; + + 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); } } } +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 (dialog, selected); + g_object_unref (selected); + } + } +} + +static void +on_move_to_dialog_action_clicked (GtkButton *selection, + gpointer user_data) +{ + TnyFolderStore *selected; + 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)); + if (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) + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + } +} + 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; 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 */ @@ -2540,9 +2758,17 @@ 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); + 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 ()); @@ -2555,27 +2781,40 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, } selection_label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5); + + action_button = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (action_button), selection_label); + 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_ACTION_BUTTON, action_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_PANNABLE, folder_view_container); @@ -2585,6 +2824,15 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, G_CALLBACK (on_move_to_dialog_folder_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);