GtkWidget *priority_icon;
GtkWidget *subject_box;
GtkWidget *send_button;
+ GtkWidget *bottom_send_button;
+ GtkWidget *bottom_send_button_container;
GtkWidget *cc_caption;
GtkWidget *bcc_caption;
GtkRequisition *req,
gpointer user_data)
{
+ ModestMsgEditWindowPrivate *priv;
+ GtkAdjustment *vadj;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(user_data);
+
/* Make sure the body always get at least 70 pixels */
if (req->height < 70)
req->height = 70;
+
+ vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
+ if (priv->header_box->allocation.height + req->height > GTK_WIDGET (user_data)->allocation.height) {
+ if (!GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
+ gtk_widget_show (priv->bottom_send_button_container);
+ }
+ } else {
+ if (GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
+ gtk_widget_hide (priv->bottom_send_button_container);
+ }
+ }
}
static void
g_signal_connect (G_OBJECT (priv->send_button), "clicked",
G_CALLBACK (modest_ui_actions_on_send), obj);
+ g_signal_connect (G_OBJECT (priv->bottom_send_button), "clicked",
+ G_CALLBACK (modest_ui_actions_on_send), obj);
+
g_signal_connect (G_OBJECT (priv->from_field), "value-changed",
G_CALLBACK (from_field_changed), obj);
gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon);
gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1);
+ priv->bottom_send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER);
+ gtk_container_add (GTK_CONTAINER (priv->bottom_send_button), send_icon);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->bottom_send_button), 148, -1);
+
+ priv->bottom_send_button_container = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (priv->bottom_send_button_container);
+ gtk_box_pack_end (GTK_BOX (priv->bottom_send_button_container), priv->bottom_send_button, FALSE, FALSE, 0);
+ gtk_widget_show (priv->bottom_send_button_container);
+
g_object_unref (title_size_group);
g_object_unref (value_size_group);
priv->find_toolbar = hildon_find_toolbar_new (NULL);
gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
-/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
-
priv->pannable = hildon_pannable_area_new ();
g_object_set (G_OBJECT (priv->pannable), "hscrollbar-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);
+ gtk_box_pack_start (GTK_BOX (main_vbox), priv->bottom_send_button_container, FALSE, FALSE, 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));
-
+
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);
/* Set window icon */
- window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
+ window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
if (window_icon) {
gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
g_object_unref (window_icon);
- }
+ }
}
-
+
static void
modest_msg_edit_window_disconnect_signals (ModestWindow *window)
{
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);
modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->send_button,
G_CALLBACK (modest_ui_dimming_rules_on_send),
MODEST_WINDOW (obj));
+ modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->bottom_send_button,
+ G_CALLBACK (modest_ui_dimming_rules_on_send),
+ MODEST_WINDOW (obj));
/* Insert dimming rules group for this window */
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);