From 1550eff338a1194a90f3ad2948e4f381098c8a20 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 20 Jul 2009 17:56:18 +0530 Subject: Add option to hide 'From' for Anjal. --- composer/e-composer-header-table.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index b47a15b115..cbb0185c16 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -171,7 +171,11 @@ composer_header_table_notify_widget (GtkWidget *widget, { GtkWidget *parent; - parent = gtk_widget_get_parent (widget); + if (composer_lite) { + parent = gtk_widget_get_parent (widget); + parent = g_object_get_data ((GObject *)parent, "pdata"); + } else + parent = gtk_widget_get_parent (widget); g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (parent)); g_object_notify (G_OBJECT (parent), property_name); } @@ -532,12 +536,23 @@ composer_header_table_constructor (GType type, G_OBJECT (priv->signature_combo_box), "visible"); /* Now add the signature stuff. */ - gtk_table_attach ( - GTK_TABLE (object), priv->signature_label, - 2, 3, ii, ii + 1, 0, 0, 0, 3); - gtk_table_attach ( - GTK_TABLE (object), priv->signature_combo_box, - 3, 4, ii, ii + 1, 0, 0, 0, 3); + if (!composer_lite) { + gtk_table_attach ( + GTK_TABLE (object), priv->signature_label, + 2, 3, ii, ii + 1, 0, 0, 0, 3); + gtk_table_attach ( + GTK_TABLE (object), priv->signature_combo_box, + 3, 4, ii, ii + 1, composer_lite ? GTK_FILL: 0, 0, 0, 3); + } else { + GtkWidget *box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start ((GtkBox *)box, priv->signature_label, FALSE, FALSE, 4); + gtk_box_pack_end ((GtkBox *)box, priv->signature_combo_box, TRUE, TRUE, 0); + g_object_set_data ((GObject *)box, "pdata", object); + gtk_table_attach ( + GTK_TABLE (object), box, + 3, 4, ii, ii + 1, GTK_FILL, 0, 0, 3); + gtk_widget_show (box); + } if (composer_lite) { ii = E_COMPOSER_HEADER_TO; @@ -924,7 +939,7 @@ composer_header_table_init (EComposerHeaderTable *table) table->priv->actions_container = (GtkHBox *)gtk_hbox_new (FALSE, 6); - header = e_composer_from_header_new (_("Fr_om:")); + header = e_composer_from_header_new_with_action (_("Fr_om:"), _("From")); composer_header_table_bind_header ("account", "changed", header); composer_header_table_bind_header ("account-list", "refreshed", header); composer_header_table_bind_header ("account-name", "changed", header); -- cgit From 631da1b6baf2204ebb844a1d3962c2c7d811eb41 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 22 Jul 2009 19:05:05 +0530 Subject: Fix composer for Anjal. --- composer/e-composer-header-table.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index cbb0185c16..2b040628a0 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -506,9 +506,21 @@ composer_header_table_constructor (GType type, gtk_table_attach ( GTK_TABLE (object), priv->headers[ii]->title_widget, 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, 3); - gtk_table_attach ( - GTK_TABLE (object), priv->headers[ii]->input_widget, - 1, 4, ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); + if (composer_lite && ii == E_COMPOSER_HEADER_TO) { + GtkWidget *box = gtk_hbox_new (FALSE, 0); + + gtk_box_pack_start ((GtkBox *)box, priv->headers[ii]->input_widget, TRUE, TRUE, 3); + gtk_box_pack_start ((GtkBox *)box, (GtkWidget *)priv->actions_container, FALSE, FALSE, 0); + gtk_widget_show (box); + gtk_table_attach ( + GTK_TABLE (object), box, + 1, 4, ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); + + } else { + gtk_table_attach ( + GTK_TABLE (object), priv->headers[ii]->input_widget, + 1, 4, ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); + } if (composer_lite && priv->headers[ii]->action_widget) { /* Pack the widgets to the end. Helps formatting when hiding the From field */ gtk_box_pack_end ((GtkBox *)priv->actions_container, priv->headers[ii]->action_widget, @@ -551,20 +563,7 @@ composer_header_table_constructor (GType type, gtk_table_attach ( GTK_TABLE (object), box, 3, 4, ii, ii + 1, GTK_FILL, 0, 0, 3); - gtk_widget_show (box); - } - - if (composer_lite) { - ii = E_COMPOSER_HEADER_TO; - - /* Leave room for the action buttons. */ - gtk_container_child_set ( - GTK_CONTAINER (object), - priv->headers[ii]->input_widget, - "right-attach", 2, NULL); - - gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, - E_COMPOSER_HEADER_TO + 1, GTK_FILL, 0, 0, 3); + gtk_widget_hide (box); } return object; -- cgit From 5d4e8994e83c9ab650981c332eaef57f4fab2788 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 23 Jul 2009 14:26:45 +0530 Subject: Fix a crit warning for Anjal --- composer/e-composer-header-table.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 2b040628a0..ed999bf019 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -160,7 +160,11 @@ composer_header_table_notify_header (EComposerHeader *header, { GtkWidget *parent; - parent = gtk_widget_get_parent (header->input_widget); + if (strcmp (property_name, "destinations-to") == 0) { + parent = g_object_get_data((GObject *)header->input_widget, "parent"); + } else { + parent = gtk_widget_get_parent (header->input_widget); + } g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (parent)); g_object_notify (G_OBJECT (parent), property_name); } @@ -508,7 +512,7 @@ composer_header_table_constructor (GType type, 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, 3); if (composer_lite && ii == E_COMPOSER_HEADER_TO) { GtkWidget *box = gtk_hbox_new (FALSE, 0); - + g_object_set_data ((GObject *)priv->headers[ii]->input_widget, "parent", object); gtk_box_pack_start ((GtkBox *)box, priv->headers[ii]->input_widget, TRUE, TRUE, 3); gtk_box_pack_start ((GtkBox *)box, (GtkWidget *)priv->actions_container, FALSE, FALSE, 0); gtk_widget_show (box); -- cgit From 30ac043b6ef2ad85de31c8dfbd87ac5a63d58dd8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 26 Jul 2009 08:18:59 -0400 Subject: Coding style and whitespace cleanups. --- composer/e-composer-header-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer/e-composer-header-table.c') diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index ed999bf019..55dc6a65a0 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -519,7 +519,7 @@ composer_header_table_constructor (GType type, gtk_table_attach ( GTK_TABLE (object), box, 1, 4, ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); - + } else { gtk_table_attach ( GTK_TABLE (object), priv->headers[ii]->input_widget, -- cgit