aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-importer.c11
-rw-r--r--shell/e-shell-startup-wizard.c13
3 files changed, 23 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 67a50256dd..720fb7a0a2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-05 Anna Marie Dirks <anna@ximian.com>
+
+ * e-shell-importer.c (prepare_intelligent_page): Fixed spacing and
+ alignment probelms. (See bug #14281)
+
+ * e-shell-startup-wizard.c (prepare_importer_page): Fixed
+ spacing and alignment problems. (See bug #14281)
+
2001-11-05 Dan Winship <danw@ximian.com>
* e-storage-set-view.c (set_e_shortcut_selection): Set the
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index dcd48a054d..2dcb3b68bf 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -139,7 +139,7 @@ static struct {
char *text;
} info[] = {
{ "type_html",
- N_("Choose the type of importer to run")
+ N_("Choose the type of importer to run:")
},
{ "file_html",
N_("Choose the file that you want to import into Evolution, "
@@ -148,7 +148,7 @@ static struct {
"Evolution will attempt to work it out.")
},
{ "intelligent_html",
- N_("Please select the information that you would like to import")
+ N_("Please select the information that you would like to import:")
}
};
static int num_info = (sizeof (info) / sizeof (info[0]));
@@ -848,10 +848,13 @@ prepare_intelligent_page (GnomeDruid *druid,
str = g_strdup_printf (_("From %s:"), id->name);
label = gtk_label_new (str);
g_free (str);
+
+ gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
+
gtk_table_attach (GTK_TABLE (table), label, 0, 1, running - 1,
- running, 0, 0, 0, 0);
+ running, GTK_FILL, 0, 0, 0);
gtk_table_attach (GTK_TABLE (table), id->widget, 1, 2,
- running - 1, running, 0, 0, 0, 0);
+ running - 1, running, GTK_FILL, 0, 3, 0);
gtk_widget_show_all (table);
gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), table,
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 0176257478..c2962993d8 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -712,10 +712,13 @@ prepare_importer_page (GnomeDruidPage *page,
str = g_strdup_printf (_("From %s:"), id->name);
label = gtk_label_new (str);
g_free (str);
+
+ gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
+
gtk_table_attach (GTK_TABLE (table), label, 0, 1, running - 1,
- running, 0, 0, 0, 0);
+ running, GTK_FILL, 0, 0, 0);
gtk_table_attach (GTK_TABLE (table), id->widget, 1, 2,
- running - 1, running, 0, 0, 0, 0);
+ running - 1, running, GTK_FILL, 0, 3, 0);
gtk_widget_show_all (table);
gtk_box_pack_start (GTK_BOX (data->import_page->vbox), table,
@@ -751,11 +754,11 @@ make_importer_page (SWData *data)
page->vbox = GNOME_DRUID_PAGE_STANDARD (page->page)->vbox;
gtk_container_set_border_width (GTK_CONTAINER (page->vbox), 4);
- label = gtk_label_new (_("Please select the information\nthat you would like to import"));
- gtk_box_pack_start (GTK_BOX (page->vbox), label, FALSE, FALSE, 0);
+ label = gtk_label_new (_("Please select the information that you would like to import:"));
+ gtk_box_pack_start (GTK_BOX (page->vbox), label, FALSE, FALSE, 3);
sep = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (page->vbox), sep, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (page->vbox), sep, FALSE, FALSE, 3);
page->prepared = FALSE;
return page;