Changeset 233 for apps/iphone/my.tel

Timestamp:

02/05/09 15:40:02 (4 years ago)

Author:

henri

Message:

Made it possible to cancel at the start of changing subdomains

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• SubdomainViewController.h (modified) (1 diff)
• SubdomainViewController.m (modified) (3 diffs)

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

@@ -30 +30 @@
 }
 
+- (IBAction)didClickCancel:(id)sender;
+- (IBAction)didClickSelect:(id)sender;
 - (IBAction)didClickAdd:(id)sender;
 - (IBAction)didClickDone:(id)sender;

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

@@ -32 +32 @@
                                                                                                                                                            bundle:[NSBundle mainBundle]] autorelease];
         newC.title = aDom;
-        newC.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Select"
-                                                                                                                                                          style:UIBarButtonItemStyleDone
-                                                                                                                                                         target:newC
-                                                                                                                                                         action:@selector(didClickSelect:)];
         return newC;
 }
@@ -100 +96 @@
 #pragma mark ------ UI Actions
 
+- (IBAction)didClickCancel:(id)sender {
+        // get rid of everything
+        [self.navigationController.view removeFromSuperview];
+        [self.navigationController popToRootViewControllerAnimated:NO];
+        [self.navigationController release];
+}
+
 - (IBAction)didClickSelect:(id)sender {
         // get rid of everything
         [VIPConnect sharedInstance].selectedDomain = [self.title copy];
-        [self.navigationController.view removeFromSuperview];
-        [self.navigationController popToRootViewControllerAnimated:NO];
-        [self.navigationController release];
+        [self didClickCancel:sender];
 }
 
@@ -322 +323 @@
         if ([self.title isEqualToString:@"tel"]) {
                 // top domain, disable adding or deleting a domain at this level
-                self.navigationItem.rightBarButtonItem =  nil;
+                self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
+                                                                                                                                                                                           target:self
+                                                                                                                                                                                           action:@selector(didClickCancel:)];
                 bottomBar.items = nil;
+        } else {
+                self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Select"
+                                                                                                                                                                  style:UIBarButtonItemStyleDone
+                                                                                                                                                                 target:self
+                                                                                                                                                                 action:@selector(didClickSelect:)];
         }
 }