diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2002-10-10 07:03:04 +0800 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2002-10-10 07:03:04 +0800 |
| commit | f2a3913ffe7df8a38d38a1127cb26d64ac3509b2 (patch) | |
| tree | da2a389e51ed7140aad124afa6abaa0f323f6e93 /addressbook/gui/component/select-names | |
| parent | 944fdf5ac66142b7da9d6c383cd305017aea399d (diff) | |
| download | gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar.gz gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar.bz2 gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar.lz gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar.xz gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.tar.zst gsoc2013-evolution-f2a3913ffe7df8a38d38a1127cb26d64ac3509b2.zip | |
[ Fix #7094, #7064, #7095, #31944, #31945 ] Hook up new etspec file.
2002-10-10 Kjartan Maraas <kmaraas@gnome.org>
[ 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
Diffstat (limited to 'addressbook/gui/component/select-names')
3 files changed, 16 insertions, 21 deletions
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 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \ - <ETableColumn model_col= \"%d\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" search=\"string\"/> \ - <ETableState> \ - <column source=\"0\"/> \ - <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \ - </ETableState> \ -</ETableSpecification>" - -#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \ - <ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" search=\"string\"/> \ - <ETableState> \ - <column source=\"0\"/> \ - <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \ - </ETableState> \ -</ETableSpecification>" - 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 @@ +<ETableSpecification no-headers="true" cursor-mode="line"> + <ETableColumn model_col= "43" _title="Name" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string" search="string"/> + <ETableState> + <column source="0"/> + <grouping> <leaf column="0" ascending="true"/> </grouping> + </ETableState> +</ETableSpecification> |