Changeset 601 for apps/iphone/my.tel/trunk

Timestamp:

12/12/09 06:19:09 (3 years ago)

Author:

henri

Message:

Support for long labels

Location:

apps/iphone/my.tel/trunk

Files:

• Classes/API Classes/JsonConnection.h (modified) (2 diffs)
• Classes/API Classes/Record.m (modified) (1 diff)
• Classes/ProfileRecordsViewController.m (modified) (5 diffs)
• Classes/ProfileViewController.m (modified) (7 diffs)
• Classes/RecordEditController.h (modified) (1 diff)
• Classes/RecordEditController.m (modified) (7 diffs)
• Classes/RecordViewController.m (modified) (5 diffs)
• English.lproj/ProfileRecords.xib (modified) (15 diffs)
• offlineSampleData.plist (modified) (1 diff)

apps/iphone/my.tel/trunk/Classes/API Classes/JsonConnection.h

@@ -30 +30 @@
         BOOL isProcessing;
         NSURL *connectionUrl;
+        NSString *action;
 @private
         NSObject *theDelegate;
@@ -36 +37 @@
         NSDictionary *payload;
         NSMutableString *responsePayload;
-        NSString *action;
 }
 

apps/iphone/my.tel/trunk/Classes/API Classes/Record.m

@@ -22 +22 @@
 }
 
+// Override method to convert labels into long labels
+
+- (void)parsePayload {
+        [super parsePayload];
+        if ([action isEqualToString:@"getrecordlist"]) {
+                NSMutableArray *convertedArray = [NSMutableArray arrayWithArray:(NSArray *)[self.parsedJSON valueForKey:@"recordList"]];
+                NSUInteger i, count = [convertedArray count];
+                for (i = 0; i < count; i++) {
+                        NSDictionary *aDict = [convertedArray objectAtIndex:i];
+                        // set label: if long label doesn't exist but short does, replace short with long
+                        // if short exists and long exists, prepend short to long if not already prepended
+                        // in all cases, clear short
+                        BOOL hasLabel = NO;
+                        BOOL hasLongLabel = NO;
+                        BOOL didMakeChange = NO;
+                        if ([[aDict objectForKey:@"label"] isKindOfClass:[NSString class]] && [[aDict objectForKey:@"label"] length] > 0)
+                                hasLabel = YES;
+                        if ([[aDict objectForKey:@"longLabel"] isKindOfClass:[NSString class]] && [[aDict objectForKey:@"longLabel"] length] > 0)
+                                hasLongLabel = YES;
+                        
+                        NSMutableDictionary *convertedDict;
+                        if (! hasLongLabel) {
+                                if (hasLabel) {
+                                        // Convert label to long label
+                                        convertedDict = [NSMutableDictionary dictionaryWithDictionary:aDict];
+                                        [convertedDict setObject:[convertedDict objectForKey:@"label"] forKey:@"longLabel"];
+                                        [convertedDict setObject:@"" forKey:@"label"];
+                                        didMakeChange = YES;
+                                }
+                        } else {
+                                if (hasLabel) {
+                                        if (! [[aDict objectForKey:@"longLabel"] hasPrefix:[aDict objectForKey:@"label"]]) {
+                                                // If both long and short exist, and short isn't the first part of long, then merge "short - long"
+                                                convertedDict = [NSMutableDictionary dictionaryWithDictionary:aDict];
+                                                [convertedDict setObject:[NSString stringWithFormat:@"%@ - %@",
+                                                                                                  [convertedDict objectForKey:@"label"],
+                                                                                                  [convertedDict objectForKey:@"longLabel"]]
+                                                                                  forKey:@"longLabel"];
+                                                [convertedDict setObject:@"" forKey:@"label"];
+                                                didMakeChange = YES;
+                                        }
+                                }
+                        }
+                        if (didMakeChange) {
+                                [convertedArray replaceObjectAtIndex:i withObject:convertedDict];
+                                NSMutableDictionary *newJSON = [NSMutableDictionary dictionaryWithDictionary:self.parsedJSON];
+                                [newJSON setObject:convertedArray forKey:@"recordList"];
+                                self.parsedJSON = newJSON;
+                        }
+                }
+        }
+}
+
 @end

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

@@ -74 +74 @@
     [super viewDidLoad];
         self.title = [self.theProfile objectForKey:@"name"];
-        self.theTable.tableHeaderView = self.tableHeaderView;
+//      self.theTable.tableHeaderView = self.tableHeaderView;
         self.navigationItem.rightBarButtonItem = self.editButtonItem;
-        self.theTable.allowsSelection = YES;
-        self.theTable.allowsSelectionDuringEditing = YES;       // so that the cells can be enabled/disabled
+//      self.theTable.allowsSelection = YES;
+//      self.theTable.allowsSelectionDuringEditing = YES;       // so that the cells can be enabled/disabled
         recordTableHeight = kRowHeight;
         if ([[self.theProfile valueForKey:@"isActive"] integerValue] == 1) {
                 self.buttonActivate.enabled = NO;
-        } else {
+                self.buttonActivate.title = @"Profile is Active";
+        } else {
+                self.buttonActivate.title = @"Activate Profile";
                 self.buttonActivate.enabled = YES;
         }
@@ -150 +152 @@
         NSMutableDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
         [cell.labelService setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"service"]]];
-        [cell.labelLabel setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"label"]]];
+        [cell.labelLabel setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"longLabel"]]];
         [cell.labelValue setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"value"]]];
         
@@ -254 +256 @@
                 default:
                         // If there's no label, shorten the row by the label point size + 2
-                        if ([[[uiArray objectAtIndex:indexPath.row] objectForKey:@"label"] length] == 0) {
+                        if ([[[uiArray objectAtIndex:indexPath.row] objectForKey:@"longLabel"] length] == 0) {
                                 return (recordTableHeight - 14);
                         } else {
@@ -273 +275 @@
         [super setEditing:NO animated:YES];
         self.theTable.editing = NO;
-        [self displayDisabledRecords:YES];
+        [self displayDisabledRecords:NO];
 }       
 
 - (IBAction)didClickActivate:(id)sender {
         [self activateProfile];
+        self.buttonActivate.enabled = NO;
+        self.buttonActivate.title = @"Profile is Active";
 }
 
@@ -399 +403 @@
 
         // set label
-        if ([[jsonItem objectForKey:@"label"] isKindOfClass:[NSNull class]])
-                [uiItem setObject:@"" forKey:@"label"];
+        if ([[jsonItem objectForKey:@"longLabel"] isKindOfClass:[NSNull class]])
+                [uiItem setObject:@"" forKey:@"longLabel"];
         else
-                [uiItem setObject:(NSString *)[jsonItem objectForKey:@"label"] forKey:@"label"];
+                [uiItem setObject:(NSString *)[jsonItem objectForKey:@"longLabel"] forKey:@"longLabel"];
         
         // set public/private

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

@@ -25 +25 @@
 
 + (ProfileViewController *)controllerWithDelegate:(id <TelControllerDelegate>)aDelegate preload:(BOOL)preload {
-        ProfileViewController *theC = [[[ProfileViewController alloc] initWithStyle:UITableViewStylePlain] autorelease];
+        ProfileViewController *theC = [[[ProfileViewController alloc] initWithStyle:UITableViewStyleGrouped] autorelease];
         theC.delegate = aDelegate;
         theC.profilesArray = [NSMutableArray arrayWithCapacity:10];
@@ -55 +55 @@
         self.navigationItem.rightBarButtonItem = [self editButtonItem];
         self.title = @"Profiles";
+        self.tableView.allowsSelectionDuringEditing = YES;
 }
 
@@ -89 +90 @@
 }
 
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-        return [[MyTelConnect sharedInstance] topDomainFromDomain:[self.delegate domain]];
-}
+//- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+//      return [[MyTelConnect sharedInstance] topDomainFromDomain:[self.delegate domain]];
+//}
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -116 +117 @@
         if (recordsCount > 0)
                 recordsCount -= 1;
-        cell.textLabel.text = (NSString *)[aProf objectForKey:@"name"];
-
+        if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
+                cell.textLabel.font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cell.textLabel.font.pointSize];
+                [cell setNeedsLayout];
+        }
         if ([[aProf objectForKey:@"isActive"] integerValue] == 1) {
                 cell.textLabel.textColor = [UIColor blueColor];
@@ -125 +128 @@
                 cell.detailTextLabel.text = @"Inactive";
         }
-        if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
-                cell.textLabel.font = [UIFont fontWithName:@"Helvetica-BoldOblique" size:cell.textLabel.font.pointSize];
-        }
+        cell.textLabel.text = (NSString *)[aProf objectForKey:@"name"];
         [aProf release];
         return cell;
@@ -138 +139 @@
         [aProf release];
         [self.navigationController pushViewController:prVC animated:YES];
-}
-
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-        NSDictionary *aProf = [[profilesArray objectAtIndex:indexPath.row] retain];
-        if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
-                return NO;
-        }
-        if ([[aProf objectForKey:@"isActive"] integerValue] == 1) {
-                return NO;
-        }
-        return YES;
 }
 
@@ -162 +152 @@
         }
 }
+
+- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
+        NSDictionary *aProf = [[profilesArray objectAtIndex:indexPath.row] retain];
+        if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
+                return UITableViewCellEditingStyleNone;
+        }
+        if ([[aProf objectForKey:@"isActive"] integerValue] == 1) {
+                return UITableViewCellEditingStyleNone;
+        }
+        return UITableViewCellEditingStyleDelete;
+}
+
+//- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+//      NSDictionary *aProf = [[profilesArray objectAtIndex:indexPath.row] retain];
+//      if ([[aProf objectForKey:@"isDefault"] integerValue] == 1) {
+//              return NO;
+//      }
+//      if ([[aProf objectForKey:@"isActive"] integerValue] == 1) {
+//              return NO;
+//      }
+//      return YES;
+//}
 
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle

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

@@ -36 +36 @@
         NSDictionary *naptrValuePlaceholders;
         UIResponder *currentResponder;
+        BOOL isTerminal;
 }
 
 + (RecordEditController *)controllerWithServiceKeys:(NSDictionary *)skeysDict lihKeys:(NSDictionary *)liDict;
-- (void)setStateForTerminal:(BOOL)isTerminal;
+- (void)setStateForTerminal:(BOOL)terminal;
 - (void)setStateForButtonPrivacy;
 - (void)slideViewForEditing:(BOOL)isEditing;

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

@@ -137 +137 @@
                 rLabel.text = @"";
                 _record = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                                  @"0",                                                                                 @"apiId",
-                                                  [self.delegate domain],                                               @"domainName",
-                                                  [NSArray arrayWithObject:@"voice"],                   @"serviceKeys",
-                                                  @"",                                                                                  @"label",
-                                                  [NSArray array],                                                              @"locations",
-                                                  [NSArray array],                                                              @"profiles",
-                                                  [NSArray array],                                                              @"groups",
-                                                  @"1",                                                                                 @"terminal",
-                                                  nil] retain];
+                                        @"0",                                                                                   @"apiId",
+                                        [self.delegate domain],                                                 @"domainName",
+                                        [NSArray arrayWithObject:@"voice"],                             @"serviceKeys",
+                                        @"",                                                                                    @"label",
+                                        @"",                                                                                    @"longLabel",
+                                        [NSArray array],                                                                @"locations",
+                                        [NSArray array],                                                                @"profiles",
+                                        [NSArray array],                                                                @"groups",
+                                        @"1",                                                                                   @"terminal",
+                                        nil] retain];
         } else { // edit
                 self.title = @"Edit Item";
                 [_record setObject:[self.delegate domain] forKey:@"domainName"];
-                // An NTN may not have the below items
-                if ([[_record objectForKey:@"label"] isKindOfClass:[NSNull class]])
-                        [_record setObject:@"" forKey:@"label"];
+                // A record may or may not have the below items
+                if ([[_record objectForKey:@"longLabel"] isKindOfClass:[NSNull class]])
+                        [_record setObject:@"" forKey:@"longLabel"];
                 if ([[_record objectForKey:@"locations"] isKindOfClass:[NSNull class]])
                         [_record setObject:[NSArray array] forKey:@"locations"];
@@ -167 +168 @@
                 
                 rValue.text = [_record objectForKey:@"value"];
-                rLabel.text = [_record objectForKey:@"label"];
+                rLabel.text = [_record objectForKey:@"longLabel"];
         }
         // We only respect the first LIH and service types.
