amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-25 08:23:28 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: 259d2ede769d145b245d50c40fdd797f9811a0a0
Monotone-Revision: 0ba5dc28795d933db244f667ecc927420db2ab60

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-06-28T14:24:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-06-28 14:24:20 +00:00
parent 0932c851e6
commit 11665b2024
4 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2010-06-28 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Contacts/UIxContactEditor.m (-initSnapshot, -_saveSnapshot):
added support for "extended" work/home addresses.
2010-06-25 Francis Lachapelle <flachapelle@inverse.ca>
* UI/MailerUI/UIxMailMainFrame.m (-inboxData): new method used to
UI/Contacts/UIxContactEditor.m
+6
View File
@@ -427,6 +427,8 @@
if (elements && [elements count] > 0)
{
element = [elements objectAtIndex: 0];
[self _setSnapshotValue: @"workExtendedAddress"
to: [element value: 1]];
[self _setSnapshotValue: @"workStreetAddress"
to: [element value: 2]];
[self _setSnapshotValue: @"workCity"
@@ -444,6 +446,8 @@
if (elements && [elements count] > 0)
{
element = [elements objectAtIndex: 0];
[self _setSnapshotValue: @"homeExtendedAddress"
to: [element value: 1]];
[self _setSnapshotValue: @"homeStreetAddress"
to: [element value: 2]];
[self _setSnapshotValue: @"homeCity"
@@ -602,6 +606,7 @@
[card setTz: [snapshot objectForKey: @"tz"]];
element = [self _elementWithTag: @"adr" ofType: @"home"];
[element setValue: 1 to: [snapshot objectForKey: @"homeExtendedAddress"]];
[element setValue: 2 to: [snapshot objectForKey: @"homeStreetAddress"]];
[element setValue: 3 to: [snapshot objectForKey: @"homeCity"]];
[element setValue: 4 to: [snapshot objectForKey: @"homeState"]];
@@ -609,6 +614,7 @@
[element setValue: 6 to: [snapshot objectForKey: @"homeCountry"]];
element = [self _elementWithTag: @"adr" ofType: @"work"];
[element setValue: 1 to: [snapshot objectForKey: @"workExtendedAddress"]];
[element setValue: 2 to: [snapshot objectForKey: @"workStreetAddress"]];
[element setValue: 3 to: [snapshot objectForKey: @"workCity"]];
[element setValue: 4 to: [snapshot objectForKey: @"workState"]];
UI/Templates/ContactsUI/UIxContactEditor.wox
+18
View File
@@ -181,6 +181,15 @@
</label>
</td>
</tr>
<tr>
<td colspan="2">
<label>
<input type="text" class="textField" name="homeExtendedAddress"
id="homeExtendedAddress"
var:value="snapshot.homeExtendedAddress" />
</label>
</td>
</tr>
<tr>
<td colspan="2">
<label><var:string label:value="City:" />
@@ -267,6 +276,15 @@
</label>
</td>
</tr>
<tr>
<td colspan="2">
<label>
<input type="text" class="textField" name="workExtendedAddress"
id="workExtendedAddress"
var:value="snapshot.workExtendedAddress" />
</label>
</td>
</tr>
<tr>
<td colspan="2">
<label><var:string label:value="City:" />
UI/Templates/ContactsUI/UIxContactView.wox
+1 -1
View File
@@ -61,8 +61,8 @@
/><var:string value="workService" escapeHTML="NO"
/><var:string value="workCompany" escapeHTML="NO"
/><var:string value="workPobox" escapeHTML="NO"
/><var:string value="workExtendedAddress" escapeHTML="NO"
/><var:string value="workStreetAddress" escapeHTML="NO"
/><var:string value="workExtendedAddress" escapeHTML="NO"
/><var:string value="workCityAndProv" escapeHTML="NO"
/><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
/><var:string value="workUrl" escapeHTML="NO"