Changeset 535 for apps

Timestamp:

10/07/09 09:06:29 (4 years ago)

Author:

henri

Message:

First revision update for iPhone OS 3.0+
Most deprecated calls have been updated to the new APIs.
Now using Google Maps API instead of RouteMe?.

Location:

apps/iphone/my.tel/trunk

Files:

: 2 added
: 1 removed
: 18 modified

Classes/GroupFriendsController.m (modified) (6 diffs)
Classes/GroupsViewController.m (modified) (2 diffs)
Classes/HeaderViewController.h (modified) (2 diffs)
Classes/HeaderViewController.m (modified) (1 diff)
Classes/KeywordEditController.m (modified) (1 diff)
Classes/KeywordViewController.m (modified) (1 diff)
Classes/LocationViewController.h (modified) (6 diffs)
Classes/LocationViewController.m (modified) (8 diffs)
Classes/MainTabBarController.m (modified) (1 diff)
Classes/ProfileViewController.m (modified) (2 diffs)
Classes/RecordCell.m (modified) (1 diff)
Classes/RecordGroupsController.m (modified) (2 diffs)
Classes/RecordViewController.h (modified) (1 diff)
Classes/RecordViewController.m (modified) (6 diffs)
Classes/SubdomainViewController.m (modified) (3 diffs)
Classes/TelMapAnnotation.h (added)
Classes/TelMapAnnotation.m (added)
Classes/VIP_telAppDelegate.m (modified) (1 diff)
English.lproj/TabLoc.xib (modified) (24 diffs)
MapView.framework (deleted)
VIP.tel.xcodeproj/project.pbxproj (modified) (15 diffs)

Legend:

: Unmodified
: Added
: Removed

apps/iphone/my.tel/trunk/Classes/GroupFriendsController.m

r313	r535
37	37	renameButton = [[UIButton buttonWithType:UIButtonTypeRoundedRect] retain];
38	38	[renameButton setTitle:@"Rename Group" forState:(UIControlStateNormal&&UIControlStateHighlighted)];
39		renameButton.~~font = [renameButton~~.font fontWithSize:17];
	39	renameButton.titleLabel.font = [renameButton.titleLabel.font fontWithSize:17];
