Commit 52f50740 authored by Romain Goyet's avatar Romain Goyet Committed by Felix Paul Kühne

Consistent navigation for the downloads and streams

Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent fcf342bf
......@@ -23,5 +23,5 @@
- (IBAction)downloadAction:(id)sender;
- (IBAction)cancelDownload:(id)sender;
- (IBAction)dismiss:(id)sender;
@end
......@@ -71,6 +71,11 @@
}
}
- (IBAction)dismiss:(id)sender
{
[self.navigationController dismissModalViewControllerAnimated:YES];
}
#pragma mark - download management
- (void)_triggerNextDownload
{
......
......@@ -122,8 +122,7 @@
- (IBAction)openNetworkStream:(id)sender
{
UIViewController *openURLController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:nil bundle:nil];
[self.navigationController pushViewController:openURLController animated:YES];
[self _presentViewController:openURLController];
}
- (IBAction)downloadFromHTTPServer:(id)sender
......@@ -131,7 +130,7 @@
if (!_downloadViewController)
_downloadViewController = [[VLCHTTPDownloadViewController alloc] initWithNibName:nil bundle:nil];
[self.navigationController pushViewController:_downloadViewController animated:YES];
[self _presentViewController:_downloadViewController];
}
- (IBAction)showSettings:(id)sender
......
......@@ -17,5 +17,6 @@
@property (strong, nonatomic) IBOutlet UITableView *historyTableView;
- (IBAction)openButtonAction:(id)sender;
- (IBAction)dismiss:(id)sender;
@end
......@@ -80,6 +80,11 @@
}
}
- (IBAction)dismiss:(id)sender
{
[self.navigationController dismissModalViewControllerAnimated:YES];
}
#pragma mark - table view data source
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment