GNOME.org
 

[evolution] I#568 - Set GtkLabel's width-chars when using line-wrap

commit 3e8bfe0a724bb2e1cf1a24716ca0968bcd055bd3
Author: Milan Crha <mcrha redhat com>
Date:   Thu Aug 8 17:19:23 2019 +0200

    I#568 - Set GtkLabel's width-chars when using line-wrap
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/568

 src/calendar/gui/e-calendar-view.c                      | 2 ++
 src/calendar/gui/e-memo-table.c                         | 1 +
 src/calendar/gui/e-task-table.c                         | 3 +++
 src/e-util/e-alert-bar.c                                | 2 ++
 src/e-util/e-charset-combo-box.c                        | 1 +
 src/e-util/e-import-assistant.c                         | 7 +++++++
 src/e-util/e-passwords.c                                | 1 +
 src/mail/e-mail-account-manager.c                       | 2 ++
 src/mail/e-mail-config-confirm-page.c                   | 1 +
 src/mail/e-mail-config-identity-page.c                  | 1 +
 src/mail/e-mail-config-service-page.c                   | 1 +
 src/mail/e-mail-config-welcome-page.c                   | 1 +
 src/modules/backup-restore/e-mail-config-restore-page.c | 1 +
 src/modules/backup-restore/evolution-backup-tool.c      | 1 +
 src/plugins/email-custom-header/email-custom-header.c   | 1 +
 15 files changed, 26 insertions(+)
---
diff --git a/src/calendar/gui/e-calendar-view.c b/src/calendar/gui/e-calendar-view.c
index 00848dafec..470ea78176 100644
--- a/src/calendar/gui/e-calendar-view.c
+++ b/src/calendar/gui/e-calendar-view.c
@@ -1870,6 +1870,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
        tmp = g_markup_printf_escaped ("<b>%s</b>", tmp1);
        label = gtk_label_new (NULL);
        gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (label), 20);
        gtk_label_set_markup ((GtkLabel *) label, tmp);
 
        g_free (tmp1);
@@ -1921,6 +1922,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
                gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.0);
                gtk_label_set_markup ((GtkLabel *) label, tmp);
                gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (label), 20);
                gtk_label_set_max_width_chars ((GtkLabel *) label, 80);
                hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
                gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0);
diff --git a/src/calendar/gui/e-memo-table.c b/src/calendar/gui/e-memo-table.c
index 3fbd34965e..67a8d85704 100644
--- a/src/calendar/gui/e-memo-table.c
+++ b/src/calendar/gui/e-memo-table.c
@@ -538,6 +538,7 @@ memo_table_query_tooltip (GtkWidget *widget,
        l = gtk_label_new (NULL);
        tmp = g_markup_printf_escaped ("<b>%s</b>", summary);
        gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (l), 20);
        gtk_label_set_markup (GTK_LABEL (l), tmp);
        gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
        w = gtk_event_box_new ();
diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c
index d1e5a24425..88e946b178 100644
--- a/src/calendar/gui/e-task-table.c
+++ b/src/calendar/gui/e-task-table.c
@@ -703,6 +703,7 @@ task_table_query_tooltip (GtkWidget *widget,
        l = gtk_label_new (NULL);
        tmp = g_markup_printf_escaped ("<b>%s</b>", summary);
        gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (l), 20);
        gtk_label_set_markup (GTK_LABEL (l), tmp);
        gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
        w = gtk_event_box_new ();