40	40	[renameButton addTarget:self action:@selector(didClickRename:) forControlEvents:UIControlEventTouchUpInside];
41	41	renameButton.autoresizingMask = (UIViewAutoresizingFlexibleWidth\|UIViewAutoresizingFlexibleHeight);
…	…
44	44	[deleteButton setTitle:@"Delete Group" forState:(UIControlStateNormal&&UIControlStateHighlighted)];
45	45	[deleteButton setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
46		deleteButton.~~font = [deleteButton~~.font fontWithSize:17];
	46	deleteButton.titleLabel.font = [deleteButton.titleLabel.font fontWithSize:17];
47	47	[deleteButton addTarget:self action:@selector(didClickDelete:) forControlEvents:UIControlEventTouchUpInside];
48	48	deleteButton.autoresizingMask = (UIViewAutoresizingFlexibleWidth\|UIViewAutoresizingFlexibleHeight);
…	…
131	131	- (void)updateFriendsArraywithJson:(NSDictionary *)parsedJson {
132	132	#ifdef DEBUG
133		NSLog([parsedJson descriptionInStringsFileFormat]);
	133	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
134	134	#endif
135	135	if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
…	…
178	178	- (void)updateAllFriendsArraywithJson:(NSDictionary *)parsedJson {
179	179	#ifdef DEBUG
180		NSLog([parsedJson descriptionInStringsFileFormat]);
	180	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
181	181	#endif
182	182	if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
…	…
196	196	- (void)groupRenamedWithJson:(NSDictionary *)parsedJson {
197	197	#ifdef DEBUG
198		NSLog([parsedJson descriptionInStringsFileFormat]);
	198	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
199	199	#endif
200	200	if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
…	…
461	461	// If editing, show all the friends, with the ones currently selected with the checkmark
462	462	// If not editing, simply show all the current friends
463		cell.text = [[friendsArray objectAtIndex:indexPath.row] valueForKey:@"name"];
	463	cell.textLabel.text = [[friendsArray objectAtIndex:indexPath.row] valueForKey:@"name"];
464	464	if (! tableView.editing) {
465	465	cell.accessoryType = UITableViewCellAccessoryCheckmark;

apps/iphone/my.tel/trunk/Classes/GroupsViewController.m

r266	r535
94	94	if ([[sGroup valueForKey:@"allFriends"] integerValue] == 1) {
95	95	NSString *gName = [sGroup valueForKey:@"name"];
96		cell.~~font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cel~~l.font.pointSize];
	96	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cell.textLabel.font.pointSize];
97	97	if ([gName isEqualToString:@"All friends"]) {
98		cell.text = gName;
	98	cell.textLabel.text = gName;
99	99	} else {
100		cell.text = [gName stringByAppendingString:@" (All friends)"];
	100	cell.textLabel.text = [gName stringByAppendingString:@" (All friends)"];
101	101	}
102	102	} else {
103		cell.~~font = [UIFont fontWithName:@"Helvetica-Bold" size:cel~~l.font.pointSize];
104		cell.text = [sGroup valueForKey:@"name"];
	103	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:cell.textLabel.font.pointSize];
	104	cell.textLabel.text = [sGroup valueForKey:@"name"];
105	105	}
106	106	return cell;
…	…
131	131	- (void)updateUITableWithJson:(NSDictionary *)parsedJson {
132	132	#ifdef DEBUG
133		NSLog([parsedJson descriptionInStringsFileFormat]);
	133	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
134	134	#endif
135	135

apps/iphone/my.tel/trunk/Classes/HeaderViewController.h

r313	r535
16	16	@interface HeaderViewController : UIViewController
17	17	<UITextViewDelegate, UINavigationControllerDelegate, ProfileViewDelegate, UIWebViewDelegate> {
18		NS~~DecimalNumber~~ *apiId;
	18	NSString *apiId;
19	19	IBOutlet UILabel *domainLabel;
20	20	IBOutlet UITextView *headerText;
…	…
38	38	- (void)storeTextHeader;
39	39
40		@property (nonatomic, retain) NS~~DecimalNumber~~ *apiId;
	40	@property (nonatomic, retain) NSString *apiId;
41	41	@property (nonatomic, retain) NSString *previousHeaderString;
42	42

apps/iphone/my.tel/trunk/Classes/HeaderViewController.m

r313	r535
70	70	- (void)updateUIHeaderWithJson:(NSDictionary *)parsedJson {
71	71	#ifdef DEBUG
72		NSLog([parsedJson descriptionInStringsFileFormat]);
	72	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
73	73	#endif
74	74

apps/iphone/my.tel/trunk/Classes/KeywordEditController.m

r241	r535
179	179	[saveKeywordDict setObject:saveSecKeywordArray forKey:@"keywords"];
180	180	#ifdef DEBUG
181		NSLog([saveKeywordDict description]);
	181	NSLog(@"%@", [saveKeywordDict description]);
182	182	#endif
183	183

apps/iphone/my.tel/trunk/Classes/KeywordViewController.m

r426	r535
200	200	- (void)updateUITableWithJson:(NSDictionary *)parsedJson {
201	201	#ifdef DEBUG
202		NSLog([parsedJson descriptionInStringsFileFormat]);
	202	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
203	203	#endif
204	204

apps/iphone/my.tel/trunk/Classes/LocationViewController.h

r241	r535
12	12	#import "Location.h"
13	13	#import "MyCLController.h"
14		#import "MapView/RMMapView.h"
15		#import "MapView/RMMarker.h"
16		#import "MapView/RMMarkerManager.h"
17		#import "MapView/RMOpenStreetMapsSource.h"
18		#import "MapView/RMVirtualEarthSource.h"
19		#import "MapView/RMCloudMadeMapSource.h"
	14	#import <MapKit/MapKit.h>
	15	#import "TelMapAnnotation.h"
20	16
21		@interface LocationViewController : UIViewController <MyCLControllerDelegate, UIActionSheetDelegate> {
	17
	18	@interface LocationViewController : UIViewController <MyCLControllerDelegate, UIActionSheetDelegate, MKMapViewDelegate> {
22	19	NSString *apiId;
23		~~CLLocation *telLocation;~~
24	20
25		~~IBOutlet UILabel *domainLabel;~~
26	21	IBOutlet UILabel *labelGpsLastUpdateDate;
27	22	IBOutlet UIToolbar *actionBar;
…	…
30	25	IBOutlet UIBarButtonItem *buttonMoveTo;
31	26	IBOutlet UIImageView *centerReticle;
32		IBOutlet RMMapView *theMap;
	27	IBOutlet MKMapView *theMap;
	28	TelMapAnnotation *markerTel;
33	29	@private
34		~~RMMarker *markerTel;~~
35		~~RMMarker *markerGps;~~
36	30	BOOL gpsLocIsAvailable;
37	31	BOOL telLocIsAvailable;
…	…
40	34	}
41	35
	36	- (void)recenterMap;
42	37	- (void)updateUILocationWithJson:(NSDictionary *)parsedJson;
43	38	- (void)getLocation;
…	…
46	41
47	42	@property (nonatomic, retain) NSString *apiId;
48		~~@property (nonatomic, retain) CLLocation *telLocation;~~
49	43
50	44	- (IBAction)didPressUpdate:(id)sender;
…	…
55	49	- (IBAction)gpsSwitchToggled:(UISwitch *)sender;
56	50
57		~~@property (nonatomic, retain) IBOutlet UILabel *domainLabel;~~
58	51	@property (nonatomic, retain) IBOutlet UILabel *labelGpsLastUpdateDate;
59	52	@property (nonatomic, retain) IBOutlet UIToolbar *actionBar;
…	…
61	54	@property (nonatomic, retain) IBOutlet UIBarButtonItem *buttonDeleteLoc;
62	55	@property (nonatomic, retain) IBOutlet UIBarButtonItem *buttonMoveTo;
63		@property (nonatomic, retain) IBOutlet RMMapView *theMap;
	56	@property (nonatomic, retain) IBOutlet MKMapView *theMap;
	57	@property (nonatomic, retain) TelMapAnnotation *markerTel;
64	58
65	59	@end

apps/iphone/my.tel/trunk/Classes/LocationViewController.m

r241	r535
12	12
13	13	@synthesize apiId;
14		@synthesize telLocation;
15
16		@synthesize domainLabel;
	14
17	15	@synthesize actionBar;
18	16	@synthesize labelGpsLastUpdateDate;
…	…
21	19	@synthesize buttonMoveTo;
22	20	@synthesize theMap;
	21	@synthesize markerTel;
23	22
24	23	#pragma mark ------ Standard View Controller Methods
…	…
26	25	- (void)viewDidLoad {
27	26	[super viewDidLoad];
	27	theMap.delegate = self;
28	28	gpsLocIsAvailable = NO;
29	29	telLocIsAvailable = NO;
30	30	buttonDeleteLoc.enabled = telLocIsAvailable;
31	31	[MyCLController sharedInstance].delegate = self;
32		[RMMapView class]; // Make IB happy that the RMMapView symbol exists in the code
33
34		// Choose the map tile source
35		NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
36		switch ([defaults integerForKey:@"mapsSource"]) {
37		case 0:
38		theMap.contents.tileSource = [[[RMCloudMadeMapSource alloc] init] retain];
39		break;
40		case 1:
41		theMap.contents.tileSource = [[[RMVirtualEarthSource alloc] init] retain];
42		break;
43		case 2:
44		theMap.contents.tileSource = [[[RMOpenStreetMapsSource alloc] init] retain];
45		break;
46		default:
47		break;
48		}
49
50		[self getLocation];
51
	32	[self getLocation];
52	33	}
53	34
54	35	- (void)viewWillAppear:(BOOL)animated {
55		[~~domainLabel setText:[VIPConnect sharedInstance].selectedDomain~~];
56		~~if (self.telLocation) {~~
57		[theMap moveToLatLong:self.telLocation.coordinate];
58		} else if ([MyCLController sharedInstance].myCurrentLoc) {
59		[self gpsUpdate:[MyCLController sharedInstance].myCurrentLoc];
60		~~[theMap moveToLatLong:[MyCLController sharedInstance].myCurrentLoc.coordinate~~];
61		}
	36	[super viewWillAppear:animated];
	37	[self getLocation];
	38	}
	39
	40	- (void)viewDidAppear:(BOOL)animated {
	41	[super viewDidAppear:animated];
	42	self.theMap.showsUserLocation = YES;
62	43	}
63	44
…	…
75	56	- (void)dealloc {
76	57	[super dealloc];
77		[markerGps release];
78		[markerTel release];
79		}
	58	}
	59
	60	- (void)recenterMap {
	61	// Center and zoom the map so it has all the annotations in it
	62	NSArray *coordinates = [self.theMap valueForKeyPath:@"annotations.coordinate"];
	63	CLLocationCoordinate2D maxCoord = {-90.0f, -180.0f};
	64	CLLocationCoordinate2D minCoord = {90.0f, 180.0f};
	65	for (NSValue *value in coordinates) {
	66	CLLocationCoordinate2D coord = {0.0f, 0.0f};
	67	[value getValue:&coord];
	68	if(coord.longitude > maxCoord.longitude) {
	69	maxCoord.longitude = coord.longitude;
	70	}
	71	if(coord.latitude > maxCoord.latitude) {
	72	maxCoord.latitude = coord.latitude;
	73	}
	74	if(coord.longitude < minCoord.longitude) {
	75	minCoord.longitude = coord.longitude;
	76	}
	77	if(coord.latitude < minCoord.latitude) {
	78	minCoord.latitude = coord.latitude;
	79	}
	80	}
	81	MKCoordinateRegion region = {{0.0f, 0.0f}, {0.0f, 0.0f}};
	82	region.center.longitude = (minCoord.longitude + maxCoord.longitude) / 2.0;
	83	region.center.latitude = (minCoord.latitude + maxCoord.latitude) / 2.0;
	84	region.span.longitudeDelta = 1.3 * (maxCoord.longitude - minCoord.longitude); // make the region 30% bigger than necessary
	85	region.span.latitudeDelta = 1.3 * (maxCoord.latitude - minCoord.latitude); // make the region 30% bigger than necessary
	86	[theMap setRegion:[theMap regionThatFits:region] animated:YES];
	87	}
	88
	89	#pragma mark ------ MKMapViewDelegate Methods
	90
	91	- (void)mapView:(MKMapView )mapView didAddAnnotationViews:(NSArray )views {
	92	MKAnnotationView *aV;
	93	for (aV in views) {
	94	if (aV.annotation == theMap.userLocation) {
	95	[theMap setCenterCoordinate:theMap.userLocation.location.coordinate animated:YES];
	96	// zoom in (even if it's updating)
	97	CLLocation *theLoc = [MyCLController sharedInstance].myCurrentLoc;
	98	CLLocationDistance radiusAccuracy = 1000;
	99	if (theLoc.horizontalAccuracy > 0.9 * radiusAccuracy)
	100	radiusAccuracy = theLoc.horizontalAccuracy / 0.9;
	101	MKCoordinateRegion aR = MKCoordinateRegionMakeWithDistance(theMap.userLocation.location.coordinate, radiusAccuracy, radiusAccuracy);
	102	[theMap setRegion:[theMap regionThatFits:aR] animated:YES];
	103	}
	104	}
	105	}
	106
	107	#pragma mark ---- MyCLController delegate methods ----
	108
	109	-(void)gpsUpdate:(CLLocation *)aLoc {
	110	if (aLoc) {
	111	gpsLocIsAvailable = YES;
	112	} else {
	113	gpsLocIsAvailable = NO;
	114	}
	115	}
	116
80	117
81	118	#pragma mark ------ UI Methods
…	…
83	120	- (void)updateUILocationWithJson:(NSDictionary *)parsedJson {
84	121	#ifdef DEBUG
85		NSLog([parsedJson descriptionInStringsFileFormat]);
	122	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
86	123	#endif
87	124
88		~~RMMarkerManager *markerManager = [theMap markerManager];~~
89	125	if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
90	126	self.apiId = (NSString *)[parsedJson valueForKey:@"apiId"];
91		~~if (self.telLocation) {~~
92		~~[self.telLocation release];~~
93		}
94	127	NSString jsonLat = (NSString )[parsedJson valueForKey:@"latitude"];
95	128	NSString jsonLong = (NSString )[parsedJson valueForKey:@"longitude"];
96		telLocation = [[[CLLocation alloc] initWithLatitude:[jsonLat floatValue]
97		longitude:[jsonLong floatValue]] retain];
98		if (![markerManager managingMarker:markerTel]) {
99		markerTel = [[[RMMarker alloc] initWithCGImage:[RMMarker loadPNGFromBundle:@"marker-tel"]] retain];
100		[markerManager addMarker:markerTel AtLatLong:telLocation.coordinate];
101		// move to front
102		markerTel.zPosition = 1.0;
103		} else {
104		[markerManager moveMarker:markerTel AtLatLon:telLocation.coordinate];
105		}
106		//[markerTel setTextLabel:[VIPConnect sharedInstance].selectedDomain];
107
	129
	130	if (self.markerTel) {
	131	[self.theMap removeAnnotation:markerTel];
	132	self.markerTel = nil;
	133	}
	134	CLLocationCoordinate2D newCoords = {[jsonLat floatValue], [jsonLong floatValue]};
	135	self.markerTel = [TelMapAnnotation annotationWithCoordinate:newCoords];
	136	self.markerTel.title = [VIPConnect sharedInstance].selectedDomain;
	137	[self.theMap addAnnotation:markerTel];
	138	[self.theMap selectAnnotation:markerTel animated:YES];
	139
108	140	telLocIsAvailable = YES;
109	141	} else {
110		telLocIsAvailable = NO;
111		[markerManager removeMarker:markerTel];
112		[markerTel release];
	142	if (self.markerTel) {
	143	[self.theMap removeAnnotation:markerTel];
	144	self.markerTel = nil;
	145	}
113	146
114	147	// Remove the apiId, the record is gone
…	…
129	162
130	163	- (IBAction)didPressCenterGps:(id)sender {
131		[~~theMap moveToLatLong~~:[[[MyCLController sharedInstance] myCurrentLoc] coordinate]];
	164	[self.theMap setCenterCoordinate:[[[MyCLController sharedInstance] myCurrentLoc] coordinate]];
132	165	}
133	166
134	167	- (IBAction)didPressCenterTel:(id)sender {
135		[~~theMap moveToLatLong:self.telLocation~~.coordinate];
	168	[self.theMap setCenterCoordinate:self.markerTel.coordinate];
136	169	}
137	170
…	…
198	231	[conn setConnectionUrl:[conn urlFromAction:@"storelocation"]];
199	232
200		CLLocationCoordinate2D centerPointCoord = ~~[theMap pixelToLatLong:centerReticle.center]~~;
	233	CLLocationCoordinate2D centerPointCoord = self.theMap.centerCoordinate;
201	234	NSString *currLat = [NSString stringWithFormat:@"%f", centerPointCoord.latitude];
202	235	NSString *currLong = [NSString stringWithFormat:@"%f", centerPointCoord.longitude];
…	…
232	265	[conn performLookup:TRUE];
233	266	[requestData release];
234
235		~~// Finally, get rid of the cached telLocation~~
236		~~if (self.telLocation) {~~
237		~~[self.telLocation release];~~
238		}
239		}
240
241		~~#pragma mark ---- MyCLController delegate methods ----~~
242
243		~~-(void)gpsUpdate:(CLLocation *)aLoc {~~
244		~~RMMarkerManager *markerManager = [theMap markerManager];~~
245		~~if (!aLoc) {~~
246		~~[self.labelGpsLastUpdateDate setText:LocStr(@"LatLongUnavailable")];~~
247		~~[self.labelGpsLastUpdateDate setNeedsDisplay];~~
248		~~[markerManager removeMarker:markerGps];~~
249		~~[markerGps release];~~
250		~~gpsLocIsAvailable = NO;~~
251		~~return;~~
252		}
253		~~NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];~~
254		~~[dateFormatter setDateStyle:NSDateFormatterShortStyle];~~
255		~~[dateFormatter setTimeStyle:NSDateFormatterMediumStyle];~~
256		~~[self.labelGpsLastUpdateDate setText:[dateFormatter stringFromDate:aLoc.timestamp]];~~
257		~~[self.labelGpsLastUpdateDate setNeedsDisplay];~~
258		~~[dateFormatter release];~~
259
260		~~if (![markerManager managingMarker:markerGps]) {~~
261		~~markerGps = [[[RMMarker alloc] initWithCGImage:[RMMarker loadPNGFromBundle:@"marker-gps"]] retain];~~
262		~~[markerManager addMarker:markerGps AtLatLong:aLoc.coordinate];~~
263		~~// Put GPS marker below Tel marker~~
264		~~markerGps.zPosition = 0.9;~~
265		~~} else {~~
266		~~[markerManager moveMarker:markerGps AtLatLon:aLoc.coordinate];~~
267		}
268		~~gpsLocIsAvailable = YES;~~
269		~~return;~~
270	267	}
271	268

apps/iphone/my.tel/trunk/Classes/MainTabBarController.m

r205	r535
33	33	- (void)viewDidLoad {
34	34	[super viewDidLoad];
	35	// pre-load the location view so we have a usable map as the user selects it
	36	[self.locViewController.view self];
35	37	}
36	38

apps/iphone/my.tel/trunk/Classes/ProfileViewController.m

r313	r535
99	99	if (recordsCount > 0)
100	100	recordsCount -= 1;
101		cell.text = [NSString stringWithFormat:@"%@ (%d)", (NSString *)[aProf objectForKey:@"name"], recordsCount];
	101	cell.textLabel.text = [NSString stringWithFormat:@"%@ (%d)", (NSString *)[aProf objectForKey:@"name"], recordsCount];
102	102
103	103	if ([[aProf objectForKey:@"isActive"] integerValue] == 1) {
104	104	if ([[aProf objectForKey:@"id"] isEqual:[VIPConnect sharedInstance].selectedProfileId]) {
105		cell.image = iconactiveselected;
	105	cell.imageView.image = iconactiveselected;
106	106	} else {
107		cell.image = iconactive;
	107	cell.imageView.image = iconactive;
108	108	}
109	109	} else {
110	110	if ([[aProf objectForKey:@"id"] isEqual:[VIPConnect sharedInstance].selectedProfileId]) {
111		cell.image = iconselected;
	111	cell.imageView.image = iconselected;
112	112	} else {
113		cell.image = iconinactive;
	113	cell.imageView.image = iconinactive;
114	114	}
115	115	}
116	116	if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
117		cell.~~font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cel~~l.font.pointSize];
	117	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cell.textLabel.font.pointSize];
118	118	}
119	119	[aProf release];
…	…
199	199	- (void)updateUITableWithJson:(NSDictionary *)parsedJson {
200	200	#ifdef DEBUG
201		NSLog([parsedJson descriptionInStringsFileFormat]);
	201	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
202	202	#endif
203	203

apps/iphone/my.tel/trunk/Classes/RecordCell.m

r425	r535
24	24	@synthesize switchEnabled;
25	25
26		- (id)initWith~~Frame:(CGRect)fram~~e reuseIdentifier:(NSString *)reuseIdentifier {
27		if (self = [super initWith~~Frame:fram~~e reuseIdentifier:reuseIdentifier]) {
	26	- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
	27	if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
28	28	// Initialization code
29	29

apps/iphone/my.tel/trunk/Classes/RecordGroupsController.m

r313	r535
162	162
163	163	if (indexPath.section == 0) {
164		cell.~~font = [UIFont fontWithName:@"Helvetica-Bold" size:cel~~l.font.pointSize];
165		cell.text = @"Public: Visible by anyone";
	164	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:cell.textLabel.font.pointSize];
	165	cell.textLabel.text = @"Public: Visible by anyone";
166	166	if (ctGroups == 0)
167	167	cell.accessoryType = UITableViewCellAccessoryCheckmark;
…	…
174	174	if ([[sGroup valueForKey:@"allFriends"] integerValue] == 1) {
175	175	NSString *gName = [sGroup valueForKey:@"name"];
176		cell.~~font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cel~~l.font.pointSize];
	176	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cell.textLabel.font.pointSize];
177	177	if ([gName isEqualToString:@"All friends"]) {
178		cell.text = gName;
	178	cell.textLabel.text = gName;
179	179	} else {
180		cell.text = [gName stringByAppendingString:@" (All friends)"];
181		}
182		} else {
183		cell.~~font = [UIFont fontWithName:@"Helvetica-Bold" size:cel~~l.font.pointSize];
184		cell.text = [sGroup valueForKey:@"name"];
	180	cell.textLabel.text = [gName stringByAppendingString:@" (All friends)"];
	181	}
	182	} else {
	183	cell.textLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:cell.textLabel.font.pointSize];
	184	cell.textLabel.text = [sGroup valueForKey:@"name"];
185	185	}
186	186	if ([selectedGroupsArray objectAtIndex:indexPath.row] != [NSNull null])

apps/iphone/my.tel/trunk/Classes/RecordViewController.h

r426	r535
21	21	NSMutableArray *uiArray; // the data to show in a UITable
22	22
23		CGFloat recordTableHeight; // Record table height: ~~60 if not editing, 95~~ if editing
	23	CGFloat recordTableHeight; // Record table height: kRowHeight if not editing, add kRowHeightEditIncrease if editing
24	24
25	25	IBOutlet UITableView *theTable;

apps/iphone/my.tel/trunk/Classes/RecordViewController.m

r426	r535
9	9	#import "RecordViewController.h"
10	10
11		#define kRowHeight 54.0
12		#define kRowHeightEditIncrease 20.0
	11	#define kRowHeight 47.0
	12	#define kRowHeightEditIncrease 35.0
13	13
14	14	static NSDictionary *imageMappings;
…	…
117	117	RecordCell cell = (RecordCell )[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
118	118	if (cell == nil) {
119		cell = [[[RecordCell alloc] initWith~~Frame:CGRectZero~~ reuseIdentifier:CellIdentifier] autorelease];
	119	cell = [[[RecordCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:CellIdentifier] autorelease];
120	120	}
121	121	NSMutableDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
…	…
235	235	[uiItem setValue:@"1" forKey:@"enabled"];
236	236	#ifdef DEBUG
237		NSLog([uiItem description]);
	237	NSLog(@"%@", [uiItem description]);
238	238	#endif
239	239	} else {
…	…
312	312	- (void)updateUITableWithJson:(NSDictionary *)parsedJson {
313	313	#ifdef DEBUG
314		NSLog([parsedJson descriptionInStringsFileFormat]);
	314	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
315	315	#endif
316	316
…	…
763	763	NSDictionary *parsedJson = [conn performLookup:FALSE];
764	764	#ifdef DEBUG
765		NSLog([parsedJson descriptionInStringsFileFormat]);
	765	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
766	766	#endif
767	767	[self fillLocationsDict:parsedJson];
…	…
794	794	NSDictionary *parsedJson = [conn performLookup:FALSE];
795	795	#ifdef DEBUG
796		NSLog([parsedJson descriptionInStringsFileFormat]);
	796	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
797	797	#endif
798	798	[self fillServicesDict:parsedJson];

apps/iphone/my.tel/trunk/Classes/SubdomainViewController.m

r266	r535
64	64	// For offline testing usage, make sure we don't go over the index length
65	65	if ([subDom length] > [self.title length]) {
66		cell.text = [subDom substringToIndex:([subDom length] - [self.title length] - 1)];
	66	cell.textLabel.text = [subDom substringToIndex:([subDom length] - [self.title length] - 1)];
67	67	} else {
68		cell.text = subDom;
	68	cell.textLabel.text = subDom;
69	69	}
70	70	cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
…	…
74	74	- (void)tableView:(UITableView )tableView didSelectRowAtIndexPath:(NSIndexPath )indexPath {
75	75	SubdomainViewController *newController = [SubdomainViewController
76		subdomainViewForDomain:[[tableView cellForRowAtIndexPath:indexPath].text
	76	subdomainViewForDomain:[[tableView cellForRowAtIndexPath:indexPath].textLabel.text
77	77	stringByAppendingFormat:@".%@", self.title]];
78	78	[tableView deselectRowAtIndexPath:indexPath animated:YES];
…	…
143	143	- (void)updateUITableWithJson:(NSDictionary *)parsedJson {
144	144	#ifdef DEBUG
145		NSLog([parsedJson descriptionInStringsFileFormat]);
	145	NSLog(@"%@", [parsedJson descriptionInStringsFileFormat]);
146	146	#endif
147	147

apps/iphone/my.tel/trunk/Classes/VIP_telAppDelegate.m

r313	r535
56	56	// do nothing, we're good
57	57	} else {
58		// NSString theErr = [@"Error: " stringByAppendingString:[(NSArray )[parsedJson valueForKey:@"actionErrors"]
59		// objectAtIndex:0]];
60		// if ([theErr hasSuffix:@"try to log in again."]) {
61		// // Hack to redo the login if it expects a cookie. should be fixed in the backend by the time you read this
62		// // but one never knows. The first query, if it doesn't have a cookie, fails. The second query has it.
63		// // So it shouldn't infinite loop
64		// [[VIPConnect sharedInstance] loginToVipWithDelegate:self selector:@selector(postLoginRefresh:)];
65		// return;
66		// }
	58	// Failed. Show login controller view
67	59	[[window.subviews objectAtIndex:0] removeFromSuperview];
68	60	[window addSubview:loginController.view];

apps/iphone/my.tel/trunk/English.lproj/TabLoc.xib

r427	r535
1	1	<?xml version="1.0" encoding="UTF-8"?>
2		<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
	2	<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
3	3	<data>
4		<int key="IBDocument.SystemTarget">528</int>
5		<string key="IBDocument.SystemVersion">9G55</string>
6		<string key="IBDocument.InterfaceBuilderVersion">677</string>
7		<string key="IBDocument.AppKitVersion">949.43</string>
8		<string key="IBDocument.HIToolboxVersion">353.00</string>
	4	<int key="IBDocument.SystemTarget">768</int>
	5	<string key="IBDocument.SystemVersion">10B504</string>
	6	<string key="IBDocument.InterfaceBuilderVersion">732</string>
	7	<string key="IBDocument.AppKitVersion">1038.2</string>
	8	<string key="IBDocument.HIToolboxVersion">437.00</string>
	9	<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
	10	<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
	11	<string key="NS.object.0">62</string>
	12	</object>
9	13	<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
10	14	<bool key="EncodedWithXMLCoder">YES</bool>
11		<integer value="3"/>
	15	<integer value="4"/>
12	16	</object>
13	17	<object class="NSArray" key="IBDocument.PluginDependencies">
…	…
17	21	<object class="NSMutableDictionary" key="IBDocument.Metadata">
18	22	<bool key="EncodedWithXMLCoder">YES</bool>
19		<object class="NSArray" key="dict.sortedKeys">
	23	<object class="NSArray" key="dict.sortedKeys" id="0">
20	24	<bool key="EncodedWithXMLCoder">YES</bool>
21	25	</object>
…	…
42	46	<object class="NSMutableArray" key="NSSubviews">
43	47	<bool key="EncodedWithXMLCoder">YES</bool>
44		<object class="IB~~UIImageView" id="513232454~~">
	48	<object class="IBMKMapView" id="1026570651">
45	49	<reference key="NSNextResponder" ref="129435978"/>
46		<int key="NSvFlags">292</int>
47		<string key="NSFrame~~">{{140, 157}, {40, 40}~~}</string>
	50	<int key="NSvFlags">268</int>
	51	<string key="NSFrameSize">{320, 367}</string>
48	52	<reference key="NSSuperview" ref="129435978"/>
49	53	<bool key="IBUIOpaque">NO</bool>
50		<bool key="IBUICl~~earsContextBeforeDrawing">NO~~</bool>
	54	<bool key="IBUIClipsSubviews">YES</bool>
51	55	<int key="IBUIContentMode">4</int>
52		<bool key="IBUIUserInteractionEnabled">NO</bool>
53		<object class="NSCustomResource" key="IBUIImage">
54		<string key="NSClassName">NSImage</string>
55		<string key="NSResourceName">map-bullseye.png</string>
56		</object>
	56	<bool key="IBUIMultipleTouchEnabled">YES</bool>
57	57	</object>
58	58	<object class="IBUIToolbar" id="139092493">
…	…
68	68	<object class="IBUIBarButtonItem" id="144500120">
69	69	<int key="IBUIStyle">1</int>
	70	<reference key="IBUIToolbar" ref="139092493"/>
70	71	<int key="IBUISystemItemIdentifier">9</int>
71		~~<reference key="IBUIToolbar" ref="139092493"/>~~
72	72	</object>
73	73	<object class="IBUIBarButtonItem" id="654592482">
74		<float key="IBUIWidth">5~~.000000e+01~~</float>
	74	<float key="IBUIWidth">50</float>
75	75	<int key="IBUIStyle">1</int>
	76	<reference key="IBUIToolbar" ref="139092493"/>
76	77	<int key="IBUISystemItemIdentifier">6</int>
77		~~<reference key="IBUIToolbar" ref="139092493"/>~~
78	78	</object>
79	79	<object class="IBUIBarButtonItem" id="269040089">
…	…
84	84	<object class="IBUIBarButtonItem" id="1026348409">
85	85	<int key="IBUIStyle">1</int>
	86	<reference key="IBUIToolbar" ref="139092493"/>
86	87	<int key="IBUISystemItemIdentifier">5</int>
87		~~<reference key="IBUIToolbar" ref="139092493"/>~~
88	88	</object>
89	89	<object class="IBUIBarButtonItem" id="1019506733">
90	90	<int key="IBUIStyle">1</int>
	91	<reference key="IBUIToolbar" ref="139092493"/>
91	92	<int key="IBUISystemItemIdentifier">16</int>
92		~~<reference key="IBUIToolbar" ref="139092493"/>~~
93	93	</object>
94	94	</object>
95	95	</object>
96		<object class="IBUI~~Label" id="390972019~~">
	96	<object class="IBUIImageView" id="513232454">
97	97	<reference key="NSNextResponder" ref="129435978"/>
98	98	<int key="NSvFlags">292</int>
99		<string key="NSFrame">{{~~6, 347}, {106, 21~~}}</string>
	99	<string key="NSFrame">{{140, 164}, {40, 40}}</string>
100	100	<reference key="NSSuperview" ref="129435978"/>
101	101	<bool key="IBUIOpaque">NO</bool>
102		<bool key="IBUIClipsSubviews">YES</bool>
	102	<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
	103	<int key="IBUIContentMode">4</int>
103	104	<bool key="IBUIUserInteractionEnabled">NO</bool>
104		<string key="IBUIText">GPS Last Update Time:</string>
105		<object class="NSFont" key="IBUIFont" id="925840546">
106		<string key="NSName">Helvetica</string>
107		<double key="NSSize">1.000000e+01</double>
108		<int key="NSfFlags">16</int>
	105	<object class="NSCustomResource" key="IBUIImage">
	106	<string key="NSClassName">NSImage</string>
	107	<string key="NSResourceName">map-bullseye.png</string>
109	108	</object>
110		~~<object class="NSColor" key="IBUITextColor" id="883223468">~~
111		~~<int key="NSColorSpace">1</int>~~
112		~~<bytes key="NSRGB">MCAwIDAAA</bytes>~~
113		~~</object>~~
114		~~<nil key="IBUIHighlightedColor"/>~~
115		~~<int key="IBUIBaselineAdjustment">1</int>~~
116		~~<float key="IBUIMinimumFontSize">1.000000e+01</float>~~
117		~~</object>~~
118		~~<object class="IBUILabel" id="110319406">~~
119		~~<reference key="NSNextResponder" ref="129435978"/>~~
120		~~<int key="NSvFlags">292</int>~~
121		~~<string key="NSFrame">{{121, 348}, {137, 19}}</string>~~
122		~~<reference key="NSSuperview" ref="129435978"/>~~
123		~~<bool key="IBUIOpaque">NO</bool>~~
124		~~<bool key="IBUIClipsSubviews">YES</bool>~~
125		~~<bool key="IBUIUserInteractionEnabled">NO</bool>~~
126		~~<string key="IBUIText">unknown</string>~~
127		~~<reference key="IBUIFont" ref="925840546"/>~~
128		~~<reference key="IBUITextColor" ref="883223468"/>~~
129		~~<nil key="IBUIHighlightedColor"/>~~
130		~~<int key="IBUIBaselineAdjustment">1</int>~~
131		~~<float key="IBUIMinimumFontSize">9.000000e+00</float>~~
132	109	</object>
133	110	</object>
…	…
145	122	<string key="NSFrameSize">{320, 411}</string>
146	123	<reference key="NSSuperview"/>
147		<reference key="IBUIBackgroundColor" ref="883223468"/>
	124	<object class="NSColor" key="IBUIBackgroundColor">
	125	<int key="NSColorSpace">1</int>
	126	<bytes key="NSRGB">MCAwIDAAA</bytes>
	127	</object>
148	128	<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
149	129	</object>
…	…
152	132	<object class="NSMutableArray" key="connectionRecords">
153	133	<bool key="EncodedWithXMLCoder">YES</bool>
154		~~<object class="IBConnectionRecord">~~
155		~~<object class="IBCocoaTouchOutletConnection" key="connection">~~
156		~~<string key="label">labelGpsLastUpdateDate</string>~~
157		~~<reference key="source" ref="372490531"/>~~
158		~~<reference key="destination" ref="110319406"/>~~
159		~~</object>~~
160		~~<int key="connectionID">18</int>~~
161		~~</object>~~
162		~~<object class="IBConnectionRecord">~~
163		~~<object class="IBCocoaTouchOutletConnection" key="connection">~~
164		~~<string key="label">theMap</string>~~
165		~~<reference key="source" ref="372490531"/>~~
166		~~<reference key="destination" ref="129435978"/>~~
167		~~</object>~~
168		~~<int key="connectionID">19</int>~~
169		~~</object>~~
170	134	<object class="IBConnectionRecord">
171	135	<object class="IBCocoaTouchOutletConnection" key="connection">
…	…
240	204	<int key="connectionID">48</int>
241	205	</object>
	206	<object class="IBConnectionRecord">
	207	<object class="IBCocoaTouchOutletConnection" key="connection">
	208	<string key="label">theMap</string>
	209	<reference key="source" ref="372490531"/>
	210	<reference key="destination" ref="1026570651"/>
	211	</object>
	212	<int key="connectionID">51</int>
	213	</object>
242	214	</object>
243	215	<object class="IBMutableOrderedSet" key="objectRecords">
…	…
246	218	<object class="IBObjectRecord">
247	219	<int key="objectID">0</int>
248		<object class="NSArray" key="object" id="360949347">
249		<bool key="EncodedWithXMLCoder">YES</bool>
250		</object>
	220	<reference key="object" ref="0"/>
251	221	<reference key="children" ref="1000"/>
252	222	<nil key="parent"/>
…	…
255	225	<int key="objectID">-1</int>
256	226	<reference key="object" ref="372490531"/>
257		<reference key="parent" ref="~~360949347~~"/>
258		<string ~~type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA~~</string>
	227	<reference key="parent" ref="0"/>
	228	<string key="objectName">File's Owner</string>
259	229	</object>
260	230	<object class="IBObjectRecord">
261	231	<int key="objectID">-2</int>
262	232	<reference key="object" ref="975951072"/>
263		<reference key="parent" ref="~~360949347~~"/>
	233	<reference key="parent" ref="0"/>
264	234	</object>
265	235	<object class="IBObjectRecord">
…	…
270	240	<reference ref="129435978"/>
271	241	</object>
272		<reference key="parent" ref="~~360949347~~"/>
	242	<reference key="parent" ref="0"/>
273	243	</object>
274	244	<object class="IBObjectRecord">
…	…
278	248	<bool key="EncodedWithXMLCoder">YES</bool>
279	249	<reference ref="513232454"/>
280		~~<reference ref="110319406"/>~~
281		~~<reference ref="390972019"/>~~
282	250	<reference ref="139092493"/>
	251	<reference ref="1026570651"/>
283	252	</object>
284	253	<reference key="parent" ref="313343111"/>
…	…
328	297	</object>
329	298	<object class="IBObjectRecord">
330		<int key="objectID">32</int>
331		<reference key="object" ref="~~390972019~~"/>
	299	<int key="objectID">50</int>
	300	<reference key="object" ref="1026570651"/>
332	301	<reference key="parent" ref="129435978"/>
333	302	</object>
334		~~<object class="IBObjectRecord">~~
335		~~<int key="objectID">5</int>~~
336		~~<reference key="object" ref="110319406"/>~~
337		~~<reference key="parent" ref="129435978"/>~~
338		~~<string key="objectName">labelGpsLastUpdateDate</string>~~
339		~~</object>~~
340	303	</object>
341	304	</object>
342	305	<object class="NSMutableDictionary" key="flattenedProperties">
343	306	<bool key="EncodedWithXMLCoder">YES</bool>
344		<object class="NS~~Mutable~~Array" key="dict.sortedKeys">
	307	<object class="NSArray" key="dict.sortedKeys">
345	308	<bool key="EncodedWithXMLCoder">YES</bool>
346	309	<string>-1.CustomClassName</string>
…	…
349	312	<string>3.IBPluginDependency</string>
350	313	<string>30.IBPluginDependency</string>
351		~~<string>32.IBPluginDependency</string>~~
352	314	<string>36.IBPluginDependency</string>
353	315	<string>37.IBPluginDependency</string>
354	316	<string>38.IBPluginDependency</string>
355	317	<string>39.IBPluginDependency</string>
356		~~<string>4.CustomClassName</string>~~
357	318	<string>4.IBPluginDependency</string>
358	319	<string>40.IBPluginDependency</string>
359	320	<string>41.IBPluginDependency</string>
360		<string>5.IBPluginDependency</string>
	321	<string>50.IBPluginDependency</string>
361	322	</object>
362	323	<object class="NSMutableArray" key="dict.values">
…	…
372	333	<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
373	334	<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
374		~~<string>RMMapView</string>~~
375		~~<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>~~
376	335	<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
377	336	<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
…	…
381	340	<object class="NSMutableDictionary" key="unlocalizedProperties">
382	341	<bool key="EncodedWithXMLCoder">YES</bool>
383		<object class="NSArray" key="dict.sortedKeys">
384		<bool key="EncodedWithXMLCoder">YES</bool>
385		</object>
	342	<reference key="dict.sortedKeys" ref="0"/>
386	343	<object class="NSMutableArray" key="dict.values">
387	344	<bool key="EncodedWithXMLCoder">YES</bool>
…	…
391	348	<object class="NSMutableDictionary" key="localizations">
392	349	<bool key="EncodedWithXMLCoder">YES</bool>
393		<object class="NSArray" key="dict.sortedKeys">
394		<bool key="EncodedWithXMLCoder">YES</bool>
395		</object>
	350	<reference key="dict.sortedKeys" ref="0"/>
396	351	<object class="NSMutableArray" key="dict.values">
397	352	<bool key="EncodedWithXMLCoder">YES</bool>
…	…
399	354	</object>
400	355	<nil key="sourceID"/>
401		<int key="maxID">48</int>
	356	<int key="maxID">51</int>
402	357	</object>
403	358	<object class="IBClassDescriber" key="IBDocument.Classes">
…	…
409	364	<object class="NSMutableDictionary" key="actions">
410	365	<bool key="EncodedWithXMLCoder">YES</bool>
411		<object class="NS~~Mutable~~Array" key="dict.sortedKeys">
	366	<object class="NSArray" key="dict.sortedKeys">
412	367	<bool key="EncodedWithXMLCoder">YES</bool>
413	368	<string>didPressCenterGps:</string>
…	…
430	385	<object class="NSMutableDictionary" key="outlets">
431	386	<bool key="EncodedWithXMLCoder">YES</bool>
432		<object class="NS~~Mutable~~Array" key="dict.sortedKeys">
	387	<object class="NSArray" key="dict.sortedKeys">
433	388	<bool key="EncodedWithXMLCoder">YES</bool>
434	389	<string>actionBar</string>
…	…
437	392	<string>buttonUpdateLoc</string>
438	393	<string>centerReticle</string>
439		~~<string>domainLabel</string>~~
440	394	<string>labelGpsLastUpdateDate</string>
441	395	<string>theMap</string>
…	…
449	403	<string>UIImageView</string>
450	404	<string>UILabel</string>
451		<string>UILabel</string>
452		<string>RMMapView</string>
	405	<string>MKMapView</string>
453	406	</object>
454	407	</object>
…	…
465	418	</object>
466	419	</object>
467		<object class="IBPartialClassDescription">
468		<string key="className">RMMapView</string>
	420	</object>
	421	<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
	422	<bool key="EncodedWithXMLCoder">YES</bool>
	423	<object class="IBPartialClassDescription">
	424	<string key="className">MKMapView</string>
469	425	<string key="superclassName">UIView</string>
470		<object class="NSMutableDictionary" key="outlets">
471		<string key="NS.key.0">delegate</string>
472		<string key="NS.object.0">id</string>
473		</object>
474		<object class="IBClassDescriptionSource" key="sourceIdentifier">
475		<string key="majorKey">IBProjectSource</string>
476		<string key="minorKey">Classes/MapView/RMMapView.h</string>
	426	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	427	<string key="majorKey">IBFrameworkSource</string>
	428	<string key="minorKey">MapKit.framework/Headers/MKMapView.h</string>
	429	</object>
	430	</object>
	431	<object class="IBPartialClassDescription">
	432	<string key="className">NSObject</string>
	433	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	434	<string key="majorKey">IBFrameworkSource</string>
	435	<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
	436	</object>
	437	</object>
	438	<object class="IBPartialClassDescription">
	439	<string key="className">NSObject</string>
	440	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	441	<string key="majorKey">IBFrameworkSource</string>
	442	<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
	443	</object>
	444	</object>
	445	<object class="IBPartialClassDescription">
	446	<string key="className">NSObject</string>
	447	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	448	<string key="majorKey">IBFrameworkSource</string>
	449	<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
	450	</object>
	451	</object>
	452	<object class="IBPartialClassDescription">
	453	<string key="className">NSObject</string>
	454	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	455	<string key="majorKey">IBFrameworkSource</string>
	456	<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
	457	</object>
	458	</object>
	459	<object class="IBPartialClassDescription">
	460	<string key="className">NSObject</string>
	461	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	462	<string key="majorKey">IBFrameworkSource</string>
	463	<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
	464	</object>
	465	</object>
	466	<object class="IBPartialClassDescription">
	467	<string key="className">NSObject</string>
	468	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	469	<string key="majorKey">IBFrameworkSource</string>
	470	<string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string>
	471	</object>
	472	</object>
	473	<object class="IBPartialClassDescription">
	474	<string key="className">NSObject</string>
	475	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	476	<string key="majorKey">IBFrameworkSource</string>
	477	<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
	478	</object>
	479	</object>
	480	<object class="IBPartialClassDescription">
	481	<string key="className">NSObject</string>
	482	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	483	<string key="majorKey">IBFrameworkSource</string>
	484	<string key="minorKey">Foundation.framework/Headers/NSPort.h</string>
	485	</object>
	486	</object>
	487	<object class="IBPartialClassDescription">
	488	<string key="className">NSObject</string>
	489	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	490	<string key="majorKey">IBFrameworkSource</string>
	491	<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
	492	</object>
	493	</object>
	494	<object class="IBPartialClassDescription">
	495	<string key="className">NSObject</string>
	496	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	497	<string key="majorKey">IBFrameworkSource</string>
	498	<string key="minorKey">Foundation.framework/Headers/NSStream.h</string>
	499	</object>
	500	</object>
	501	<object class="IBPartialClassDescription">
	502	<string key="className">NSObject</string>
	503	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	504	<string key="majorKey">IBFrameworkSource</string>
	505	<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
	506	</object>
	507	</object>
	508	<object class="IBPartialClassDescription">
	509	<string key="className">NSObject</string>
	510	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	511	<string key="majorKey">IBFrameworkSource</string>
	512	<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
	513	</object>
	514	</object>
	515	<object class="IBPartialClassDescription">
	516	<string key="className">NSObject</string>
	517	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	518	<string key="majorKey">IBFrameworkSource</string>
	519	<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
	520	</object>
	521	</object>
	522	<object class="IBPartialClassDescription">
	523	<string key="className">NSObject</string>
	524	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	525	<string key="majorKey">IBFrameworkSource</string>
	526	<string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string>
	527	</object>
	528	</object>
	529	<object class="IBPartialClassDescription">
	530	<string key="className">NSObject</string>
	531	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	532	<string key="majorKey">IBFrameworkSource</string>
	533	<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
	534	</object>
	535	</object>
	536	<object class="IBPartialClassDescription">
	537	<string key="className">NSObject</string>
	538	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	539	<string key="majorKey">IBFrameworkSource</string>
	540	<string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
	541	</object>
	542	</object>
	543	<object class="IBPartialClassDescription">
	544	<string key="className">NSObject</string>
	545	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	546	<string key="majorKey">IBFrameworkSource</string>
	547	<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
	548	</object>
	549	</object>
	550	<object class="IBPartialClassDescription">
	551	<string key="className">NSObject</string>
	552	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	553	<string key="majorKey">IBFrameworkSource</string>
	554	<string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
	555	</object>
	556	</object>
	557	<object class="IBPartialClassDescription">
	558	<string key="className">NSObject</string>
	559	<object class="IBClassDescriptionSource" key="sourceIdentifier" id="318560304">
	560	<string key="majorKey">IBFrameworkSource</string>
	561	<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
	562	</object>
	563	</object>
	564	<object class="IBPartialClassDescription">
	565	<string key="className">UIBarButtonItem</string>
	566	<string key="superclassName">UIBarItem</string>
	567	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	568	<string key="majorKey">IBFrameworkSource</string>
	569	<string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
	570	</object>
	571	</object>
	572	<object class="IBPartialClassDescription">
	573	<string key="className">UIBarItem</string>
	574	<string key="superclassName">NSObject</string>
	575	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	576	<string key="majorKey">IBFrameworkSource</string>
	577	<string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
	578	</object>
	579	</object>
	580	<object class="IBPartialClassDescription">
	581	<string key="className">UIControl</string>
	582	<string key="superclassName">UIView</string>
	583	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	584	<string key="majorKey">IBFrameworkSource</string>
	585	<string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
	586	</object>
	587	</object>
	588	<object class="IBPartialClassDescription">
	589	<string key="className">UIImageView</string>
	590	<string key="superclassName">UIView</string>
	591	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	592	<string key="majorKey">IBFrameworkSource</string>
	593	<string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
	594	</object>
	595	</object>
	596	<object class="IBPartialClassDescription">
	597	<string key="className">UILabel</string>
	598	<string key="superclassName">UIView</string>
	599	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	600	<string key="majorKey">IBFrameworkSource</string>
	601	<string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
	602	</object>
	603	</object>
	604	<object class="IBPartialClassDescription">
	605	<string key="className">UIResponder</string>
	606	<string key="superclassName">NSObject</string>
	607	<reference key="sourceIdentifier" ref="318560304"/>
	608	</object>
	609	<object class="IBPartialClassDescription">
	610	<string key="className">UISearchBar</string>
	611	<string key="superclassName">UIView</string>
	612	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	613	<string key="majorKey">IBFrameworkSource</string>
	614	<string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
	615	</object>
	616	</object>
	617	<object class="IBPartialClassDescription">
	618	<string key="className">UISearchDisplayController</string>
	619	<string key="superclassName">NSObject</string>
	620	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	621	<string key="majorKey">IBFrameworkSource</string>
	622	<string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
	623	</object>
	624	</object>
	625	<object class="IBPartialClassDescription">
	626	<string key="className">UISwitch</string>
	627	<string key="superclassName">UIControl</string>
	628	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	629	<string key="majorKey">IBFrameworkSource</string>
	630	<string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
	631	</object>
	632	</object>
	633	<object class="IBPartialClassDescription">
	634	<string key="className">UIToolbar</string>
	635	<string key="superclassName">UIView</string>
	636	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	637	<string key="majorKey">IBFrameworkSource</string>
	638	<string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
	639	</object>
	640	</object>
	641	<object class="IBPartialClassDescription">
	642	<string key="className">UIView</string>
	643	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	644	<string key="majorKey">IBFrameworkSource</string>
	645	<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
	646	</object>
	647	</object>
	648	<object class="IBPartialClassDescription">
	649	<string key="className">UIView</string>
	650	<string key="superclassName">UIResponder</string>
	651	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	652	<string key="majorKey">IBFrameworkSource</string>
	653	<string key="minorKey">UIKit.framework/Headers/UIView.h</string>
	654	</object>
	655	</object>
	656	<object class="IBPartialClassDescription">
	657	<string key="className">UIViewController</string>
	658	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	659	<string key="majorKey">IBFrameworkSource</string>
	660	<string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
	661	</object>
	662	</object>
	663	<object class="IBPartialClassDescription">
	664	<string key="className">UIViewController</string>
	665	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	666	<string key="majorKey">IBFrameworkSource</string>
	667	<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
	668	</object>
	669	</object>
	670	<object class="IBPartialClassDescription">
	671	<string key="className">UIViewController</string>
	672	<string key="superclassName">UIResponder</string>
	673	<object class="IBClassDescriptionSource" key="sourceIdentifier">
	674	<string key="majorKey">IBFrameworkSource</string>
	675	<string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
477	676	</object>
478	677	</object>
…	…
480	679	</object>
481	680	<int key="IBDocument.localizationMode">0</int>
482		<string key="IBDocument.LastKnownRelativeProjectPath">VIP.tel.xcodeproj</string>
	681	<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
	682	<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
	683	<integer value="768" key="NS.object.0"/>
	684	</object>
	685	<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
	686	<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
	687	<integer value="768" key="NS.object.0"/>
	688	</object>
	689	<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
	690	<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
	691	<integer value="3000" key="NS.object.0"/>
	692	</object>
	693	<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
	694	<string key="IBDocument.LastKnownRelativeProjectPath">../VIP.tel.xcodeproj</string>
483	695	<int key="IBDocument.defaultPropertyAccessControl">3</int>
	696	<string key="IBCocoaTouchPluginVersion">3.1</string>
484	697	</data>
485	698	</archive>

apps/iphone/my.tel/trunk/VIP.tel.xcodeproj/project.pbxproj

r426	r535
18	18	380C02980F34670F00BD6C63 /* SubdomainViewController.m in Sources / = {isa = PBXBuildFile; fileRef = 380C02970F34670F00BD6C63 / SubdomainViewController.m */; };
19	19	380C02BE0F34CB5100BD6C63 /* DisclosureIndicator.png in Resources / = {isa = PBXBuildFile; fileRef = 380C02BD0F34CB5100BD6C63 / DisclosureIndicator.png */; };
20		~~3814C4F00F6FD54F00053AB3 /* Icon.png in Resources / = {isa = PBXBuildFile; fileRef = 3814C4EF0F6FD54F00053AB3 / Icon.png */; };~~
21	20	382732320ED34A8C0084A6CB /* RecordCell.m in Sources / = {isa = PBXBuildFile; fileRef = 382732310ED34A8C0084A6CB / RecordCell.m */; };
22	21	382FDCD20F3B352B0021A935 /* Entitlements.plist in Resources / = {isa = PBXBuildFile; fileRef = 382FDCD10F3B352B0021A935 / Entitlements.plist */; };
…	…
75	74	38435D020F2A038D00F9D50C /* iconselected.png in Resources / = {isa = PBXBuildFile; fileRef = 38435CFF0F2A038D00F9D50C / iconselected.png */; };
76	75	38435D3D0F2A148500F9D50C /* ProfileViewController.m in Sources / = {isa = PBXBuildFile; fileRef = 38435C780F28B40200F9D50C / ProfileViewController.m */; };
77		~~384988F50F6F76DE00496293 /* MapView.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 384988F40F6F76DE00496293 / MapView.framework */; };~~
78	76	384E482E0ED95DCF00CC1CDB /* Default.png in Resources / = {isa = PBXBuildFile; fileRef = 384E482D0ED95DCF00CC1CDB / Default.png */; };
79	77	384E48300ED95DF300CC1CDB /* background-proxy.png in Resources / = {isa = PBXBuildFile; fileRef = 384E482F0ED95DF300CC1CDB / background-proxy.png */; };
…	…
177	175	38B96AEF0F30B18C006772B4 /* button-erase-tel.png in Resources / = {isa = PBXBuildFile; fileRef = 38B96AEE0F30B18C006772B4 / button-erase-tel.png */; };
178	176	38B96AF10F30B1BA006772B4 /* button-set-tel.png in Resources / = {isa = PBXBuildFile; fileRef = 38B96AF00F30B1BA006772B4 / button-set-tel.png */; };
	177	38DA3A4C107A30C600C4DF56 /* MapKit.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 38DA3A4B107A30C600C4DF56 / MapKit.framework */; };
	178	38DA3A55107A326900C4DF56 /* TelMapAnnotation.m in Sources / = {isa = PBXBuildFile; fileRef = 38DA3A54107A326900C4DF56 / TelMapAnnotation.m */; };
