diff options
| -rw-r--r-- | widgets/table/e-table-config.c | 78 | ||||
| -rw-r--r-- | widgets/table/e-table-config.glade | 8 |
2 files changed, 46 insertions, 40 deletions
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index eec0de388f..1745c181ed 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -133,18 +133,18 @@ config_sort_info_update (ETableConfig *config) ETableColumnSpecification **column; for (column = config->spec->columns; *column; column++) { - if (col.column == (*column)->model_col) { - g_string_append (res, (*column)->title_); - g_string_append_c (res, ' '); - g_string_append ( - res, - col.ascending ? - _("(Ascending)") : _("(Descending)")); - items++; - if (items > 4) - g_string_append_c (res, '\n'); - break; - } + if (col.column != (*column)->model_col) + continue; + + g_string_append (res, (*column)->title_); + g_string_append_c (res, ' '); + g_string_append ( + res, + col.ascending ? + _("(Ascending)") : _("(Descending)")); + items++; + if (items > 4) + g_string_append_c (res, '\n'); } } if (res->str [0] == 0) @@ -170,19 +170,19 @@ config_group_info_update (ETableConfig *config) ETableColumnSpecification **column; for (column = config->spec->columns; *column; column++) { - if (col.column == (*column)->model_col) { - g_string_append (res, (*column)->title_); - g_string_append_c (res, ' '); - g_string_append ( - res, - col.ascending ? - _("(Ascending)") : _("(Descending)")); - - items++; - if (items > 4) - g_string_append_c (res, '\n'); - break; - } + if (col.column != (*column)->model_col) + continue; + + g_string_append (res, (*column)->title_); + g_string_append_c (res, ' '); + g_string_append ( + res, + col.ascending ? + _("(Ascending)") : _("(Descending)")); + + items++; + if (items > 4) + g_string_append_c (res, '\n'); } } if (res->str [0] == 0) @@ -197,18 +197,24 @@ config_fields_info_update (ETableConfig *config) { ETableColumnSpecification **column; GString *res = g_string_new (""); - int items = 0; - - for (column = config->spec->columns; *column; *column++){ - g_string_append (res, (*column)->title_); - if (column [1]) - g_string_append (res, ", "); - items++; - - if (items > 5) - g_string_append_c (res, '\n'); + int i, items = 0; + + for (i = 0; i < config->state->col_count; i++){ + for (column = config->spec->columns; *column; *column++){ + + if (config->state->columns [i] != (*column)->model_col) + continue; + + g_string_append (res, (*column)->title_); + if (column [1]) + g_string_append (res, ", "); + items++; + + if (items > 5) + g_string_append_c (res, '\n'); + } } - + gtk_label_set_text (GTK_LABEL (config->fields_label), res->str); g_string_free (res, TRUE); } diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade index ba1c151322..b210a4d2da 100644 --- a/widgets/table/e-table-config.glade +++ b/widgets/table/e-table-config.glade @@ -1880,7 +1880,7 @@ <name>label-group</name> <label></label> <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> + <wrap>True</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> @@ -1906,7 +1906,7 @@ <name>label-sort</name> <label></label> <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> + <wrap>True</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> @@ -1931,8 +1931,8 @@ <class>GtkLabel</class> <name>label-fields</name> <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>True</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> |