X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=a286d1ed95b0b0a11b7a49bfeddb1920c9694a41;hp=8af8bcd545147620d0f64df2550c6d899e8d4b09;hb=af6f1ea3eba1578741ee6be2ea4328fda814e6a3;hpb=9be03ff09f3ae25ef904bfb1c7bcb4f637d0c57b

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 8af8bcd..a286d1e 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -802,6 +802,7 @@ init_window (ModestMsgEditWindow *obj)
 #endif
 	GtkWidget *from_send_hbox;
 	GtkWidget *send_icon;
+	GtkWidget *attachments_label;
 
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
@@ -906,16 +907,20 @@ init_window (ModestMsgEditWindow *obj)
 		 _("mail_va_hotfix1"), priv->bcc_field);
 	subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
 							       _("mail_va_subject"), FALSE, priv->subject_box);
-	priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group,
+	priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (NULL, NULL,
 											_("mail_va_attachment"), 
 											FALSE,
 											priv->attachments_view,
 											HILDON_SIZE_AUTO_WIDTH |
 											HILDON_SIZE_AUTO_HEIGHT);
+	attachments_label = modest_maemo_utils_captioned_get_label_widget (priv->attachments_caption);
+	hildon_gtk_widget_set_theme_size (attachments_label, HILDON_SIZE_AUTO_HEIGHT);
+
+
 	priv->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->send_button), send_icon);
-	gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 118, -1);
+	gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1);
 
 	g_object_unref (title_size_group);
 	g_object_unref (value_size_group);
@@ -1894,16 +1899,20 @@ modest_msg_edit_window_set_format (ModestMsgEditWindow *self,
 				   ModestMsgEditFormat format)
 {
 	ModestMsgEditWindowPrivate *priv;
+	ModestWindowPrivate *parent_priv;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+	parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
 
 	switch (format) {
 	case MODEST_MSG_EDIT_FORMAT_HTML:
 		wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+		if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar);
 		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);
 		break;
 	default:
 		g_return_if_reached ();
@@ -2931,17 +2940,27 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self,
 				     gboolean show_toolbar)
 {
 	ModestWindowPrivate *parent_priv;
+	ModestMsgEditWindowPrivate *priv;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
 	/* We can not just use the code of
 	   modest_msg_edit_window_setup_toolbar because it has a
 	   mixture of both initialization and creation code. */
-	if (show_toolbar)
-		gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-	else
+	if (show_toolbar) {
+		gint current_format;
+		current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
+			? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT;
+		if (current_format == MODEST_FILE_FORMAT_PLAIN_TEXT) {
+			gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+		} else {
+			gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+		}
+	} else {
 		gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+	}
 }
 
 void
@@ -3006,6 +3025,16 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 	current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
 		? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT;
 
+	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:
@@ -3021,6 +3050,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 			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);
 			} 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);
@@ -4288,6 +4318,7 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz
 	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_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)