179	179	38E4DA070F49844700E4DC12 /* offlineSampleData.plist in Resources / = {isa = PBXBuildFile; fileRef = 38E4DA060F49844700E4DC12 / offlineSampleData.plist */; };
180	180	38E9DC790ED321A6000CD956 /* Record.m in Sources / = {isa = PBXBuildFile; fileRef = 38E9DC780ED321A6000CD956 / Record.m */; };
…	…
306	306	38435CFE0F2A038D00F9D50C /* iconactiveselected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iconactiveselected.png; sourceTree = SOURCE_ROOT; };
307	307	38435CFF0F2A038D00F9D50C /* iconselected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iconselected.png; path = ../iconselected.png; sourceTree = "<group>"; };
308		~~384988F40F6F76DE00496293 /* MapView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MapView.framework; sourceTree = "<group>"; };~~
309	308	384E482D0ED95DCF00CC1CDB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = "<group>"; };
310	309	384E482F0ED95DF300CC1CDB /* background-proxy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background-proxy.png"; path = "../background-proxy.png"; sourceTree = "<group>"; };
…	…
427	426	38D4C17C0EF6966F00A190A1 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/LocationIndicators.plist; sourceTree = "<group>"; };
428	427	38D4C1810EF6967C00A190A1 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/ServiceTypes.plist; plistStructureDefinitionIdentifier = "<none>"; sourceTree = "<group>"; };
	428	38DA3A4B107A30C600C4DF56 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
	429	38DA3A53107A326900C4DF56 /* TelMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelMapAnnotation.h; sourceTree = "<group>"; };
	430	38DA3A54107A326900C4DF56 /* TelMapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TelMapAnnotation.m; sourceTree = "<group>"; };
429	431	38E4DA060F49844700E4DC12 /* offlineSampleData.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = offlineSampleData.plist; sourceTree = "<group>"; };
430	432	38E9DC770ED321A6000CD956 /* Record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Record.h; sourceTree = "<group>"; };
…	…
452	454	38F0F72B0ED8AD4B00CF5196 /* QuartzCore.framework in Frameworks */,
453	455	3843574D0F27262900F9D50C /* libsqlite3.0.dylib in Frameworks */,
454		38~~4988F50F6F76DE00496293 /* MapView~~.framework in Frameworks */,
	456	38DA3A4C107A30C600C4DF56 /* MapKit.framework in Frameworks */,
455	457	);
456	458	runOnlyForDeploymentPostprocessing = 0;
…	…
473	475	3893FAEB0ED2284000F713B5 /* MyCLController.h */,
474	476	3893FAEC0ED2284000F713B5 /* MyCLController.m */,
	477	38DA3A53107A326900C4DF56 /* TelMapAnnotation.h */,
	478	38DA3A54107A326900C4DF56 /* TelMapAnnotation.m */,
475	479	);
476	480	path = Classes;
…	…
530	534	isa = PBXGroup;
531	535	children = (
532		38~~4988F40F6F76DE00496293 /* MapView.framework~~ */,
	536	38596F850EC969B8003B6329 /* libobjc.dylib */,
533	537	3843574C0F27262900F9D50C /* libsqlite3.0.dylib */,
534		38~~596F850EC969B8003B6329 /* libobjc.dylib~~ */,
	538	38DA3A4B107A30C600C4DF56 /* MapKit.framework */,
535	539	38596F860EC969B8003B6329 /* AddressBook.framework */,
536	540	38596F870EC969B8003B6329 /* AddressBookUI.framework */,
…	…
574	578	383FE4710F333380008A9342 /* DnsResolver.h */,
575	579	383FE4720F333380008A9342 /* DnsResolver.m */,
576		~~389AC2AB0F8D3C2200400977 /* NetworkUtility.m */,~~
577	580	389AC2AC0F8D3C2200400977 /* Reachability.m */,
578	581	389AC2AD0F8D3C2200400977 /* Reachability.h */,
579	582	389AC2AE0F8D3C2200400977 /* NetworkUtility.h */,
	583	389AC2AB0F8D3C2200400977 /* NetworkUtility.m */,
580	584	383FE4730F333380008A9342 /* RecordLoc.h */,
581	585	383FE4740F333380008A9342 /* RecordLoc.m */,
…	…
1023	1027	38ACC4430F9A2B26004B5A31 /* AboutView.xib in Resources */,
1024	1028	38ACC43F0F9A2AA6004B5A31 /* About.html in Resources */,
1025		~~3814C4F00F6FD54F00053AB3 /* Icon.png in Resources */,~~
1026	1029	);
1027	1030	runOnlyForDeploymentPostprocessing = 0;
…	…
1108	1111	389AC2AF0F8D3C2200400977 /* NetworkUtility.m in Sources */,
1109	1112	389AC2B00F8D3C2200400977 /* Reachability.m in Sources */,
	1113	38DA3A55107A326900C4DF56 /* TelMapAnnotation.m in Sources */,
