GtkTextIter *iter,
GtkTextMark *mark,
ModestMsgEditWindow *userdata);
+static void on_show_toolbar_button_toggled (GtkWidget *button,
+ ModestMsgEditWindow *window);
static void on_message_settings (GtkAction *action,
ModestMsgEditWindow *window);
static void setup_menu (ModestMsgEditWindow *self);
GtkWidget *app_menu;
GtkWidget *cc_button;
GtkWidget *bcc_button;
+ GtkWidget *show_toolbar_button;
GtkWidget *max_chars_banner;
GtkWidget *brand_icon;
GtkWidget *brand_label;
GtkWidget *brand_container;
+
+ TnyList *custom_header_pairs;
};
#define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MSG_EDIT_WINDOW, \
ModestMsgEditWindowPrivate))
/* globals */
-static GtkWindowClass *parent_class = NULL;
+static ModestWindowParentClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
/* static guint signals[LAST_SIGNAL] = {0}; */
priv->references = NULL;
priv->in_reply_to = NULL;
priv->max_chars_banner = NULL;
+ priv->custom_header_pairs = TNY_LIST (tny_simple_list_new ());
if (!is_wp_text_buffer_started) {
is_wp_text_buffer_started = TRUE;
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);
+ if (GTK_IS_WINDOW (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);
g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))),
* that uses it, because the ModestSelectorPicker uses the ID opaquely,
* so it can't know how to manage its memory. */
priv->from_field = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
- NULL, g_str_equal);
+ NULL, g_str_equal, FALSE);
modest_selector_set_value_max_chars (priv->from_field, MAX_FROM_VALUE);
if (GTK_IS_COMBO_BOX (priv->from_field)) {
from_caption = modest_toolkit_utils_create_captioned (title_size_group, NULL,
NULL);
gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE);
-/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
-
priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
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_alignment_set_padding (GTK_ALIGNMENT (window_align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), MODEST_MARGIN_HALF, 0,
+ MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
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->scrollable, TRUE, TRUE, 0);
}
-
+
static void
modest_msg_edit_window_disconnect_signals (ModestWindow *window)
{
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
+ g_object_unref (priv->custom_header_pairs);
+
if (priv->max_chars_banner) {
g_object_weak_unref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, obj);
priv->max_chars_banner = FALSE;
TnyFolder *msg_folder;
gboolean is_html = FALSE;
gboolean field_view_set;
+ TnyList *orig_header_pairs;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
g_return_if_fail (TNY_IS_MSG (msg));
g_object_unref (msg_folder);
}
+ orig_header_pairs = TNY_LIST (tny_simple_list_new ());
+ tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), orig_header_pairs);
+ modest_msg_edit_window_set_custom_header_pairs (self, orig_header_pairs);
+ g_object_unref (orig_header_pairs);
+
g_free (to);
g_free (subject);
g_free (cc);
gint size_index;
gint font_index;
GtkWidget *sizes_menu;
- GtkWidget *fonts_menu;
gchar *markup;
GtkWidget *arrow;
GtkWidget *hbox;
#ifndef MODEST_TOOLKIT_HILDON2
GSList *radio_group, *node;
+ GtkWidget *fonts_menu;
#endif
/* Toolbar */
tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+ tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsInsertImage");
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
/* Explicitelly show all the toolbar (a normal gtk_widget_show
will not show the tool items added to the placeholders) */
/* Set the no show all *after* showing all items. We do not
want the toolbar to be shown with a show all because it
- could go agains the gconf setting regarding showing or not
+ could go against the gconf setting regarding showing or not
the toolbar of the editor window */
gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
}
g_object_unref (att_iter);
data->priority_flags = priv->priority_flags;
+ data->custom_header_pairs = tny_list_copy (priv->custom_header_pairs);
return data;
}
g_free (data->account_name);
g_free (data->references);
g_free (data->in_reply_to);
+
+ g_object_unref (data->custom_header_pairs);
if (data->draft_msg != NULL) {
g_object_unref (data->draft_msg);
case MODEST_MSG_EDIT_FORMAT_HTML:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
update_signature (self, priv->last_from_account, priv->last_from_account);
- if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar);
+ if (parent_priv->toolbar)
+ on_show_toolbar_button_toggled (priv->show_toolbar_button,
+ MODEST_MSG_EDIT_WINDOW (self));
break;
case MODEST_MSG_EDIT_FORMAT_TEXT:
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)
+ on_show_toolbar_button_toggled (priv->show_toolbar_button,
+ MODEST_MSG_EDIT_WINDOW (self));
break;
default:
g_return_if_reached ();
} else {
gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
}
+ modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, show_toolbar, NULL);
+ if (modest_togglable_get_active (priv->show_toolbar_button) != show_toolbar) {
+ modest_togglable_set_active (priv->show_toolbar_button, show_toolbar);
+ }
}
void
remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
update_signature (window, priv->last_from_account, priv->last_from_account);
if (parent_priv->toolbar)
- gtk_widget_show (parent_priv->toolbar);
+ on_show_toolbar_button_toggled (priv->show_toolbar_button,
+ MODEST_MSG_EDIT_WINDOW (window));
break;
case MODEST_FILE_FORMAT_PLAIN_TEXT:
{
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);
+ on_show_toolbar_button_toggled (priv->show_toolbar_button,
+ MODEST_MSG_EDIT_WINDOW (window));
} 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);
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);
+ on_show_toolbar_button_toggled (priv->show_toolbar_button,
+ MODEST_MSG_EDIT_WINDOW (window));
}
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
{
ModestMsgEditWindowPrivate *priv = NULL;
GSList *address_list = NULL;
+ gboolean no_to, no_cc, no_bcc;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
/* check if there's no recipient added */
- if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) &&
- (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) &&
- (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) {
+ no_to = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)));
+ no_cc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field)));
+ no_bcc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field)));
+
+
+ if (no_to && no_cc && no_bcc) {
/* no recipient contents, then select contacts */
modest_msg_edit_window_open_addressbook (window, NULL);
return FALSE;
/* Check names */
g_object_ref (window);
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
+ if (!no_to && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
(add_to_addressbook) ? &address_list : NULL)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
g_object_unref (window);
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
+ if (!no_cc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
(add_to_addressbook) ? &address_list : NULL)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
g_object_unref (window);
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
+ if (!no_bcc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
(add_to_addressbook) ? &address_list : NULL)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
g_object_unref (window);
}
static void
+on_show_toolbar_button_toggled (GtkWidget *button,
+ ModestMsgEditWindow *window)
+{
+ g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+ modest_msg_edit_window_show_toolbar (MODEST_WINDOW (window),
+ modest_togglable_get_active (button));
+}
+
+static void
on_cc_button_toggled (GtkWidget *button,
ModestMsgEditWindow *window)
{
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
/* Settings menu buttons */
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names),
- NULL);
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
-
priv->cc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
_("mcen_me_editor_showcc"));
modest_togglable_set_active (priv->cc_button,
g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
+ priv->show_toolbar_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
+ _("mcen_bd_show_toolbar"));
+ modest_togglable_set_active (priv->show_toolbar_button,
+ FALSE);
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->show_toolbar_button,
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar));
+ gtk_widget_show (priv->show_toolbar_button);
+ g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled",
+ G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self);
+
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (on_message_settings),
+ NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names),
+ NULL);
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (on_message_settings),
- NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
+
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
NULL);
+
}
static void
}
static GtkWidget *
-_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
- const gchar *label, GtkWidget *control)
+_create_addressbook_box (GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group,
+ const gchar *label,
+ GtkWidget *control)
{
GtkWidget *abook_button;
GtkWidget *align;
GtkWidget *box;
- GtkWidget *label_widget;
+ GtkWidget *label_widget;
box = gtk_hbox_new (FALSE, 0);
- align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+#ifndef MODEST_TOOLKIT_HILDON2
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+#else
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT);
+#endif
#ifdef MODEST_TOOLKIT_HILDON2
- abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
#else
- abook_button = gtk_button_new ();
+ abook_button = gtk_button_new ();
#endif
label_widget = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
- gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
- gtk_container_add (GTK_CONTAINER (align), abook_button);
- gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+ gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
+
+ gtk_container_add (GTK_CONTAINER (align), abook_button);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+#endif
gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0);
if (title_size_group)
+#ifdef MODEST_TOOLKIT_HILDON2
gtk_size_group_add_widget (title_size_group, label_widget);
+#else
+ gtk_size_group_add_widget (title_size_group, abook_button);
+#endif
if (value_size_group)
gtk_size_group_add_widget (value_size_group, control);
- g_signal_connect (G_OBJECT (abook_button), "clicked",
- G_CALLBACK (emit_open_addressbook), control);
-
- return box;
+ g_signal_connect (G_OBJECT (abook_button), "clicked",
+ G_CALLBACK (emit_open_addressbook), control);
+
+ return box;
}
static void
else
return TRUE;
}
+
+void
+modest_msg_edit_window_set_custom_header_pairs (ModestMsgEditWindow *self,
+ TnyList *header_pairs)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+ g_return_if_fail (TNY_IS_LIST (header_pairs));
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+ g_object_unref (priv->custom_header_pairs);
+ priv->custom_header_pairs = tny_list_copy (header_pairs);
+}
projects / modest / blobdiff