From f2a3913ffe7df8a38d38a1127cb26d64ac3509b2 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 9 Oct 2002 23:03:04 +0000 Subject: =?UTF-8?q?[=C2=A0Fix=20#7094,=20#7064,=20#7095,=20#31944,=20#3194?= =?UTF-8?q?5=20]=20Hook=20up=20new=20etspec=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2002-10-10 Kjartan Maraas [ Fix #7094, #7064, #7095, #31944, #31945 ] * gui/component/Makefile.am: Hook up new etspec file. * gui/component/addressbook-config.c: Remove ETable spec. * gui/component/addressbook-config.etspec: New file. * gui/component/ldap-config.glade: Fix typo. * gui/component/select-names/e-select-names.c: Remove inline spec. * gui/component/select-names/e-select-names.etspec: New file. * gui/contact-list-editor/Makefile.am: Hook up etspec. * gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec. * gui/contact-list-editor/e-contact-list-editor.etspec: New file. * gui/widgets/Makefile.am: Hook up new spec. * gui/widgets/e-addressbook-view.c: Remove inline spec. * gui/widgets/e-addressbook-view.etspec: New file. svn path=/trunk/; revision=18361 --- addressbook/ChangeLog | 16 ++++ addressbook/gui/component/Makefile.am | 7 +- addressbook/gui/component/addressbook-config.c | 16 +--- .../gui/component/addressbook-config.etspec | 9 ++ addressbook/gui/component/ldap-config.glade | 2 +- addressbook/gui/component/select-names/Makefile.am | 7 +- .../gui/component/select-names/e-select-names.c | 23 +---- .../component/select-names/e-select-names.etspec | 7 ++ addressbook/gui/contact-list-editor/Makefile.am | 7 +- .../contact-list-editor/e-contact-list-editor.c | 13 +-- .../e-contact-list-editor.etspec | 7 ++ addressbook/gui/widgets/Makefile.am | 8 +- addressbook/gui/widgets/e-addressbook-view.c | 102 +-------------------- addressbook/gui/widgets/e-addressbook-view.etspec | 51 +++++++++++ 14 files changed, 129 insertions(+), 146 deletions(-) create mode 100644 addressbook/gui/component/addressbook-config.etspec create mode 100644 addressbook/gui/component/select-names/e-select-names.etspec create mode 100644 addressbook/gui/contact-list-editor/e-contact-list-editor.etspec create mode 100644 addressbook/gui/widgets/e-addressbook-view.etspec (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index cb16479494..1a8386ebe0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,19 @@ +2002-10-10 Kjartan Maraas + + [ Fix #7094, #7064, #7095, #31944, #31945 ] + * gui/component/Makefile.am: Hook up new etspec file. + * gui/component/addressbook-config.c: Remove ETable spec. + * gui/component/addressbook-config.etspec: New file. + * gui/component/ldap-config.glade: Fix typo. + * gui/component/select-names/e-select-names.c: Remove inline spec. + * gui/component/select-names/e-select-names.etspec: New file. + * gui/contact-list-editor/Makefile.am: Hook up etspec. + * gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec. + * gui/contact-list-editor/e-contact-list-editor.etspec: New file. + * gui/widgets/Makefile.am: Hook up new spec. + * gui/widgets/e-addressbook-view.c: Remove inline spec. + * gui/widgets/e-addressbook-view.etspec: New file. + 2002-10-02 Chris Toshok [ Fix #28392 ] diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index bfae4c1198..842d0489b5 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ @@ -74,10 +75,14 @@ glade_DATA = ldap-config.glade iconsdir = $(datadir)/images/evolution +etspecdir = $(datadir)/evolution/etspec +etspec_DATA = addressbook-config.etspec + EXTRA_DIST = \ $(glade_DATA) \ $(oaf_DATA) \ - $(oaf_in_files) + $(oaf_in_files) \ + $(etspec_DATA) if ENABLE_PURIFY PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 40f47b0ae8..fdaee205dc 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -1593,17 +1593,6 @@ static ETableMemoryStoreColumnInfo sources_table_columns[] = { E_TABLE_MEMORY_STORE_TERMINATOR }; -#define SOURCES_TABLE_SPEC \ -" \ - \ - \ - \ - \ - \ - \ - \ -" - GtkWidget* addressbook_dialog_create_sources_table (char *name, char *string1, char *string2, int num1, int num2) { @@ -1612,7 +1601,10 @@ addressbook_dialog_create_sources_table (char *name, char *string1, char *string model = e_table_memory_store_new (sources_table_columns); - table = e_table_scrolled_new (model, NULL, SOURCES_TABLE_SPEC, NULL); + table = e_table_scrolled_new_from_spec_file (model, + NULL, + EVOLUTION_ETSPECDIR "/addressbook-config.etspec", + NULL); gtk_object_set_data (GTK_OBJECT (table), "model", model); diff --git a/addressbook/gui/component/addressbook-config.etspec b/addressbook/gui/component/addressbook-config.etspec new file mode 100644 index 0000000000..e30d11f1f8 --- /dev/null +++ b/addressbook/gui/component/addressbook-config.etspec @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 18ac11fb21..82c2d5d8b5 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -1412,7 +1412,7 @@ It is for display purposes only. GtkLabel label215 +searches, and for creating and editing contacts. GTK_JUSTIFY_LEFT False 0.5 diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 1b49d29068..b417f18678 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -39,6 +39,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ @@ -72,13 +73,15 @@ libeselectnames_la_SOURCES = \ gladedir = $(datadir)/evolution/glade glade_DATA = select-names.glade - +etspecdir = $(datadir)/evolution/etspec +etspec_DATA = e-select-names.etspec EXTRA_DIST = \ $(glade_DATA) \ $(oaf_in_files) \ $(oaf_DATA) \ - $(idl_DATA) + $(idl_DATA) \ + $(etspec_DATA) BUILT_SOURCES = $(IDL_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 24c977a433..e1251fe0f6 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -114,22 +114,6 @@ e_select_names_class_init (ESelectNamesClass *klass) object_class->destroy = e_select_names_destroy; } -#define SPEC " \ - \ - \ - \ - \ - \ -" - -#define SPEC2 " \ - \ - \ - \ - \ - \ -" - GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2); GtkWidget *e_addressbook_create_folder_selector(char *name, char *string1, char *string2, int num1, int num2); @@ -332,9 +316,10 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n esn_free_duped_key_fn, model); - spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG); - table = e_table_scrolled_new (without, NULL, spec, NULL); - g_free(spec); + table = e_table_scrolled_new_from_spec_file (without, + NULL, + EVOLUTION_ETSPECDIR "/e-select-names.etspec", + NULL); gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter); gtk_object_set_data(GTK_OBJECT(table), "without", without); diff --git a/addressbook/gui/component/select-names/e-select-names.etspec b/addressbook/gui/component/select-names/e-select-names.etspec new file mode 100644 index 0000000000..3553ca90bf --- /dev/null +++ b/addressbook/gui/component/select-names/e-select-names.etspec @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 7349f2a821..c87f352879 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -7,6 +7,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/gui/contact-editor \ -I$(top_builddir)/shell \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"\ -DDATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ @@ -30,4 +31,8 @@ gladedir = $(datadir)/evolution/glade glade_DATA = \ contact-list-editor.glade -EXTRA_DIST = $(glade_DATA) +etspecdir = $(datadir)/evolution/etspec +etspec_DATA = e-contact-list-editor.etspec + +EXTRA_DIST = $(glade_DATA) \ + $(etspec_DATA) diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 5dd61ebec4..cf185d4957 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -686,14 +686,6 @@ e_contact_list_editor_raise (EContactListEditor *editor) gdk_window_raise (GTK_WIDGET (editor->app)->window); } -#define SPEC " \ - \ - \ - \ - \ - \ -" - GtkWidget * e_contact_list_editor_create_table(gchar *name, gchar *string1, gchar *string2, @@ -710,7 +702,10 @@ e_contact_list_editor_create_table(gchar *name, model = e_contact_list_model_new (); - table = e_table_scrolled_new (model, NULL, SPEC, NULL); + table = e_table_scrolled_new_from_spec_file (model, + NULL, + EVOLUTION_ETSPECDIR "/e-contact-list-editor.etspec", + NULL); gtk_object_set_data(GTK_OBJECT(table), "model", model); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec new file mode 100644 index 0000000000..6d5f4f2514 --- /dev/null +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 647410a922..e262e18f5c 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"e-minicard\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \ -I$(top_srcdir) \ @@ -129,5 +130,10 @@ libeminicard_a_SOURCES = \ gladedir = $(datadir)/evolution/glade glade_DATA = +etspecdir = $(datadir)/evolution/etspec +etspec_DATA= e-addressbook-view.etspec + EXTRA_DIST = \ - $(glade_DATA) + $(glade_DATA) \ + $(etspec_DATA) + \ No newline at end of file diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 7860d90af5..f9669a20ac 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -350,104 +350,6 @@ writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav) command_state_change (eav); } -#ifdef JUST_FOR_TRANSLATORS -static char *list [] = { - N_("* Click here to add a contact *"), - N_("File As"), - N_("Full Name"), - N_("Email"), - N_("Primary Phone"), - N_("Assistant Phone"), - N_("Business Phone"), - N_("Callback Phone"), - N_("Company Phone"), - N_("Home Phone"), - N_("Organization"), - N_("Business Address"), - N_("Home Address"), - N_("Mobile Phone"), - N_("Car Phone"), - N_("Business Fax"), - N_("Home Fax"), - N_("Business Phone 2"), - N_("Home Phone 2"), - N_("ISDN"), - N_("Other Phone"), - N_("Other Fax"), - N_("Pager"), - N_("Radio"), - N_("Telex"), - N_("TTY"), - N_("Other Address"), - N_("Email 2"), - N_("Email 3"), - N_("Web Site"), - N_("Department"), - N_("Office"), - N_("Title"), - N_("Profession"), - N_("Manager"), - N_("Assistant"), - N_("Nickname"), - N_("Spouse"), - N_("Note"), - N_("Free-busy URL"), -}; -#endif - -#define SPEC " \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -" - static void init_collection (void) { @@ -468,7 +370,7 @@ init_collection (void) g_free(galview); spec = e_table_specification_new(); - e_table_specification_load_from_string(spec, SPEC); + e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec"); factory = gal_view_factory_etable_new (spec); gtk_object_unref (GTK_OBJECT (spec)); @@ -1393,7 +1295,7 @@ create_table_view (EAddressbookView *view) /* Here we create the table. We give it the three pieces of the table we've created, the header, the model, and the initial layout. It does the rest. */ - table = e_table_scrolled_new (adapter, NULL, SPEC, NULL); + table = e_table_scrolled_new_from_spec_file (adapter, NULL, EVOLUTION_ETSPECDIR "/e-addressbook-view.etspec", NULL); view->object = GTK_OBJECT(adapter); view->widget = table; diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec new file mode 100644 index 0000000000..a0a0015d75 --- /dev/null +++ b/addressbook/gui/widgets/e-addressbook-view.etspec @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3