1110	1114	);
1111	1115	runOnlyForDeploymentPostprocessing = 0;
…	…
1322	1326	PREBINDING = NO;
1323	1327	PROVISIONING_PROFILE = "DC881623-4681-45BB-B714-179F016CBFD9";
1324		SDKROOT = iphoneos~~2.1~~;
	1328	SDKROOT = iphoneos3.0;
1325	1329	};
1326	1330	name = Distribution;
…	…
1355	1359	GCC_WARN_UNUSED_VARIABLE = YES;
1356	1360	PREBINDING = NO;
1357		SDKROOT = iphoneos~~2.1~~;
	1361	SDKROOT = iphoneos3.0;
1358	1362	};
1359	1363	name = "Release - Apple ad-hoc";
…	…
1391	1395	PREBINDING = NO;
1392	1396	PROVISIONING_PROFILE = "447EE44B-840F-4966-BF8B-8DE8B2B74D91";
1393		SDKROOT = iphoneos~~2.1~~;
	1397	SDKROOT = iphoneos3.0;
1394	1398	};
1395	1399	name = Debug;
…	…
1405	1409	PREBINDING = NO;
1406	1410	PROVISIONING_PROFILE = "447EE44B-840F-4966-BF8B-8DE8B2B74D91";
1407		SDKROOT = iphoneos~~2.1~~;
	1411	SDKROOT = iphoneos3.0;
1408	1412	};
1409	1413	name = Release;