aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorJason Leach <jleach@ximian.com>2001-07-11 12:31:43 +0800
committerJacob Leach <jleach@src.gnome.org>2001-07-11 12:31:43 +0800
commit4763f25379dd0a254b2dba9d9a2ed328c90f1f99 (patch)
tree74a748c369329dfca086e311c4f64eda70b5935d /calendar
parent0e6d346872289d1ee71cb7b1092b5229b11dab3e (diff)
downloadgsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar.gz
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar.bz2
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar.lz
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar.xz
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.tar.zst
gsoc2013-evolution-4763f25379dd0a254b2dba9d9a2ed328c90f1f99.zip
[Fix bug #4388: ETableSpecification still in .c file]
2001-07-10 Jason Leach <jleach@ximian.com> [Fix bug #4388: ETableSpecification still in .c file] * gui/dialogs/meeting-page.etspec: New file containing the spec that was previously in meeting-page.c as a string. * gui/dialogs/meeting-page.c: One line change to get it to use this spec file instead of a string. * gui/dialogs/Makefile.am: Necessary changes to get the new meeting-page.etspec installed. svn path=/trunk/; revision=10985
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/gui/dialogs/Makefile.am4
-rw-r--r--calendar/gui/dialogs/meeting-page.c50
-rw-r--r--calendar/gui/dialogs/meeting-page.etspec19
4 files changed, 40 insertions, 46 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2b6bf179e0..456986e800 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2001-07-10 Jason Leach <jleach@ximian.com>
+
+ [Fix bug #4388: ETableSpecification still in .c file]
+
+ * gui/dialogs/meeting-page.etspec: New file containing the spec
+ that was previously in meeting-page.c as a string.
+
+ * gui/dialogs/meeting-page.c: One line change to get it to use
+ this spec file instead of a string.
+
+ * gui/dialogs/Makefile.am: Necessary changes to get the new
+ meeting-page.etspec installed.
+
2001-07-10 Damon Chaplin <damon@ximian.com>
* gui/calendar-model.c:
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 7d8e37497f..cee0600243 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = \
$(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
$(BONOBO_VFS_GNOME_CFLAGS) \
-DGNOMELOCALEDIR=\""$(localedir)"\"
@@ -70,5 +71,8 @@ glade_DATA = \
task-details-page.glade \
task-page.glade
+etspecdir = $(datadir)/evolution/etspec/
+etspec_DATA = meeting-page.etspec
+
EXTRA_DIST = \
$(glade_DATA)
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index d208feb019..1504c48968 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -55,50 +55,6 @@
#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-#define MEETING_PAGE_TABLE_SPEC \
- "<ETableSpecification click-to-add=\"true\" " \
- " _click-to-add-message=\"Click here to add an attendee\" " \
- " draw-grid=\"true\">" \
- " <ETableColumn model_col= \"0\" _title=\"Attendee\" " \
- " expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"string\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"1\" _title=\"Member\" " \
- " expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"string\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"2\" _title=\"Type\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"typeedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"3\" _title=\"Role\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"roleedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"4\" _title=\"RSVP\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"rsvpedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"5\" _title=\"Delegated To\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"rsvpedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"6\" _title=\"Delegated From\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"rsvpedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"7\" _title=\"Status\" " \
- " expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"statusedit\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"8\" _title=\"Common Name\" " \
- " expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"string\" compare=\"string\"/>" \
- " <ETableColumn model_col= \"9\" _title=\"Language\" " \
- " expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" " \
- " cell=\"string\" compare=\"string\"/>" \
- " <ETableState>" \
- " <column source=\"0\"/>" \
- " <column source=\"2\"/>" \
- " <column source=\"3\"/>" \
- " <column source=\"4\"/>" \
- " <column source=\"7\"/>" \
- " <grouping></grouping>" \
- " </ETableState>" \
- "</ETableSpecification>"
-
enum columns {
MEETING_ATTENDEE_COL,
MEETING_MEMBER_COL,
@@ -1183,8 +1139,10 @@ build_etable (MeetingPage *mpage)
"append_row", append_row,
NULL);
- priv->etable = e_table_scrolled_new (priv->model, extras,
- MEETING_PAGE_TABLE_SPEC, NULL);
+ priv->etable = e_table_scrolled_new_from_spec_file (priv->model,
+ extras,
+ EVOLUTION_ETSPECDIR "/meeting-page.etspec",
+ NULL);
filename = g_strdup_printf ("%s/config/et-header-meeting-page",
evolution_dir);
real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (priv->etable));
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
new file mode 100644
index 0000000000..7ab7d8995c
--- /dev/null
+++ b/calendar/gui/dialogs/meeting-page.etspec
@@ -0,0 +1,19 @@
+<ETableSpecification click-to-add="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
+ <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+ <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+ <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
+ <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
+ <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
+ <ETableColumn model_col= "5" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
+ <ETableColumn model_col= "6" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+ <ETableColumn model_col= "7" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+
+ <ETableState>
+ <column source="0"/>
+ <column source="2"/>
+ <column source="3"/>
+ <column source="4"/>
+ <column source="5"/>
+ <grouping></grouping>
+ </ETableState>
+</ETableSpecification> \ No newline at end of file