aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2002-10-10 07:03:04 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2002-10-10 07:03:04 +0800
commitf2a3913ffe7df8a38d38a1127cb26d64ac3509b2 (patch)
treeda2a389e51ed7140aad124afa6abaa0f323f6e93 /addressbook/gui/component
parent944fdf5ac66142b7da9d6c383cd305017aea399d (diff)
downloadgsoc2013-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')
-rw-r--r--addressbook/gui/component/Makefile.am7
-rw-r--r--addressbook/gui/component/addressbook-config.c16
-rw-r--r--addressbook/gui/component/addressbook-config.etspec9
-rw-r--r--addressbook/gui/component/ldap-config.glade2
-rw-r--r--addressbook/gui/component/select-names/Makefile.am7
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c23
-rw-r--r--addressbook/gui/component/select-names/e-select-names.etspec7
7 files changed, 36 insertions, 35 deletions
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 \
-"<ETableSpecification cursor-mode=\"line\"> \
- <ETableColumn model_col= \"0\" _title=\"Account Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
- <ETableColumn model_col= \"1\" _title=\"Server Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
- <ETableState> \
- <column source=\"0\"/> \
- <column source=\"1\"/> \
- <grouping></grouping> \
- </ETableState> \
-</ETableSpecification>"
-
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 @@
+<ETableSpecification cursor-mode="line">
+ <ETableColumn model_col= "0" _title="Account Name" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string"/>
+ <ETableColumn model_col= "1" _title="Server Name" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string"/>
+ <ETableState>
+ <column source="0"/>
+ <column source="1"/>
+ <grouping></grouping>
+ </ETableState>
+</ETableSpecification>
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. </label>
<class>GtkLabel</class>
<name>label215</name>
<label>Selecting this option will let you change Evolution's default settings for LDAP
-searches, and for creating and editting contacts. </label>
+searches, and for creating and editing contacts. </label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
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>