Fixes NB#66958

Added ellipsize to the details widget in the main window and to the account name column in the accounts dialog.

pmo-trunk-r3859

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 2232a2e..f3c9967 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1643,6 +1643,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
                                                          (const gchar *) gray_color_markup);
                label_w = gtk_label_new (NULL);
                gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
                gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (device_name);
                g_free (label);
@@ -1670,6 +1671,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
 
                        label_w = gtk_label_new (NULL);
                        gtk_label_set_markup (GTK_LABEL (label_w), label);
+                       gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
                        gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                        g_string_free (proto, TRUE);
                        g_free (label);
@@ -1683,6 +1685,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
                                         modest_tny_folder_store_get_message_count (folder_store));
        label_w = gtk_label_new (NULL);
        gtk_label_set_markup (GTK_LABEL (label_w), label);
+       gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
        gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
@@ -1693,6 +1696,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
                                         modest_tny_folder_store_get_folder_count (folder_store));
        label_w = gtk_label_new (NULL);
        gtk_label_set_markup (GTK_LABEL (label_w), label);
+       gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
        gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
@@ -1710,6 +1714,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
                
                label_w = gtk_label_new (NULL);
                gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
                gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (label);
        } else if (TNY_IS_ACCOUNT(folder_store)) {
@@ -1730,6 +1735,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
                                                 gray_color_markup, _("mcen_ti_lastupdated"), last_updated_string);
                label_w = gtk_label_new (NULL);
                gtk_label_set_markup (GTK_LABEL (label_w), label);
+               gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
                gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (label);
        }

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index 1f6f3ea..a634895 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -451,6 +451,8 @@ init_view (ModestAccountView *self)
 
        toggle_renderer = gtk_cell_renderer_toggle_new ();
        text_renderer = gtk_cell_renderer_text_new ();
+       g_object_set (G_OBJECT (text_renderer), "ellipsize", PANGO_ELLIPSIZE_END,
+                       "ellipsize-set", TRUE, NULL);
 
        /* the is_default column */
        g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
@@ -482,6 +484,7 @@ init_view (ModestAccountView *self)
        column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text",
                                                            MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, NULL);
        gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
+       gtk_tree_view_column_set_expand (column, TRUE);
        gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
                                                NULL, NULL);