#include <tny-simple-list.h>
#include <modest-wp-text-view.h>
#include <wptextbuffer.h>
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
#include <hildon/hildon-touch-selector.h>
#include <hildon/hildon-picker-dialog.h>
#include "modest-msg-edit-window-ui-dimming.h"
#include "modest-hildon-includes.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-color-chooser.h>
-#endif
#include "widgets/modest-msg-edit-window-ui.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
#include <libgnomevfs/gnome-vfs-mime.h>
-#endif
#include <modest-utils.h>
#include "modest-maemo-utils.h"
#include <modest-ui-constants.h>
#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
-#define DEFAULT_MAIN_VBOX_SPACING 6
+#define DEFAULT_MAIN_VBOX_SPACING 0
#define SUBJECT_MAX_LENGTH 1000
#define IMAGE_MAX_WIDTH 560
#define DEFAULT_FONT_SCALE 1.5
GtkWidget *font_dialog;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
guint correct_scroll_idle;
guint scroll_drag_timeout_id;
gdouble last_upper;
offset_min = priv->msg_body->allocation.y + rectangle.y;
offset_max = offset_min + rectangle.height;
- vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
+ vadj = modest_scrollable_get_vadjustment (MODEST_SCROLLABLE (priv->scrollable));
offset_min = MAX (offset_min - 48, 0);
offset_max = MIN (offset_max + 48, vadj->upper);
}
static void
+body_size_request (GtkWidget *body,
+ GtkRequisition *req,
+ gpointer user_data)
+{
+ /* Make sure the body always get at least 70 pixels */
+ if (req->height < 70)
+ req->height = 70;
+}
+
+static void
connect_signals (ModestMsgEditWindow *obj)
{
ModestMsgEditWindowPrivate *priv;
G_CALLBACK (msg_body_focus), obj);
g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event",
G_CALLBACK (msg_body_focus), obj);
+ g_signal_connect (G_OBJECT (priv->msg_body), "size-request",
+ G_CALLBACK (body_size_request), obj);
g_signal_connect (G_OBJECT (obj), "set-focus", G_CALLBACK (window_focus), obj);
g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
"changed", G_CALLBACK (recpt_field_changed), obj);
priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE);
gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH);
g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
+ hildon_entry_set_placeholder ((HildonEntry *) priv->subject_field, _("mail_va_no_subject"));
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->subject_field, TRUE, TRUE, 0);
/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
- priv->pannable = hildon_pannable_area_new ();
+ priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
- g_object_set (G_OBJECT (priv->pannable), "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
+ g_object_set (G_OBJECT (priv->scrollable), "horizontal-policy", GTK_POLICY_NEVER, NULL);
main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING);
window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
- gtk_widget_show_all (GTK_WIDGET(priv->pannable));
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align);
+ gtk_widget_show_all (GTK_WIDGET(priv->scrollable));
window_box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER(obj), window_box);
- gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0);
/* Set window icon */
window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
priority_flags = tny_header_get_priority (header);
- if (to)
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to);
+ if (to) {
+ gchar *quoted_names = modest_text_utils_quote_names (to);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), quoted_names);
+ g_free (quoted_names);
+ }
field_view_set = TRUE;
if (cc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), cc);
+ gchar *quoted_names = modest_text_utils_quote_names (cc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), quoted_names);
+ g_free (quoted_names);
gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
gtk_widget_show (priv->cc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
field_view_set = TRUE;
if (bcc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+ gchar *quoted_names = modest_text_utils_quote_names (bcc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), quoted_names);
+ g_free (quoted_names);
gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
gtk_widget_show (priv->bcc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
- hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
+ modest_window_add_toolbar (MODEST_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
/* Font color placeholder */
placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor");
hildon_touch_selector_get_current_text
(HILDON_TOUCH_SELECTOR (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->from_field)))));
modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
- hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
+ modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
/* Init window */
connect_signals (MODEST_MSG_EDIT_WINDOW(obj));
}
-#ifdef MODEST_HILDON_VERSION_0
-void
-modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
-{
-
- WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
- ModestMsgEditWindowPrivate *priv;
- GtkWidget *dialog = NULL;
- gint response;
- GdkColor *new_color = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
-
- dialog = hildon_color_selector_new (GTK_WINDOW (window));
- hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color));
- g_free (buffer_format);
-
- if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
- new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
- if (new_color != NULL) {
- wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
- (gpointer) new_color);
- }
- }
- gtk_widget_destroy (dialog);
-}
-
-
-void
-modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
-{
-
- ModestMsgEditWindowPrivate *priv;
- GtkWidget *dialog = NULL;
- gint response;
- GdkColor *old_color = NULL;
- const GdkColor *new_color = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
-
- dialog = hildon_color_selector_new (GTK_WINDOW (window));
- hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
-
- if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
- new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
- if (new_color != NULL)
- wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
- }
- gtk_widget_destroy (dialog);
-
-}
-#else
void
modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
{
gtk_widget_destroy (dialog);
}
-#endif /*!MODEST_HILDON_VERSION_0*/
-
-
static TnyStream*
create_stream_for_uri (const gchar* uri)
}
if (tny_list_get_length (att_list) == 0) {
- hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove"));
+ modest_platform_system_banner (NULL, NULL, _("TODO: no attachments selected to remove"));
} else {
gboolean dialog_response;
gchar *message = NULL;
ModestMsgEditWindowPrivate *priv;
GdkColor *new_color;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
- new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
-#else
- GdkColor col;
- hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col);
- new_color = &col;
-#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
+
+ hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), new_color);
wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
-
- gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
+ gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
}
static void
gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE);
- if (parent_priv->toolbar) {
- if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) {
- gtk_widget_hide (parent_priv->toolbar);
- } else {
- gtk_widget_show (parent_priv->toolbar);
- }
- }
-
if (current_format != file_format) {
switch (file_format) {
case MODEST_FILE_FORMAT_FORMATTED_TEXT:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+ if (parent_priv->toolbar)
+ gtk_widget_show (parent_priv->toolbar);
break;
case MODEST_FILE_FORMAT_PLAIN_TEXT:
{
gtk_widget_destroy (dialog);
if (response == GTK_RESPONSE_OK) {
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
- if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+ if (parent_priv->toolbar)
+ gtk_widget_hide (parent_priv->toolbar);
} else {
GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"));
modest_utils_toggle_action_set_active_block_notify (action, TRUE);
modest_msg_edit_window_undo (ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+ gboolean was_rich_text, is_rich_text;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+ was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
+ is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
+ if (parent_priv->toolbar && was_rich_text != is_rich_text) {
+ if (is_rich_text)
+ gtk_widget_show (parent_priv->toolbar);
+ else
+ gtk_widget_hide (parent_priv->toolbar);
+ }
+
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
}
if (result_len + old_length > 1000) {
- hildon_banner_show_information (GTK_WIDGET (window), NULL,
+ modest_platform_system_banner (GTK_WIDGET (window), NULL,
_CS("ckdg_ib_maximum_characters_reached"));
}
g_string_free (result, TRUE);
if (message_is_empty (window)) {
g_free (priv->last_search);
priv->last_search = NULL;
- hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
+ modest_platform_system_banner (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
return;
}
g_free (priv->last_search);
priv->last_search = NULL;
/* Information banner about empty search */
- hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+ modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
return;
}
result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search,
&match_start, &match_end);
if (!result)
- hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+ modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete"));
} else {
GtkTextIter buffer_start;
gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search,
&match_start, &match_end);
if (!result)
- hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches"));
+ modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
}
/* Mark as selected the string found in search */
&match_start, &match_end, NULL)) {
iter = match_start;
}
+ } else {
+ gtk_text_buffer_get_end_iter (priv->text_buffer, &iter);
}
g_free (signature);
}
priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature);
if (has_new_signature) {
- gchar *full_signature = g_strconcat (MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
+
+ gchar *full_signature = g_strconcat ((gtk_text_iter_starts_line (&iter)) ? "" : "\n",
+ MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
signature, NULL);
gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
g_free (full_signature);
projects / modest / blobdiff