X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-ui-actions.c;h=eb715102ddc3b30ad70405b514fd6a264d8d8573;hb=514d7488390a9c4c31a9ca5e44f78dc9329b833d;hp=b97fa671b675e93bd11dcfc07a0090ce021d564c;hpb=1dc38431986cdda1c99d58a11dfb667acf25c2c9;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index b97fa67..eb71510 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -50,10 +50,10 @@ #include #include #include +#include #ifdef MODEST_TOOLKIT_HILDON2 #include #include -#include #include #include #endif @@ -76,6 +76,7 @@ #include #include #include +#include #include @@ -447,55 +448,12 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check first if the header view has the focus */ - if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *header_view = NULL; - - header_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - if (!gtk_widget_is_focus (header_view)) - return FALSE; - } -#endif /* Get the headers, either from the header view (if win is the main window), * or from the message view window: */ header_list = get_selected_headers (win); if (!header_list) return FALSE; /* Check if any of the headers are already opened, or in the process of being opened */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) { - gint opened_headers = 0; - - iter = tny_list_create_iterator (header_list); - mgr = modest_runtime_get_window_mgr (); - while (!tny_iterator_is_done (iter)) { - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) { - if (modest_window_mgr_find_registered_header (mgr, header, NULL)) - opened_headers++; - g_object_unref (header); - } - tny_iterator_next (iter); - } - g_object_unref (iter); - - if (opened_headers > 0) { - gchar *msg; - - msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), - opened_headers); - - modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg, FALSE); - - g_free (msg); - g_object_unref (header_list); - return FALSE; - } - } -#endif /* Select message */ if (tny_list_get_length(header_list) == 1) { @@ -526,31 +484,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) ModestMailOperation *mail_op = NULL; /* Find last selected row */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) { - GList *tmp = NULL; - ModestWindowMgr *mgr = NULL; - GtkTreeModel *model = NULL; - GtkTreeRowReference *next_row_reference = NULL, *prev_row_reference = NULL; - GtkTreePath *next_path = NULL, *prev_path = NULL; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - sel_list = gtk_tree_selection_get_selected_rows (sel, &model); - for (tmp=sel_list; tmp; tmp=tmp->next) { - if (tmp->next == NULL) { - prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); - next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); - - gtk_tree_path_prev (prev_path); - gtk_tree_path_next (next_path); - - prev_row_reference = gtk_tree_row_reference_new (model, prev_path); - next_row_reference = gtk_tree_row_reference_new (model, next_path); - } - } - } -#endif /* Disable window dimming management */ modest_window_disable_dimming (win); @@ -573,26 +506,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) /* Get main window */ mgr = modest_runtime_get_window_mgr (); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - /* Select next or previous row */ - if (gtk_tree_row_reference_valid (next_row_reference)) { - gtk_tree_selection_select_path (sel, next_path); - } - else if (gtk_tree_row_reference_valid (prev_row_reference)) { - gtk_tree_selection_select_path (sel, prev_path); - } - - /* Free */ - if (gtk_tree_row_reference_valid (next_row_reference)) - gtk_tree_row_reference_free (next_row_reference); - if (next_path != NULL) - gtk_tree_path_free (next_path); - if (gtk_tree_row_reference_valid (prev_row_reference)) - gtk_tree_row_reference_free (prev_row_reference); - if (prev_path != NULL) - gtk_tree_path_free (prev_path); -#endif } /* Update toolbar dimming state */ @@ -692,9 +605,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win) void modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win) { - g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win)); - - modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win)); + else if (MODEST_IS_MSG_EDIT_WINDOW (win)) + modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win)); } void @@ -1009,9 +923,14 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, if (protocol) { if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) { - format = modest_protocol_get_translation (protocol, - MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, - subject); + if (header) { + format = modest_protocol_get_translation (protocol, + MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, + subject); + } else { + format = modest_protocol_get_translation (protocol, + MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE_LOST_HEADER); + } } else { format = g_strdup_printf (_("mail_ib_backend_server_invalid"), tny_account_get_hostname (account)); @@ -1020,8 +939,13 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, g_object_unref (account); } - if (!format) - format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server")); + if (!format) { + if (header) { + format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server")); + } else { + format = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); + } + } msg = g_strdup_printf (format, subject); modest_platform_run_information_dialog (NULL, msg, FALSE); @@ -3186,7 +3110,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE); - if (!modest_msg_edit_window_check_names (edit_window, TRUE)) + /* Check names but do not automatically add them to addressbook */ + if (!modest_msg_edit_window_check_names (edit_window, FALSE)) return TRUE; data = modest_msg_edit_window_get_msg_data (edit_window); @@ -4130,54 +4055,43 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, */ gtk_widget_set_sensitive (entry_username, FALSE); -#ifndef MODEST_TOOLKIT_GTK /* Auto-capitalization is the default, so let's turn it off: */ +#ifdef MAEMO_CHANGES hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_username), HILDON_GTK_INPUT_MODE_FULL); +#endif /* Create a size group to be used by all captions. * Note that HildonCaption does not create a default size group if we do not specify one. * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */ GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); -#ifdef MODEST_TOOLKIT_HILDON2 - GtkWidget *caption = modest_maemo_utils_create_captioned (sizegroup, NULL, - _("mail_fi_username"), FALSE, - entry_username); -#else - GtkWidget *caption = hildon_caption_new (sizegroup, - _("mail_fi_username"), entry_username, NULL, HILDON_CAPTION_MANDATORY); -#endif + GtkWidget *caption = modest_toolkit_utils_create_captioned (sizegroup, NULL, + _("mail_fi_username"), FALSE, + entry_username); gtk_widget_show (entry_username); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); -#else - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_username, - TRUE, FALSE, 0); -#endif /* !MODEST_TOOLKIT_GTK */ /* password: */ GtkWidget *entry_password = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ()); gtk_entry_set_visibility (GTK_ENTRY(entry_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY(entry_password), "*"); */ -#ifndef MODEST_TOOLKIT_GTK /* Auto-capitalization is the default, so let's turn it off: */ +#ifdef MAEMO_CHANGES hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); +#endif - caption = modest_maemo_utils_create_captioned (sizegroup, NULL, - _("mail_fi_password"), FALSE, - entry_password); + caption = modest_toolkit_utils_create_captioned (sizegroup, NULL, + _("mail_fi_password"), FALSE, + entry_password); gtk_widget_show (entry_password); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); g_object_unref (sizegroup); -#else - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password, - TRUE, FALSE, 0); -#endif /* !MODEST_TOOLKIT_GTK */ if (initial_username != NULL) gtk_widget_grab_focus (GTK_WIDGET (entry_password));