From 20eb5531ebbb07a6f7407414915f8bdb2acbb88a Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 13 Jul 2009 13:21:13 +0200 Subject: Bug #586958 - Too long texts instartup wizard [PATCH 1/2] [restore-backup] Make intro text wrap The introductory text to the 'Restore from backup' page is too long, especially in some languages. This patch wraps the label as other labels in the startup wizard are wrapped. [PATCH 2/2] Don't break long labels unnecessarily A few strings had unnecessary end lines in them, which fight with the natural line-wrap algorithm. --- mail/mail-config.glade | 6 ++---- plugins/backup-restore/backup-restore.c | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mail/mail-config.glade b/mail/mail-config.glade index f435b95a63..68dd62c26a 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -186,8 +186,7 @@ Click "Forward" to begin. True - Please enter a descriptive name for this account in the space below. -This name will be used for display purposes only. + Please enter a descriptive name for this account in the space below. This name will be used for display purposes only. False False GTK_JUSTIFY_LEFT @@ -8892,8 +8891,7 @@ Quoted True The output of this script will be used as your -signature. The name you specify will be used -for display purposes only. +signature. The name you specify will be used for display purposes only. False False GTK_JUSTIFY_LEFT diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 860a70a3d5..79221d4573 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -286,7 +286,9 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data) page = gnome_druid_page_standard_new_with_vals (_("Restore from backup"), NULL, NULL); hbox = gtk_hbox_new (FALSE, 6); - label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \nIt also restores all your personal settings, mail filters etc.")); + label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc.")); + gtk_label_set_line_wrap ((GtkLabel *)label, TRUE); + gtk_label_set_single_line_mode ((GtkLabel *)label, FALSE); gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6); box = gtk_vbox_new (FALSE, 6); gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0); -- cgit v1.2.3