@@ -760,6 +761,7 @@ task_table_query_tooltip (GtkWidget *widget,
                gtk_misc_set_alignment ((GtkMisc *) l, 0.0, 0.0);
                gtk_label_set_markup ((GtkLabel *) l, tmp);
                gtk_label_set_line_wrap ((GtkLabel *) l, TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (l), 20);
                gtk_label_set_max_width_chars ((GtkLabel *) l, 80);
                gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
                g_free (tmp);
@@ -893,6 +895,7 @@ task_table_query_tooltip (GtkWidget *widget,
        if (tmp2->len) {
                l = gtk_label_new (tmp2->str);
                gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (l), 20);
                gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
                gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
 
diff --git a/src/e-util/e-alert-bar.c b/src/e-util/e-alert-bar.c
index 5f1a8f82f5..abdc9cc5a8 100644
--- a/src/e-util/e-alert-bar.c
+++ b/src/e-util/e-alert-bar.c
@@ -292,6 +292,7 @@ alert_bar_constructed (GObject *object)
        widget = gtk_label_new (NULL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
        gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        priv->primary_label = widget;
@@ -300,6 +301,7 @@ alert_bar_constructed (GObject *object)
        widget = gtk_label_new (NULL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
        gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        priv->secondary_label = widget;
diff --git a/src/e-util/e-charset-combo-box.c b/src/e-util/e-charset-combo-box.c
index c6211a3d3d..444e2eb224 100644
--- a/src/e-util/e-charset-combo-box.c
+++ b/src/e-util/e-charset-combo-box.c
@@ -116,6 +116,7 @@ charset_combo_box_run_dialog (ECharsetComboBox *combo_box)
 
        widget = gtk_label_new (_("Enter the character set to use"));
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        gtk_widget_show (widget);
diff --git a/src/e-util/e-import-assistant.c b/src/e-util/e-import-assistant.c
index 81ffb845c8..53b88aa3df 100644
--- a/src/e-util/e-import-assistant.c
+++ b/src/e-util/e-import-assistant.c
@@ -261,6 +261,7 @@ import_assistant_file_page_init (EImportAssistant *import_assistant)
 
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
        gtk_widget_show (widget);
 
@@ -344,6 +345,7 @@ import_assistant_destination_page_init (EImportAssistant *import_assistant)
 
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
        gtk_widget_show (widget);
 
@@ -369,6 +371,7 @@ import_assistant_type_page_init (EImportAssistant *import_assistant)
 
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
        gtk_widget_show (widget);
 
@@ -408,6 +411,7 @@ import_assistant_selection_page_init (EImportAssistant *import_assistant)
 
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
        gtk_widget_show (widget);
 
@@ -458,6 +462,7 @@ import_assistant_simple_page_init (EImportAssistant *import_assistant)
 
        widget = gtk_label_new ("");
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
        gtk_widget_show (widget);
        import_assistant->priv->simple_page.actionlabel = widget;
@@ -541,6 +546,7 @@ prepare_intelligent_page (GtkAssistant *assistant,
 
                widget = gtk_label_new (text);
                gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (widget), 20);
                gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
                gtk_widget_show (widget);
 
@@ -1339,6 +1345,7 @@ import_assistant_construct (EImportAssistant *import_assistant)
                /* Start page */
                page = gtk_label_new ("");
                gtk_label_set_line_wrap (GTK_LABEL (page), TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (page), 20);
                gtk_misc_set_alignment (GTK_MISC (page), 0.0, 0.5);
                gtk_misc_set_padding (GTK_MISC (page), 12, 12);
                gtk_label_set_text (GTK_LABEL (page), _(
diff --git a/src/e-util/e-passwords.c b/src/e-util/e-passwords.c
index 2247c474e6..2d52752ab0 100644
--- a/src/e-util/e-passwords.c
+++ b/src/e-util/e-passwords.c
@@ -511,6 +511,7 @@ ep_ask_password (EPassMsg *msg)
        /* Password Label */
        widget = gtk_label_new (NULL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_label_set_markup (GTK_LABEL (widget), msg->prompt);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        g_object_set (
diff --git a/src/mail/e-mail-account-manager.c b/src/mail/e-mail-account-manager.c
index 06488b491b..9de737d017 100644
--- a/src/mail/e-mail-account-manager.c
+++ b/src/mail/e-mail-account-manager.c
@@ -144,6 +144,7 @@ mail_account_manager_build_goa_message (EMailAccountManager *manager)
                _("This account was created through "
                "the Online Accounts service."));
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
        gtk_widget_show (widget);
@@ -231,6 +232,7 @@ mail_account_manager_build_uoa_message (EMailAccountManager *manager)
                _("This account was created through "
                "the Online Accounts service."));
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
        gtk_widget_show (widget);
diff --git a/src/mail/e-mail-config-confirm-page.c b/src/mail/e-mail-config-confirm-page.c
index ad32e738ad..1ee51f60bc 100644
--- a/src/mail/e-mail-config-confirm-page.c
+++ b/src/mail/e-mail-config-confirm-page.c
@@ -115,6 +115,7 @@ mail_config_confirm_page_constructed (GObject *object)
 
        widget = gtk_label_new (NULL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (main_box), widget, FALSE, FALSE, 0);
        gtk_widget_show (widget);
diff --git a/src/mail/e-mail-config-identity-page.c b/src/mail/e-mail-config-identity-page.c
index ebd14234cc..66d7cdcabb 100644
--- a/src/mail/e-mail-config-identity-page.c
+++ b/src/mail/e-mail-config-identity-page.c
@@ -516,6 +516,7 @@ mail_config_identity_page_constructed (GObject *object)
                 "you send.");
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (main_box), widget, FALSE, FALSE, 0);
 
diff --git a/src/mail/e-mail-config-service-page.c b/src/mail/e-mail-config-service-page.c
index be48fcca2d..be37dcc4ed 100644
--- a/src/mail/e-mail-config-service-page.c
+++ b/src/mail/e-mail-config-service-page.c
@@ -538,6 +538,7 @@ mail_config_service_page_constructed (GObject *object)
 
        widget = gtk_label_new (NULL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 2, 1);
        page->priv->desc_label = widget;  /* not referenced */
diff --git a/src/mail/e-mail-config-welcome-page.c b/src/mail/e-mail-config-welcome-page.c
index af9781fb45..b2e8d6b480 100644
--- a/src/mail/e-mail-config-welcome-page.c
+++ b/src/mail/e-mail-config-welcome-page.c
@@ -122,6 +122,7 @@ mail_config_welcome_page_constructed (GObject *object)
        widget = gtk_label_new (NULL);
        gtk_widget_set_valign (widget, GTK_ALIGN_FILL);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (main_box), widget, TRUE, TRUE, 0);
        gtk_widget_show (widget);
diff --git a/src/modules/backup-restore/e-mail-config-restore-page.c 
b/src/modules/backup-restore/e-mail-config-restore-page.c
index abf4162a74..7c4a9dca42 100644
--- a/src/modules/backup-restore/e-mail-config-restore-page.c
+++ b/src/modules/backup-restore/e-mail-config-restore-page.c
@@ -164,6 +164,7 @@ mail_config_restore_page_constructed (GObject *object)
                 "mail filters, etc.");
        widget = gtk_label_new (text);
        gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (widget), 20);
        gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (main_box), widget, FALSE, FALSE, 0);
        gtk_widget_show (widget);
diff --git a/src/modules/backup-restore/evolution-backup-tool.c 
b/src/modules/backup-restore/evolution-backup-tool.c
index c8b80f004d..da84ef50c5 100644
--- a/src/modules/backup-restore/evolution-backup-tool.c
+++ b/src/modules/backup-restore/evolution-backup-tool.c
@@ -1005,6 +1005,7 @@ main (gint argc,
                        "on the amount of data in your account."), NULL);
                widget = gtk_label_new (markup);
                gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+               gtk_label_set_width_chars (GTK_LABEL (widget), 20);
                gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
                gtk_widget_show (widget);
                g_free (markup);
diff --git a/src/plugins/email-custom-header/email-custom-header.c 
b/src/plugins/email-custom-header/email-custom-header.c
index 788d110e75..3c43a3c3c9 100644
--- a/src/plugins/email-custom-header/email-custom-header.c
+++ b/src/plugins/email-custom-header/email-custom-header.c
@@ -810,6 +810,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
        gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, TRUE, 0);
        gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER);
        gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE);
+       gtk_label_set_width_chars (GTK_LABEL (label1), 20);
 
        header_configuration_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
        gtk_widget_show (header_configuration_box);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]