diff options
| author | Sushma Rai <rsushma@src.gnome.org> | 2005-08-26 13:39:36 +0800 |
|---|---|---|
| committer | Sushma Rai <rsushma@src.gnome.org> | 2005-08-26 13:39:36 +0800 |
| commit | 36559b74441c7f9f8e1014352c2467977a6dbf4b (patch) | |
| tree | bce502111f6c29fbe0cd913c3afd441b95659b07 /addressbook | |
| parent | 9185fb32b379bb767de52835a454549e973efa99 (diff) | |
| download | gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar.gz gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar.bz2 gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar.lz gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar.xz gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.tar.zst gsoc2013-evolution-36559b74441c7f9f8e1014352c2467977a6dbf4b.zip | |
Proper ordering of column and field names in ETableSpecification.
Fixes #313124.
svn path=/trunk/; revision=30254
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.etspec | 76 |
2 files changed, 45 insertions, 38 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 9a07aee2ff..9e0c899848 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2005-08-26 Devashish Sharma <sdevashish@novell.com> + + * gui/widgets/e-addressbook-view.etspec: In ETableSpecification source + column and field name were not in proper order. Because of this all the + values in view by phone list and view by company were shown in wrong + columns. Fixes #313124. + 2005-08-23 Not Zed <NotZed@Ximian.com> * gui/component/addressbook.c (addressbook_authenticate): diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec index a74a53e798..60a5f9d677 100644 --- a/addressbook/gui/widgets/e-addressbook-view.etspec +++ b/addressbook/gui/widgets/e-addressbook-view.etspec @@ -1,32 +1,32 @@ <ETableSpecification draw-grid="true" cursor-mode="line"> <ETableColumn model_col= "2" _title="File As" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "3" _title="Full Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "4" _title="Given Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "5" _title="Family Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "6" _title="Nickname" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "4" _title="Full Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "5" _title="Given Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "6" _title="Family Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "7" _title="Nickname" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "7" _title="Email" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "8" _title="Email 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "9" _title="Email 3" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "8" _title="Email" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "9" _title="Email 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "10" _title="Email 3" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "15" _title="Assistant Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "16" _title="Business Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col= "17" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="18" _title="Business Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="19" _title="Callback Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="20" _title="Car Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="21" _title="Company Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="22" _title="Home Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="23" _title="Home Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="24" _title="Home Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="25" _title="ISDN Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="26" _title="Mobile Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="27" _title="Other Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="28" _title="Other Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="29" _title="Pager" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="30" _title="Primary Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="31" _title="Radio" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="32" _title="Telex" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "16" _title="Assistant Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "17" _title="Business Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col= "18" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="19" _title="Business Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="20" _title="Callback Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="21" _title="Car Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="22" _title="Company Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="23" _title="Home Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="24" _title="Home Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="25" _title="Home Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="26" _title="ISDN Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="27" _title="Mobile Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="28" _title="Other Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="29" _title="Other Fax" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="30" _title="Pager" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="31" _title="Primary Phone" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="32" _title="Radio" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="33" _title="Telex" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> <!-- Translators: This is a vcard standard and stands for the type of phone used by the hearing impaired. TTY stands for "teletype" @@ -34,23 +34,23 @@ Device for Deaf". However, you probably want to leave this abbreviation unchanged unless you know that there is actually a different and established translation for this in your language. --> - <ETableColumn model_col="33" _title="TTYTDD" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="34" _title="TTYTDD" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="34" _title="Organization" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="35" _title="Unit" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="36" _title="Office" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="37" _title="Title" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="38" _title="Role" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="39" _title="Manager" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="40" _title="Assistant" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="35" _title="Organization" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="36" _title="Unit" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="37" _title="Office" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="38" _title="Title" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="39" _title="Role" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="40" _title="Manager" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="41" _title="Assistant" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="41" _title="Web Site" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="42" _title="Journal" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="42" _title="Web Site" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="43" _title="Journal" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="43" _title="Categories" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="44" _title="Categories" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="48" _title="Spouse" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> - <ETableColumn model_col="49" _title="Note" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="49" _title="Spouse" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> + <ETableColumn model_col="50" _title="Note" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/> <ETableState> <column source="0"/> |