浏览代码

Big cleansing of the menu dismissal behavior

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Romain Goyet 12 年之前
父节点
当前提交
b7f94731e7

+ 0 - 8
AspenProject/VLCAboutViewController.m

@@ -29,9 +29,6 @@
     self.webView.delegate = self;
     self.aspenVersion.text = [[NSString stringWithFormat:NSLocalizedString(@"VERSION_FORMAT",@""), [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] stringByAppendingFormat:@" %@", kVLCVersionCodename];
     self.vlckitVersion.text = [NSString stringWithFormat:NSLocalizedString(@"BASED_ON_FORMAT",@""),[[VLCLibrary sharedLibrary] version]];
-
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-        self.navigationItem.rightBarButtonItem = [UIBarButtonItem themedDoneButtonWithTarget:self andSelector:@selector(dismiss)];
 }
 
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType
@@ -59,9 +56,4 @@
     [UIView animateWithDuration:1. animations:animationBlock completion:completionBlock];
 }
 
-- (void)dismiss
-{
-    [self dismissModalViewControllerAnimated:YES];
-}
-
 @end

+ 0 - 5
AspenProject/VLCDropboxTableViewController.m

@@ -113,11 +113,6 @@
     [_dropboxController requestDirectoryListingAtPath:_currentPath];
 }
 
-- (IBAction)dismiss:(id)sender
-{
-    [self.navigationController dismissModalViewControllerAnimated:YES];
-}
-
 - (IBAction)folderUp:(id)sender
 {
     _currentPath = [_currentPath stringByDeletingLastPathComponent];

+ 0 - 1
AspenProject/VLCHTTPDownloadViewController.h

@@ -23,5 +23,4 @@
 
 - (IBAction)downloadAction:(id)sender;
 - (IBAction)cancelDownload:(id)sender;
-- (IBAction)dismiss:(id)sender;
 @end

+ 0 - 5
AspenProject/VLCHTTPDownloadViewController.m

@@ -71,11 +71,6 @@
     }
 }
 
-- (IBAction)dismiss:(id)sender
-{
-    [self.navigationController dismissModalViewControllerAnimated:YES];
-}
-
 #pragma mark - download management
 - (void)_triggerNextDownload
 {

+ 7 - 1
AspenProject/VLCMenuViewController.m

@@ -33,6 +33,7 @@
     Reachability *_reachability;
 }
 - (void)_presentViewController:(UIViewController *)viewController;
+- (void)_dismissModalViewController;
 @end
 
 @implementation VLCMenuViewController
@@ -204,11 +205,16 @@
         [self presentModalViewController:navController animated:YES];
 
         if (viewController.navigationItem.rightBarButtonItem == nil) {
-            UIBarButtonItem *doneButton = [UIBarButtonItem themedDoneButtonWithTarget:viewController andSelector:@selector(dismiss:)];
+            UIBarButtonItem *doneButton = [UIBarButtonItem themedDoneButtonWithTarget:self andSelector:@selector(_dismissModalViewController)];
             viewController.navigationItem.rightBarButtonItem = doneButton;
         }
     } else {
         [self.navigationController pushViewController:viewController animated:YES];
     }
 }
+
+- (void)_dismissModalViewController
+{
+    [self dismissModalViewControllerAnimated:YES];
+}
 @end

+ 0 - 1
AspenProject/VLCOpenNetworkStreamViewController.h

@@ -17,6 +17,5 @@
 @property (strong, nonatomic) IBOutlet UITableView *historyTableView;
 
 - (IBAction)openButtonAction:(id)sender;
-- (IBAction)dismiss:(id)sender;
 
 @end

+ 0 - 5
AspenProject/VLCOpenNetworkStreamViewController.m

@@ -80,11 +80,6 @@
     }
 }
 
-- (IBAction)dismiss:(id)sender
-{
-    [self.navigationController dismissModalViewControllerAnimated:YES];
-}
-
 #pragma mark - table view data source
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {