X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=735a15cde878905ecc38c78fa967eda31e20e174;hp=f48a81cc641f09528855377da6cb9644c5e71313;hb=1ce157e69d8d25a6a107a221699331a98c3a720f;hpb=6d59df29bb4fc60a58c172c029dfbb3db3a2f580 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index f48a81c..735a15c 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -29,7 +29,9 @@ #include #include + #include +#include #include #include #include @@ -42,7 +44,10 @@ #include #include #include +#include +#include #include +#include #include #include #include @@ -54,7 +59,7 @@ #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" @@ -85,6 +90,7 @@ #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" #define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE #define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME @@ -92,6 +98,7 @@ #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 +125,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; @@ -461,7 +468,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 +480,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 +490,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 +517,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 +567,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 +598,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); @@ -691,10 +692,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 +705,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 +724,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; @@ -760,47 +767,151 @@ 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; + g_object_ref (store); g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, 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 { + 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, MODEST_ICON_SIZE_SMALL); + + if (pixbuf) { + hildon_button_set_image (HILDON_BUTTON (button), + gtk_image_new_from_pixbuf (pixbuf)); + g_object_unref (pixbuf); + } + } +} + +/* 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) { 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,6 +937,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, ModestFolderView *folder_view; ModestWindow *folder_window; ModestHildon2WindowMgr *window_mgr; + FolderPickerHelper *helper = NULL; window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr (); folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr); @@ -858,10 +970,10 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, if (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); } @@ -872,7 +984,11 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, 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); @@ -940,6 +1056,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 +1072,41 @@ 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; - 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 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); - 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); + g_free(real_suggested_name); return result; } @@ -1323,7 +1409,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 +1426,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 +1440,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. @@ -1424,7 +1511,7 @@ modest_platform_on_new_headers_received (TnyList *header_list, g_warning ("%s: header list is empty", __FUNCTION__); return; } - + if (!show_visual) { modest_platform_push_email_notification (); /* We do a return here to avoid indentation with an else */ @@ -1437,37 +1524,28 @@ modest_platform_on_new_headers_received (TnyList *header_list, 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); @@ -1488,32 +1566,25 @@ 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 @@ -1529,7 +1600,6 @@ modest_platform_on_new_headers_received (TnyList *header_list, /* Free & carry on */ g_free (display_address); - g_free (summary); g_free (url); g_object_unref (folder); g_object_unref (header); @@ -1861,7 +1931,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); } @@ -2172,12 +2242,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)) { @@ -2299,7 +2376,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) @@ -2371,6 +2448,14 @@ _modest_platform_play_email_tone (void) mail_volume = profile_get_value (active_profile, PROFILE_MAIL_VOLUME); mail_volume_int = profile_parse_int (mail_volume); + 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) { if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) { @@ -2400,13 +2485,123 @@ _modest_platform_play_email_tone (void) 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_SHOWING_FOLDERS "showing-folders" +#define MOVE_TO_DIALOG_PANNABLE "pannable" + +static void +move_to_dialog_show_accounts (GtkWidget *dialog) +{ + GtkWidget *selection_label; + GtkWidget *back_button; + GtkWidget *folder_view; + GtkWidget *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, FALSE); + + gtk_label_set_text (GTK_LABEL (selection_label), ""); + 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); + 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; + + 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); + + account = TNY_ACCOUNT (folder_store); + if (modest_tny_account_is_virtual_local_folders (account)) { + gchar *device_name; + account_id = tny_account_get_id (account); + 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); + } + } 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); + } 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_FILTER_HIDE_LOCAL_FOLDERS); + } + gtk_label_set_text (GTK_LABEL (selection_label), selection_label_text); + g_free (selection_label_text); + + 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_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 +on_move_to_dialog_back_clicked (GtkButton *button, + gpointer userdata) +{ + GtkWidget *dialog = (GtkWidget *) userdata; + + move_to_dialog_show_accounts (dialog); +} + static void on_move_to_dialog_folder_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) { - gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK); + 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) { + gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK); + } else { + 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); + } + } } GtkWidget * @@ -2414,6 +2609,9 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, GtkWidget **folder_view) { GtkWidget *dialog, *folder_view_container; + GtkWidget *buttons_hbox; + GtkWidget *back_button, *selection_label; + GdkPixbuf *back_pixbuf; /* Create dialog. We cannot use a touch selector because we need to use here the folder view widget directly */ @@ -2421,21 +2619,32 @@ 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); /* Create folder view */ *folder_view = modest_platform_create_folder_view (NULL); - /* 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); + 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); + } + selection_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (selection_label), 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_widget_set_sensitive (GTK_WIDGET (back_button), FALSE); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->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_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_window_set_default_size (GTK_WINDOW (dialog), 300, 300); @@ -2443,6 +2652,26 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, gtk_widget_show (GTK_DIALOG (dialog)->vbox); gtk_widget_show (folder_view_container); gtk_widget_show (*folder_view); + gtk_widget_show_all (back_button); + gtk_widget_show (selection_label); + gtk_widget_show (buttons_hbox); + + 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_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), + dialog); + + g_signal_connect (back_button, "clicked", + G_CALLBACK (on_move_to_dialog_back_clicked), + dialog); + + move_to_dialog_show_accounts (dialog); return dialog; }