@@ -217 +218 @@
         // apiId and domainName are set at the start in presentView
         [_record setObject:rValue.text forKey:@"value"];
-        [_record setObject:rLabel.text forKey:@"label"];
+        [_record setObject:rLabel.text forKey:@"longLabel"];
 
         // Store the record
@@ -245 +246 @@
          groups: [1, 2, 3],
          profiles: [12, 23, 47],
-         locations: ["x-home", "x-mobile"]
+         locations: ["x-home", "x-mobile"],
+         longLabel: "Some more details about my home number"
          };
          
@@ -280 +282 @@
          groups: [],
          profiles: [],
-         globalProfile: true
+         globalProfile: true,
+         longLabel: "Some text"
          };
          
@@ -322 +325 @@
 #pragma mark ------ Utility methods
 
-- (void)setStateForTerminal:(BOOL)isTerminal {
+- (void)setStateForTerminal:(BOOL)terminal {
         // NTNs now have all the features of terminal NAPTRs including labels
         //      if (isTerminal) {
         //      } else {
         //      }
+        isTerminal = terminal;
         rLabel.placeholder = @"";
         rLabel.enabled = YES;
@@ -425 +429 @@
                                 return 0;
                 } else {
-                        if ([[sArrKey objectAtIndex:[rPicker selectedRowInComponent:0]] isEqualToString:@"ntn"] )       // ntn: disable locations
+                        if (! isTerminal )      // ntn: disable locations
                                 return 0;
                 }

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

@@ -173 +173 @@
                 NSMutableDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
                 [cell.labelService setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"service"]]];
-                [cell.labelLabel setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"label"]]];
+                [cell.labelLabel setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"longLabel"]]];
                 [cell.labelValue setText:[NSString stringWithFormat:@"%@", [uiItem objectForKey:@"value"]]];
                 
@@ -289 +289 @@
         }
         // If there's no label, shorten the row by the label point size + 2
