callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pack address book importers' selector into a scrollable window

Browse Source 
Thus when a user has defined many address books the import wizard
window doesn't grow in size, even out of desktop size limit.
This commit is contained in:
Milan Crha
2015-10-16 11:05:30 +02:00
parent eb9b1655da
commit af3258a39f
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addressbook/importers/evolution-csv-importer.c
View File

@ -769,7 +769,7 @@ csv_getwidget (EImport *ei,
EImportImporter *im)
{
EShell *shell;
GtkWidget *vbox, *selector;
GtkWidget *vbox, *selector, *scrolled_window;
ESourceRegistry *registry;
ESource *primary;
const gchar *extension_name;
@ -779,10 +779,18 @@ csv_getwidget (EImport *ei,
shell = e_shell_get_default ();
registry = e_shell_get_registry (shell);
extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
g_object_set (G_OBJECT (scrolled_window),
"hscrollbar-policy", GTK_POLICY_AUTOMATIC,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 6);
selector = e_source_selector_new (registry, extension_name);
e_source_selector_set_show_toggles (
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
primary = g_datalist_get_data (&target->data, "csv-source");
if (primary == NULL) {

12
addressbook/importers/evolution-ldif-importer.c
View File

@ -571,7 +571,7 @@ ldif_getwidget (EImport *ei,
EImportImporter *im)
{
EShell *shell;
GtkWidget *vbox, *selector;
GtkWidget *vbox, *selector, *scrolled_window;
ESourceRegistry *registry;
ESource *primary;
const gchar *extension_name;
@ -581,10 +581,18 @@ ldif_getwidget (EImport *ei,
shell = e_shell_get_default ();
registry = e_shell_get_registry (shell);
extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
g_object_set (G_OBJECT (scrolled_window),
"hscrollbar-policy", GTK_POLICY_AUTOMATIC,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 6);
selector = e_source_selector_new (registry, extension_name);
e_source_selector_set_show_toggles (
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
primary = g_datalist_get_data (&target->data, "ldif-source");
if (primary == NULL) {

12
addressbook/importers/evolution-vcard-importer.c
View File

@ -376,7 +376,7 @@ vcard_getwidget (EImport *ei,
EImportImporter *im)
{
EShell *shell;
GtkWidget *vbox, *selector;
GtkWidget *vbox, *selector, *scrolled_window;
ESourceRegistry *registry;
ESource *primary;
const gchar *extension_name;
@ -386,10 +386,18 @@ vcard_getwidget (EImport *ei,
shell = e_shell_get_default ();
registry = e_shell_get_registry (shell);
extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
g_object_set (G_OBJECT (scrolled_window),
"hscrollbar-policy", GTK_POLICY_AUTOMATIC,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 6);
selector = e_source_selector_new (registry, extension_name);
e_source_selector_set_show_toggles (
E_SOURCE_SELECTOR (selector), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
gtk_container_add (GTK_CONTAINER (scrolled_window), selector);
primary = g_datalist_get_data (&target->data, "vcard-source");
if (primary == NULL) {