[anjal] Set saner sizes for druid



commit 55c4d51607f0a48aebefd985751aa1e17908b954
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Thu May 21 13:04:07 2009 +0530

    Set saner sizes for druid
---
 src/mail-account-view.c |   19 ++++++++++++++++---
 src/mail-account-view.h |    1 +
 src/mail-view.c         |    5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/mail-account-view.c b/src/mail-account-view.c
index 6be7e6a..fbe2916 100644
--- a/src/mail-account-view.c
+++ b/src/mail-account-view.c
@@ -319,9 +319,9 @@ create_review (MailAccountView *view)
 	return table;
 }
 
-#define IDENTITY_DETAIL N_("To use the email application you'll need to setup an account. Put your email address and password in below \nand we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well.")
+#define IDENTITY_DETAIL N_("To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well.")
 
-#define RECEIVE_DETAIL N_("Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried \n to make a start with the details you just entered but you may need to change them.")
+#define RECEIVE_DETAIL N_("Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried  to make a start with the details you just entered but you may need to change them.")
 
 #define SEND_DETAIL N_("Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure.")
 
@@ -427,6 +427,9 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
 	gtk_widget_show(box);
 	gtk_box_pack_start(page->box, box, FALSE, FALSE, 12);
 	tmp = gtk_label_new (mail_account_pages[type].detail);
+	gtk_widget_set_size_request (tmp, 600, -1);
+	gtk_label_set_line_wrap (tmp, TRUE);
+	gtk_label_set_line_wrap_mode (tmp, PANGO_WRAP_WORD);
 	gtk_widget_show(tmp);
 	gtk_box_pack_start(box, tmp, FALSE, FALSE, 12);
 
@@ -490,7 +493,7 @@ mail_account_view_construct (MailAccountView *view)
 	view->page_widget = gtk_vbox_new (FALSE, 3);
 	gtk_scrolled_window_add_with_viewport (view->scroll, view->page_widget);
 	gtk_widget_show_all (view->scroll);
-	
+	gtk_widget_set_size_request (view, -1, 300);
 	for (i=0; i<MAV_LAST; i++) {
 		view->pages[i] = mav_construct_page (view, i);
 		view->pages[i]->done = FALSE;
@@ -577,3 +580,13 @@ mail_account_view_get_tab_widget(MailAccountView *mcv)
 	return tab_label;
 	
 }
+
+void
+mail_account_view_activate (MailAccountView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act)
+{
+	 if (!folder_tree || !check_mail || !sort_by)
+		  return;
+	 gtk_widget_hide (folder_tree);
+	 gtk_widget_set_sensitive (check_mail, act);
+	 gtk_widget_set_sensitive (sort_by, act);
+}
diff --git a/src/mail-account-view.h b/src/mail-account-view.h
index c52c752..72637c6 100644
--- a/src/mail-account-view.h
+++ b/src/mail-account-view.h
@@ -85,4 +85,5 @@ typedef struct _MailAccountViewClass {
 
 MailAccountView *mail_account_view_new (EAccount *account);
 GtkWidget * mail_account_view_get_tab_widget(MailAccountView *mcv);
+void mail_account_view_activate (MailAccountView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act);
 #endif
diff --git a/src/mail-view.c b/src/mail-view.c
index cae04d9..dc3ac56 100644
--- a/src/mail-view.c
+++ b/src/mail-view.c
@@ -114,6 +114,8 @@ mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpoi
 			 mail_conv_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 		else if (child->type == MAIL_VIEW_FOLDER) /* For some reason, Im not able to get right type */
 			 mail_folder_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
+		else if (child->type == MAIL_VIEW_ACCOUNT)
+			mail_account_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 		
 		
 #ifdef MV_NEW_TAB		
@@ -233,6 +235,8 @@ mv_close_mcv (MailFolderView *mfv, MailView *mv)
 		 mail_conv_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_FOLDER)  /* For some reason, the child type for mfv isn't getting right: FIXME later*/
 		 mail_folder_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
+	else if (child->type == MAIL_VIEW_ACCOUNT)
+		mail_account_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	
 }
@@ -351,6 +355,7 @@ mail_view_add_account (MailView *mv)
 	gtk_notebook_set_tab_reorderable (mv, msv, TRUE);
 	gtk_notebook_set_current_page (mv, position);
 	gtk_notebook_set_tab_label_packing (mv, msv, FALSE, FALSE, 0);
+	mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	return msv;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]