-        if ([[[uiArray objectAtIndex:indexPath.row] objectForKey:@"label"] length] == 0) {
+        if ([[[uiArray objectAtIndex:indexPath.row] objectForKey:@"longLabel"] length] == 0) {
                 return (recordTableHeight - 14);
         } else {
@@ -362 +362 @@
         //  {apiId: 23, terminal: true,
         //      serviceKeys: ["voice", "fax"], value: "+34.34343443",
-        //      label: "my home number", groups: [1, 3],
+        //      groups: [1, 3],
         //      profiles: [12, 23], global: false,
-        //      locations: ["x-home", "x-mobile"], editable: true}
+        //      locations: ["x-home", "x-mobile"], editable: true,
+        //  longLabel: "Some text to describe my home number"}
 #ifdef DEBUG
         NSLog(@"Naptr Rec in JSON: %@", [jsonItem descriptionInStringsFileFormat]);
@@ -385 +386 @@
 
         // set label
-        if ([[jsonItem objectForKey:@"label"] isKindOfClass:[NSNull class]])
-                [uiItem setObject:@"" forKey:@"label"];
+        if ([[jsonItem objectForKey:@"longLabel"] isKindOfClass:[NSNull class]])
+                [uiItem setObject:@"" forKey:@"longLabel"];
         else
-                [uiItem setObject:(NSString *)[jsonItem objectForKey:@"label"] forKey:@"label"];
+                [uiItem setObject:(NSString *)[jsonItem objectForKey:@"longLabel"] forKey:@"longLabel"];
         
         // set public/private
@@ -468 +469 @@
 //      profiles: [12, 23], global: false,
 //      locations: ["x-home", "x-mobile"], editable: true},
-//              {apiId: 12, terminal: true, serviceKeys: ["web"],,
+//      longLabel: "Some text to describe my home number",
+//      {apiId: 12, terminal: true, serviceKeys: ["web"],,
 //      value: "www.telnic.org", label: "my homepage",
 //      groups: [3], profiles: [], global: true,
 //      locations: ["x-home"], editable: true},
-//              {apiId: 12, terminal: false, value: "stan.cartman.tel.",
+//      {apiId: 12, terminal: false, value: "stan.cartman.tel.",
 //      groups: [3], profiles: [], global: true}],
 //      actionMessages: ["request successful",

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

@@ -3 +3 @@
         <data>
                 <int key="IBDocument.SystemTarget">768</int>
-                <string key="IBDocument.SystemVersion">10B504</string>
+                <string key="IBDocument.SystemVersion">10C540</string>
                 <string key="IBDocument.InterfaceBuilderVersion">732</string>
-                <string key="IBDocument.AppKitVersion">1038.2</string>
-                <string key="IBDocument.HIToolboxVersion">437.00</string>
+                <string key="IBDocument.AppKitVersion">1038.25</string>
+                <string key="IBDocument.HIToolboxVersion">458.00</string>
                 <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                         <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -13 +13 @@
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="17"/>
                         <integer value="4"/>
-                        <integer value="37"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -40 +38 @@
                         <object class="IBUITableView" id="584496140">
                                 <reference key="NSNextResponder"/>
-                                <int key="NSvFlags">274</int>
-                                <string key="NSFrameSize">{320, 373}</string>
+                                <int key="NSvFlags">301</int>
+                                <object class="NSMutableArray" key="NSSubviews">
+                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                        <object class="IBUIView" id="801181119">
+                                                <reference key="NSNextResponder" ref="584496140"/>
+                                                <int key="NSvFlags">292</int>
+                                                <object class="NSMutableArray" key="NSSubviews">
+                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <object class="IBUIToolbar" id="873782716">
+                                                                <reference key="NSNextResponder" ref="801181119"/>
+                                                                <int key="NSvFlags">266</int>
+                                                                <string key="NSFrameSize">{320, 44}</string>
+                                                                <reference key="NSSuperview" ref="801181119"/>
+                                                                <object class="NSColor" key="IBUIBackgroundColor">
+                                                                        <int key="NSColorSpace">1</int>
+                                                                        <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                                                </object>
+                                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+                                                                <object class="NSMutableArray" key="IBUIItems">
+                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                        <object class="IBUIBarButtonItem" id="947532439">
+                                                                                <string key="IBUITitle">Become Active Profile</string>
+                                                                                <int key="IBUIStyle">1</int>
+                                                                                <reference key="IBUIToolbar" ref="873782716"/>
+                                                                        </object>
+                                                                        <object class="IBUIBarButtonItem" id="798652086">
+                                                                                <reference key="IBUIToolbar" ref="873782716"/>
+                                                                                <int key="IBUISystemItemIdentifier">5</int>
+                                                                        </object>
+                                                                        <object class="IBUIBarButtonItem" id="930083113">
+                                                                                <string key="IBUITitle">Rename</string>
+                                                                                <int key="IBUIStyle">1</int>
+                                                                                <reference key="IBUIToolbar" ref="873782716"/>
+                                                                        </object>
+                                                                </object>
+                                                                <object class="NSColor" key="IBUITintColor">
+                                                                        <int key="NSColorSpace">1</int>
+                                                                        <bytes key="NSRGB">MC4yODEwNjM5NjM0IDAuMTcxMTkwMDg0MiAwLjUAA</bytes>
+                                                                </object>
+                                                        </object>
+                                                </object>
+                                                <string key="NSFrameSize">{320, 44}</string>
+                                                <reference key="NSSuperview" ref="584496140"/>
+                                                <object class="NSColor" key="IBUIBackgroundColor">
+                                                        <int key="NSColorSpace">3</int>
+                                                        <bytes key="NSWhite">MQA</bytes>
+                                                        <object class="NSColorSpace" key="NSCustomColorSpace">
+                                                                <int key="NSID">2</int>
+                                                        </object>
+                                                </object>
+                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+                                        </object>
+                                </object>
+                                <string key="NSFrameSize">{320, 416}</string>
                                 <reference key="NSSuperview"/>
                                 <object class="NSColor" key="IBUIBackgroundColor">
-                                        <int key="NSColorSpace">3</int>
-                                        <bytes key="NSWhite">MQA</bytes>
+                                        <int key="NSColorSpace">1</int>
+                                        <bytes key="NSRGB">MC41MDE5NjA4MTQgMCAwLjI1MDk4MDQwNwA</bytes>
                                 </object>
                                 <bool key="IBUIOpaque">NO</bool>
                                 <bool key="IBUIClipsSubviews">YES</bool>
                                 <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+                                <int key="IBUIContentMode">5</int>
+                                <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                                <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                        <bool key="IBUIPrompted">NO</bool>
+                                </object>
                                 <bool key="IBUIBouncesZoom">NO</bool>
+                                <int key="IBUIStyle">1</int>
                                 <int key="IBUISeparatorStyle">1</int>
                                 <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+                                <bool key="IBUIAllowsSelectionDuringEditing">YES</bool>
                                 <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
                                 <float key="IBUIRowHeight">44</float>
-                                <float key="IBUISectionHeaderHeight">22</float>
-                                <float key="IBUISectionFooterHeight">22</float>
-                        </object>
-                        <object class="IBUIView" id="608739957">
-                                <reference key="NSNextResponder"/>
-                                <int key="NSvFlags">292</int>
-                                <object class="NSMutableArray" key="NSSubviews">
-                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                        <object class="IBUIToolbar" id="873782716">
-                                                <reference key="NSNextResponder" ref="608739957"/>
-                                                <int key="NSvFlags">266</int>
-                                                <string key="NSFrame">{{0, -1}, {320, 44}}</string>
-                                                <reference key="NSSuperview" ref="608739957"/>
-                                                <bool key="IBUIOpaque">NO</bool>
-                                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-                                                <object class="NSMutableArray" key="IBUIItems">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <object class="IBUIBarButtonItem" id="947532439">
-                                                                <string key="IBUITitle">Become Active Profile</string>
-                                                                <int key="IBUIStyle">1</int>
-                                                                <reference key="IBUIToolbar" ref="873782716"/>
-                                                        </object>
-                                                        <object class="IBUIBarButtonItem" id="798652086">
-                                                                <reference key="IBUIToolbar" ref="873782716"/>
-                                                                <int key="IBUISystemItemIdentifier">5</int>
-                                                        </object>
-                                                        <object class="IBUIBarButtonItem" id="930083113">
-                                                                <string key="IBUITitle">Rename</string>
-                                                                <int key="IBUIStyle">1</int>
-                                                                <reference key="IBUIToolbar" ref="873782716"/>
-                                                        </object>
-                                                </object>
-                                                <object class="NSColor" key="IBUITintColor">
-                                                        <int key="NSColorSpace">1</int>
-                                                        <bytes key="NSRGB">MC4yNTA5ODA0MDcgMCAwLjUwMTk2MDgxNAA</bytes>
-                                                </object>
-                                        </object>
-                                </object>
-                                <string key="NSFrameSize">{320, 43}</string>
-                                <reference key="NSSuperview"/>
-                                <object class="NSColor" key="IBUIBackgroundColor">
-                                        <int key="NSColorSpace">3</int>
-                                        <bytes key="NSWhite">MQA</bytes>
-                                        <object class="NSColorSpace" key="NSCustomColorSpace">
-                                                <int key="NSID">2</int>
-                                        </object>
-                                </object>
-                                <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+                                <float key="IBUISectionHeaderHeight">10</float>
+                                <float key="IBUISectionFooterHeight">10</float>
+                                <reference key="IBUITableHeaderView" ref="801181119"/>
                         </object>
                         <object class="IBUITableViewCell" id="48316267">
-                                <reference key="NSNextResponder"/>
+                                <nil key="NSNextResponder"/>
                                 <int key="NSvFlags">292</int>
                                 <object class="NSMutableArray" key="NSSubviews">
@@ -116 +128 @@
                                                         <object class="IBUILabel" id="839931344">
                                                                 <reference key="NSNextResponder" ref="156246093"/>
-                                                                <int key="NSvFlags">292</int>
-                                                                <string key="NSFrame">{{20, 0}, {280, 43}}</string>
+                                                                <int key="NSvFlags">274</int>
+                                                                <string key="NSFrame">{{20, 0}, {280, 78}}</string>
                                                                 <reference key="NSSuperview" ref="156246093"/>
                                                                 <object class="NSColor" key="IBUIBackgroundColor" id="770560937">
@@ -139 +151 @@
                                                                 <int key="IBUIBaselineAdjustment">1</int>
                                                                 <float key="IBUIMinimumFontSize">12</float>
-                                                                <int key="IBUINumberOfLines">3</int>
+                                                                <int key="IBUINumberOfLines">4</int>
                                                                 <int key="IBUILineBreakMode">0</int>
                                                         </object>
                                                 </object>
-                                                <string key="NSFrameSize">{300, 43}</string>
+                                                <string key="NSFrameSize">{300, 78}</string>
                                                 <reference key="NSSuperview" ref="48316267"/>
                                                 <reference key="IBUIBackgroundColor" ref="770560937"/>
@@ -152 +164 @@
                                         </object>
                                 </object>
-                                <string key="NSFrameSize">{320, 44}</string>
-                                <reference key="NSSuperview"/>
+                                <string key="NSFrame">{{0, 191}, {320, 79}}</string>
                                 <object class="NSColor" key="IBUIBackgroundColor">
                                         <int key="NSColorSpace">1</int>
-                                        <bytes key="NSRGB">MSAxIDEgMAA</bytes>
+                                        <bytes key="NSRGB">MSAxIDEAA</bytes>
                                 </object>
                                 <bool key="IBUIOpaque">NO</bool>
@@ -174 +185 @@
                                 <object class="IBConnectionRecord">
                                         <object class="IBCocoaTouchOutletConnection" key="connection">
-                                                <string key="label">tableHeaderView</string>
-                                                <reference key="source" ref="372490531"/>
-                                                <reference key="destination" ref="608739957"/>
-                                        </object>
-                                        <int key="connectionID">18</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBCocoaTouchOutletConnection" key="connection">
                                                 <string key="label">view</string>
                                                 <reference key="source" ref="372490531"/>
@@ -282 +285 @@
                                         </object>
                                         <object class="IBObjectRecord">
-                                                <int key="objectID">17</int>
-                                                <reference key="object" ref="608739957"/>
+                                                <int key="objectID">37</int>
+                                                <reference key="object" ref="48316267"/>
                                                 <object class="NSMutableArray" key="children">
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <reference ref="839931344"/>
+                                                </object>
+                                                <reference key="parent" ref="0"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">39</int>
+                                                <reference key="object" ref="839931344"/>
+                                                <reference key="parent" ref="48316267"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">4</int>
+                                                <reference key="object" ref="584496140"/>
+                                                <object class="NSMutableArray" key="children">
+                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <reference ref="801181119"/>
+                                                </object>
+                                                <reference key="parent" ref="0"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">44</int>
+                                                <reference key="object" ref="801181119"/>
+                                                <object class="NSMutableArray" key="children">
+                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                         <reference ref="873782716"/>
                                                 </object>
-                                                <reference key="parent" ref="0"/>
-                                                <string key="objectName">Table Header View</string>
+                                                <reference key="parent" ref="584496140"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -300 +325 @@
                                                         <reference ref="930083113"/>
                                                 </object>
-                                                <reference key="parent" ref="608739957"/>
+                                                <reference key="parent" ref="801181119"/>
                                                 <string key="objectName">Profile Edit Toolbar</string>
                                         </object>
@@ -317 +342 @@
                                                 <reference key="object" ref="930083113"/>
                                                 <reference key="parent" ref="873782716"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">4</int>
-                                                <reference key="object" ref="584496140"/>
-                                                <reference key="parent" ref="0"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">37</int>
-                                                <reference key="object" ref="48316267"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="839931344"/>
-                                                </object>
-                                                <reference key="parent" ref="0"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">39</int>
-                                                <reference key="object" ref="839931344"/>
-                                                <reference key="parent" ref="48316267"/>
                                         </object>
                                 </object>
@@ -346 +352 @@
                                         <string>-2.CustomClassName</string>
                                         <string>10.IBPluginDependency</string>
-                                        <string>17.IBEditorWindowLastContentRect</string>
-                                        <string>17.IBPluginDependency</string>
                                         <string>37.IBEditorWindowLastContentRect</string>
                                         <string>37.IBPluginDependency</string>
@@ -353 +357 @@
                                         <string>4.IBEditorWindowLastContentRect</string>
                                         <string>4.IBPluginDependency</string>
+                                        <string>44.IBEditorWindowLastContentRect</string>
+                                        <string>44.IBPluginDependency</string>
                                         <string>5.IBPluginDependency</string>
                                         <string>8.IBPluginDependency</string>
@@ -362 +368 @@
                                         <string>UIResponder</string>
                                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>{{277, 662}, {320, 43}}</string>
-                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>{{519, 1375}, {320, 44}}</string>
+                                        <string>{{519, 1340}, {320, 79}}</string>
                                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                                        <string>{{42, 426}, {320, 373}}</string>
+                                        <string>{{678, 682}, {320, 480}}</string>
+                                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                                        <string>{{629, 1088}, {320, 44}}</string>
                                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                         <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -390 +396 @@
                         </object>
                         <nil key="sourceID"/>
-                        <int key="maxID">42</int>
+                        <int key="maxID">44</int>
                 </object>
                 <object class="IBClassDescriber" key="IBDocument.Classes">
@@ -410 +416 @@
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
                                                         <string>didClickActivate:</string>
+                                                        <string>didClickCancel:</string>
                                                         <string>didClickRename:</string>
                                                 </object>
                                                 <object class="NSMutableArray" key="dict.values">
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <string>id</string>
                                                         <string>id</string>
                                                         <string>id</string>

apps/iphone/my.tel/trunk/offlineSampleData.plist

@@ -4 +4 @@
 <dict>
         <key>getrecordlist</key>
-        <string>{&quot;actionMessages&quot;:null,&quot;date&quot;:null,&quot;domainId&quot;:7,&quot;recordList&quot;:[{&quot;apiId&quot;:4377,&quot;editable&quot;:true,&quot;global&quot;:false,&quot;groups&quot;:[],&quot;label&quot;:&quot;current&quot;,&quot;locations&quot;:[&quot;x-mobile&quot;],&quot;profiles&quot;:[],&quot;serviceKeys&quot;:[&quot;voice&quot;],&quot;terminal&quot;:true,&quot;value&quot;:&quot;+12155551212&quot;},{&quot;apiId&quot;:4255,&quot;editable&quot;:true,&quot;global&quot;:false,&quot;groups&quot;:[],&quot;label&quot;:&quot;Current&quot;,&quot;locations&quot;:[&quot;x-mobile&quot;],&quot;profiles&quot;:[7],&quot;serviceKeys&quot;:[&quot;voice&quot;],&quot;terminal&quot;:true,&quot;value&quot;:&quot;+9610123456&quot;},{&quot;apiId&quot;:1415,&quot;editable&quot;:false,&quot;global&quot;:true,&quot;groups&quot;:[],&quot;label&quot;:null,&quot;locations&quot;:null,&quot;profiles&quot;:[],&quot;serviceKeys&quot;:null,&quot;terminal&quot;:false,&quot;value&quot;:&quot;social.john.tel.&quot;}],&quot;success&quot;:true}
+        <string>{&quot;actionMessages&quot;:null,&quot;date&quot;:null,&quot;domainId&quot;:7,&quot;recordList&quot;:[{&quot;apiId&quot;:4377,&quot;editable&quot;:true,&quot;global&quot;:false,&quot;groups&quot;:[],&quot;longLabel&quot;:&quot;current&quot;,&quot;locations&quot;:[&quot;x-mobile&quot;],&quot;profiles&quot;:[],&quot;serviceKeys&quot;:[&quot;voice&quot;],&quot;terminal&quot;:true,&quot;value&quot;:&quot;+12155551212&quot;},{&quot;apiId&quot;:4255,&quot;editable&quot;:true,&quot;global&quot;:false,&quot;groups&quot;:[],&quot;label&quot;:&quot;Current&quot;,&quot;locations&quot;:[&quot;x-mobile&quot;],&quot;profiles&quot;:[7],&quot;serviceKeys&quot;:[&quot;voice&quot;],&quot;terminal&quot;:true,&quot;value&quot;:&quot;+9610123456&quot;},{&quot;apiId&quot;:1415,&quot;editable&quot;:false,&quot;global&quot;:true,&quot;groups&quot;:[],&quot;label&quot;:null,&quot;locations&quot;:null,&quot;profiles&quot;:[],&quot;serviceKeys&quot;:null,&quot;terminal&quot;:false,&quot;value&quot;:&quot;social.john.tel.&quot;}],&quot;success&quot;:true}
     </string>
         <key>storerecord</key>