"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/e-util/e-import-assistant.c" between
evolution-3.32.4.tar.xz and evolution-3.34.0.tar.xz

About: Evolution is a personal information management application that provides integrated mail, calendaring and address book functionality (GNOME desktop).

e-import-assistant.c  (evolution-3.32.4.tar.xz):e-import-assistant.c  (evolution-3.34.0.tar.xz)
skipping to change at line 264 skipping to change at line 264
gtk_container_set_border_width (GTK_CONTAINER (page), 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12);
gtk_widget_show (page); gtk_widget_show (page);
container = page; container = page;
text = _("Choose the file that you want to import into Evolution, " text = _("Choose the file that you want to import into Evolution, "
"and select what type of file it is from the list."); "and select what type of file it is from the list.");
widget = gtk_label_new (text); widget = gtk_label_new (text);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
widget = gtk_table_new (2, 2, FALSE); widget = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (widget), 2); gtk_table_set_row_spacings (GTK_TABLE (widget), 2);
gtk_table_set_col_spacings (GTK_TABLE (widget), 10); gtk_table_set_col_spacings (GTK_TABLE (widget), 10);
gtk_container_set_border_width (GTK_CONTAINER (widget), 8); gtk_container_set_border_width (GTK_CONTAINER (widget), 8);
gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
skipping to change at line 347 skipping to change at line 348
page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (page), 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12);
gtk_widget_show (page); gtk_widget_show (page);
container = page; container = page;
text = _("Choose the destination for this import"); text = _("Choose the destination for this import");
widget = gtk_label_new (text); widget = gtk_label_new (text);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
return page; return page;
} }
static GtkWidget * static GtkWidget *
import_assistant_type_page_init (EImportAssistant *import_assistant) import_assistant_type_page_init (EImportAssistant *import_assistant)
{ {
GtkRadioButton *radio_button; GtkRadioButton *radio_button;
skipping to change at line 372 skipping to change at line 374
page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (page), 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12);
gtk_widget_show (page); gtk_widget_show (page);
container = page; container = page;
text = _("Choose the type of importer to run:"); text = _("Choose the type of importer to run:");
widget = gtk_label_new (text); widget = gtk_label_new (text);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
widget = gtk_radio_button_new_with_mnemonic ( widget = gtk_radio_button_new_with_mnemonic (
NULL, _("Import data and settings from _older programs")); NULL, _("Import data and settings from _older programs"));
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
import_assistant->priv->type_page.intelligent = widget; import_assistant->priv->type_page.intelligent = widget;
gtk_widget_show (widget); gtk_widget_show (widget);
radio_button = GTK_RADIO_BUTTON (widget); radio_button = GTK_RADIO_BUTTON (widget);
skipping to change at line 411 skipping to change at line 414
gtk_container_set_border_width (GTK_CONTAINER (page), 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12);
gtk_widget_show (page); gtk_widget_show (page);
container = page; container = page;
text = _("Please select the information " text = _("Please select the information "
"that you would like to import:"); "that you would like to import:");
widget = gtk_label_new (text); widget = gtk_label_new (text);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
return page; return page;
} }
skipping to change at line 461 skipping to change at line 465
gint row = 0; gint row = 0;
page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (page), 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12);
gtk_widget_show (page); gtk_widget_show (page);
container = page; container = page;
widget = gtk_label_new (""); widget = gtk_label_new ("");
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
import_assistant->priv->simple_page.actionlabel = widget; import_assistant->priv->simple_page.actionlabel = widget;
widget = gtk_table_new (2, 1, FALSE); widget = gtk_table_new (2, 1, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (widget), 2); gtk_table_set_row_spacings (GTK_TABLE (widget), 2);
gtk_table_set_col_spacings (GTK_TABLE (widget), 10); gtk_table_set_col_spacings (GTK_TABLE (widget), 10);
gtk_container_set_border_width (GTK_CONTAINER (widget), 8); gtk_container_set_border_width (GTK_CONTAINER (widget), 8);
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
skipping to change at line 544 skipping to change at line 549
const gchar *text; const gchar *text;
text = _("Evolution checked for settings to import from " text = _("Evolution checked for settings to import from "
"the following applications: Pine, Netscape, Elm, " "the following applications: Pine, Netscape, Elm, "
"iCalendar, KMail. No importable settings found. If you " "iCalendar, KMail. No importable settings found. If you "
"would like to try again, please click the " "would like to try again, please click the "
"“Back” button."); "“Back” button.");
widget = gtk_label_new (text); widget = gtk_label_new (text);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); 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_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
gtk_widget_show (widget); gtk_widget_show (widget);
gtk_assistant_set_page_complete (assistant, vbox, FALSE); gtk_assistant_set_page_complete (assistant, vbox, FALSE);
return; return;
} }
table = gtk_table_new (g_slist_length (l), 2, FALSE); table = gtk_table_new (g_slist_length (l), 2, FALSE);
row = 0; row = 0;
skipping to change at line 1342 skipping to change at line 1348
gtk_assistant_append_page (assistant, page); gtk_assistant_append_page (assistant, page);
gtk_assistant_set_page_title (assistant, page, _("Import Location ")); gtk_assistant_set_page_title (assistant, page, _("Import Location "));
gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_ CONTENT); gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_ CONTENT);
} else { } else {
/* complex import assistant pages */ /* complex import assistant pages */
/* Start page */ /* Start page */
page = gtk_label_new (""); page = gtk_label_new ("");
gtk_label_set_line_wrap (GTK_LABEL (page), TRUE); 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_alignment (GTK_MISC (page), 0.0, 0.5);
gtk_misc_set_padding (GTK_MISC (page), 12, 12); gtk_misc_set_padding (GTK_MISC (page), 12, 12);
gtk_label_set_text (GTK_LABEL (page), _( gtk_label_set_text (GTK_LABEL (page), _(
"Welcome to the Evolution Import Assistant.\n" "Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the " "With this assistant you will be guided through the "
"process of importing external files into Evolution.")); "process of importing external files into Evolution."));
gtk_widget_show (page); gtk_widget_show (page);
gtk_assistant_append_page (assistant, page); gtk_assistant_append_page (assistant, page);
gtk_assistant_set_page_title ( gtk_assistant_set_page_title (
 End of changes. 7 change blocks. 
0 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)