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/contact-list-editor | |
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/contact-list-editor')
3 files changed, 17 insertions, 10 deletions
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 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" selection-mode=\"single\"> \ - <ETableColumn model_col= \"0\" _title=\"Contact\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" /> \ - <ETableState> \ - <column source=\"0\"/> \ - <grouping> </grouping> \ - </ETableState> \ -</ETableSpecification>" - 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 @@ +<ETableSpecification no-headers="true" cursor-mode="line" selection-mode="single"> +<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string" /> + <ETableState> + <column source="0"/> + <grouping> </grouping> + </ETableState> +</ETableSpecification> |