Browse Source

Remove old menu view controller

Felix Paul Kühne 12 years ago
parent
commit
c2ea03fda1

+ 0 - 1
AspenProject/VLCAppDelegate.m

@@ -14,7 +14,6 @@
 #import "UIDevice+SpeedCategory.h"
 
 #import "VLCPlaylistViewController.h"
-#import "VLCMenuViewController.h"
 #import "VLCMovieViewController.h"
 #import "PAPasscodeViewController.h"
 #import "UINavigationController+Theme.h"

+ 0 - 1
AspenProject/VLCHTTPFileDownloader.m

@@ -9,7 +9,6 @@
 //
 
 #import "VLCHTTPFileDownloader.h"
-#import "VLCMenuViewController.h"
 #import "VLCAppDelegate.h"
 
 @interface VLCHTTPFileDownloader ()

+ 0 - 41
AspenProject/VLCMenuViewController.h

@@ -1,41 +0,0 @@
-//
-//  VLCMenuViewController.h
-//  VLC for iOS
-//
-//  Created by Felix Paul Kühne on 19.05.13.
-//  Copyright (c) 2013 VideoLAN. All rights reserved.
-//
-//  Refer to the COPYING file of the official project for license.
-//
-
-#import <UIKit/UIKit.h>
-
-@class VLCSettingsController;
-@class IASKAppSettingsViewController;
-
-@interface VLCMenuViewController : UIViewController
-
-@property (strong, nonatomic) IASKAppSettingsViewController *settingsViewController;
-@property (strong, nonatomic) VLCSettingsController *settingsController;
-
-@property (strong, nonatomic) IBOutlet UIButton *allFilesButton;
-@property (strong, nonatomic) IBOutlet UIButton *localNetworkButton;
-@property (strong, nonatomic) IBOutlet UIButton *aboutButton;
-@property (strong, nonatomic) IBOutlet UIButton *openNetworkStreamButton;
-@property (strong, nonatomic) IBOutlet UIButton *downloadFromHTTPServerButton;
-@property (strong, nonatomic) IBOutlet UIButton *settingsButton;
-@property (strong, nonatomic) IBOutlet UISwitch *httpUploadServerSwitch;
-@property (strong, nonatomic) IBOutlet UILabel *httpUploadLabel;
-@property (strong, nonatomic) IBOutlet UILabel *httpUploadServerLocationLabel;
-@property (strong, nonatomic) IBOutlet UIButton *dropboxButton;
-
-- (IBAction)showAllFiles:(id)sender;
-- (IBAction)showLocalNetwork:(id)sender;
-- (IBAction)openAboutPanel:(id)sender;
-- (IBAction)openNetworkStream:(id)sender;
-- (IBAction)downloadFromHTTPServer:(id)sender;
-- (IBAction)showDropbox:(id)sender;
-- (IBAction)showSettings:(id)sender;
-- (IBAction)toggleHTTPServer:(id)sender;
-
-@end

+ 0 - 189
AspenProject/VLCMenuViewController.m

@@ -1,189 +0,0 @@
-//
-//  VLCMenuViewController.m
-//  VLC for iOS
-//
-//  Created by Felix Paul Kühne on 19.05.13.
-//  Copyright (c) 2013 VideoLAN. All rights reserved.
-//
-//  Refer to the COPYING file of the official project for license.
-//
-
-#import "VLCMenuViewController.h"
-#import "VLCAppDelegate.h"
-#import "VLCPlaylistViewController.h"
-#import "VLCAboutViewController.h"
-#import "VLCMovieViewController.h"
-#import "VLCHTTPUploaderController.h"
-#import "VLCSettingsController.h"
-#import "HTTPServer.h"
-#import "Reachability.h"
-#import "VLCHTTPFileDownloader.h"
-#import "IASKAppSettingsViewController.h"
-#import "UINavigationController+Theme.h"
-#import "UIBarButtonItem+Theme.h"
-#import "VLCOpenNetworkStreamViewController.h"
-#import "VLCHTTPDownloadViewController.h"
-#import "VLCBugreporter.h"
-#import "VLCLocalServerListViewController.h"
-
-@interface VLCMenuViewController () {
-    VLCHTTPDownloadViewController *_downloadViewController;
-    Reachability *_reachability;
-}
-- (void)_presentViewController:(UIViewController *)viewController;
-
-@property(nonatomic) VLCHTTPUploaderController *uploadController;
-@property(nonatomic) VLCAppDelegate *appDelegate;
-
-@end
-
-@implementation VLCMenuViewController
-
-- (void)dealloc
-{
-    [_reachability stopNotifier];
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-	self.view.frame = CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds));
-	self.view.autoresizingMask = UIViewAutoresizingFlexibleHeight;
-
-    [self.aboutButton setTitle:NSLocalizedString(@"ABOUT_APP", @"") forState:UIControlStateNormal];
-    [self.openNetworkStreamButton setTitle:NSLocalizedString(@"OPEN_NETWORK", @"") forState:UIControlStateNormal];
-    [self.downloadFromHTTPServerButton setTitle:NSLocalizedString(@"DOWNLOAD_FROM_HTTP", @"") forState:UIControlStateNormal];
-    self.httpUploadLabel.text = NSLocalizedString(@"HTTP_UPLOAD", @"");
-    [self.settingsButton setTitle:NSLocalizedString(@"Settings", @"") forState:UIControlStateNormal]; // plain text key to keep compatibility with InAppSettingsKit's upstream
-    _reachability = [Reachability reachabilityForLocalWiFi];
-    [_reachability startNotifier];
-
-    [self netReachabilityChanged:nil];
-
-    self.appDelegate = [[UIApplication sharedApplication] delegate];
-    self.uploadController = self.appDelegate.uploadController;
-
-    BOOL isHTTPServerOn = [[NSUserDefaults standardUserDefaults] boolForKey:kVLCSettingSaveHTTPUploadServerStatus];
-    [self.httpUploadServerSwitch setOn:isHTTPServerOn];
-    [self updateHTTPServerAddress];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(netReachabilityChanged:) name:kReachabilityChangedNotification object:nil];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    self.view.frame = CGRectMake(0.0f, 0.0f,kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds));
-}
-
-- (void)netReachabilityChanged:(NSNotification *)notification
-{
-    if (_reachability.currentReachabilityStatus == ReachableViaWiFi) {
-        self.httpUploadServerSwitch.enabled = YES;
-        self.httpUploadServerLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", @"");
-    } else {
-        self.httpUploadServerSwitch.enabled = NO;
-        self.httpUploadServerSwitch.on = NO;
-        self.httpUploadServerLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_NO_CONNECTIVITY", @"");
-    }
-}
-
-- (IBAction)showAllFiles:(id)sender
-{
-    [self _presentViewController:[(VLCAppDelegate*)[UIApplication sharedApplication].delegate playlistViewController]];
-}
-
-- (IBAction)showLocalNetwork:(id)sender
-{
-    UIViewController *localNetworkController = [[VLCLocalServerListViewController alloc] init];
-    [self _presentViewController:localNetworkController];
-}
-
-- (IBAction)openAboutPanel:(id)sender
-{
-    UIViewController *aboutController = [[VLCAboutViewController alloc] initWithNibName:nil bundle:nil];
-    [self _presentViewController:aboutController];
-}
-
-- (IBAction)openNetworkStream:(id)sender
-{
-    UIViewController *openURLController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:nil bundle:nil];
-    [self _presentViewController:openURLController];
-}
-
-- (IBAction)downloadFromHTTPServer:(id)sender
-{
-    if (!_downloadViewController)
-        _downloadViewController = [[VLCHTTPDownloadViewController alloc] initWithNibName:nil bundle:nil];
-
-    [self _presentViewController:_downloadViewController];
-}
-
-- (IBAction)showSettings:(id)sender
-{
-    if (!self.settingsController) {
-        self.settingsController = [[VLCSettingsController alloc] init];
-    }
-
-    if (!self.settingsViewController) {
-        self.settingsViewController = [[IASKAppSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
-        self.settingsController.viewController = self.settingsViewController;
-        self.settingsViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedBackButtonWithTarget:self.settingsViewController andSelector:@selector(dismiss:)];
-    }
-
-    self.settingsViewController.modalPresentationStyle = UIModalPresentationFormSheet;
-    self.settingsViewController.delegate = self.settingsController;
-    self.settingsViewController.showDoneButton = NO;
-    self.settingsViewController.showCreditsFooter = NO;
-
-    [self _presentViewController:self.settingsController.viewController];
-}
-
-- (void)updateHTTPServerAddress
-{
-    HTTPServer *server = self.uploadController.httpServer;
-    if (server.isRunning)
-        self.httpUploadServerLocationLabel.text = [NSString stringWithFormat:@"http://%@:%i", [self.uploadController currentIPAddress], server.listeningPort];
-    else
-        self.httpUploadServerLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", @"");
-}
-
-- (IBAction)toggleHTTPServer:(UISwitch *)sender
-{
-    [[NSUserDefaults standardUserDefaults] setBool:sender.on forKey:kVLCSettingSaveHTTPUploadServerStatus];
-    [self.uploadController changeHTTPServerState:sender.on];
-    [self updateHTTPServerAddress];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-- (IBAction)showDropbox:(id)sender
-{
-    self.appDelegate.dropboxTableViewController.modalPresentationStyle = UIModalPresentationFormSheet;
-    [self _presentViewController:self.appDelegate.dropboxTableViewController];
-}
-
-#pragma mark - Private methods
-
-- (void)_presentViewController:(UIViewController *)viewController
-{
-    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
-    [navController loadTheme];
-
-    GHRevealViewController *ghVC = [(VLCAppDelegate*)[UIApplication sharedApplication].delegate revealController];
-    ghVC.contentViewController = navController;
-    [ghVC toggleSidebar:NO duration:kGHRevealSidebarDefaultAnimationDuration];
-}
-
-#pragma mark - shake to support
-
-- (BOOL)canBecomeFirstResponder {
-    return YES;
-}
-
-- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event {
-    if (motion == UIEventSubtypeMotionShake)
-        [[VLCBugreporter sharedInstance] handleBugreportRequest];
-}
-
-@end

+ 0 - 1
AspenProject/VLCPlaylistViewController.h

@@ -12,7 +12,6 @@
 #import "AQGridView.h"
 
 @class VLCMovieViewController;
-@class VLCMenuViewController;
 @class EmptyLibraryView;
 
 @interface VLCPlaylistViewController : UIViewController <UITabBarDelegate, UIPopoverControllerDelegate>

+ 0 - 12
AspenProject/VLCPlaylistViewController.m

@@ -12,7 +12,6 @@
 #import "VLCMovieViewController.h"
 #import "VLCPlaylistTableViewCell.h"
 #import "VLCPlaylistGridView.h"
-#import "VLCMenuViewController.h"
 #import "UINavigationController+Theme.h"
 #import "NSString+SupportedMedia.h"
 #import "VLCBugreporter.h"
@@ -298,17 +297,6 @@
         [self.tableView setEditing:editing animated:YES];
 }
 
-- (void)initMenuViewController
-{
-    return;
-    VLCMenuViewController *menuViewController = [[VLCMenuViewController alloc] initWithNibName:nil bundle:nil];
-    UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:menuViewController];
-    [navigationController loadTheme];
-    self.menuViewController = navigationController;
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-        navigationController.navigationBarHidden = YES;
-}
-
 - (IBAction)leftButtonAction:(id)sender
 {
     [[(VLCAppDelegate*)[UIApplication sharedApplication].delegate revealController] toggleSidebar:![(VLCAppDelegate*)[UIApplication sharedApplication].delegate revealController].sidebarShowing duration:kGHRevealSidebarDefaultAnimationDuration];

+ 0 - 724
Resources/VLCMenuViewController.xib

@@ -1,724 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">2083</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIButton</string>
-			<string>IBUIImageView</string>
-			<string>IBUILabel</string>
-			<string>IBUIScrollView</string>
-			<string>IBUISwitch</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIScrollView" id="322809953">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">276</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIButton" id="233942944">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 128}, {260, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="306241553"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="937037271">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-						</object>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">Open Network Stream</string>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="878206399">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-						</object>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<object class="NSColor" key="IBUINormalTitleShadowColor" id="1025413593">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MC41AA</bytes>
-						</object>
-						<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="181125913">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">menuBtnBck.png</string>
-						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="886215057">
-							<int key="type">2</int>
-							<double key="pointSize">15</double>
-						</object>
-						<object class="NSFont" key="IBUIFont" id="388488631">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">15</double>
-							<int key="NSfFlags">16</int>
-						</object>
-					</object>
-					<object class="IBUIButton" id="270820867">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{-30, 64}, {320, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="233942944"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">Local Network</string>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-					<object class="IBUIButton" id="306241553">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 192}, {260, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="136452396"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">Download from HTTP Server</string>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-					<object class="IBUIButton" id="665933893">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 387}, {260, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="1021636329"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">Settings</string>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-					<object class="IBUIButton" id="1021636329">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 451}, {260, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">About VLC for iOS</string>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-					<object class="IBUIButton" id="502729697">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 323}, {260, 60}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="665933893"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<object class="NSCustomResource" key="IBUINormalImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">dropboxLabel.png</string>
-						</object>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-					<object class="IBUIView" id="136452396">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="643865985">
-								<reference key="NSNextResponder" ref="136452396"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrameSize">{260, 63}</string>
-								<reference key="NSSuperview" ref="136452396"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="342130383"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="181125913"/>
-							</object>
-							<object class="IBUISwitch" id="854423543">
-								<reference key="NSNextResponder" ref="136452396"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{148, 5}, {94, 27}}</string>
-								<reference key="NSSuperview" ref="136452396"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="800651050"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<object class="NSColor" key="IBUIOnTintColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjYxAA</bytes>
-									<object class="NSColorSpace" key="NSCustomColorSpace">
-										<int key="NSID">2</int>
-									</object>
-								</object>
-							</object>
-							<object class="IBUILabel" id="342130383">
-								<reference key="NSNextResponder" ref="136452396"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{20, 8}, {135, 21}}</string>
-								<reference key="NSSuperview" ref="136452396"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="854423543"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<int key="IBUIContentMode">7</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">HTTP Upload</string>
-								<reference key="IBUITextColor" ref="937037271"/>
-								<nil key="IBUIHighlightedColor"/>
-								<int key="IBUIBaselineAdjustment">0</int>
-								<int key="IBUITextAlignment">1</int>
-								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="388488631"/>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-							</object>
-							<object class="IBUILabel" id="800651050">
-								<reference key="NSNextResponder" ref="136452396"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{20, 37}, {220, 21}}</string>
-								<reference key="NSSuperview" ref="136452396"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="502729697"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<int key="IBUIContentMode">7</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">Inactive Server</string>
-								<reference key="IBUITextColor" ref="937037271"/>
-								<nil key="IBUIHighlightedColor"/>
-								<int key="IBUIBaselineAdjustment">0</int>
-								<int key="IBUITextAlignment">1</int>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">1</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 256}, {260, 63}}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="643865985"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIButton" id="197466448">
-						<reference key="NSNextResponder" ref="322809953"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{260, 60}</string>
-						<reference key="NSSuperview" ref="322809953"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="270820867"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="937037271"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<string key="IBUINormalTitle">Media Library</string>
-						<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-						<reference key="IBUINormalTitleColor" ref="937037271"/>
-						<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-						<reference key="IBUINormalBackgroundImage" ref="181125913"/>
-						<reference key="IBUIFontDescription" ref="886215057"/>
-						<reference key="IBUIFont" ref="388488631"/>
-					</object>
-				</array>
-				<string key="NSFrameSize">{260, 511}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="197466448"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MAA</bytes>
-				</object>
-				<bool key="IBUIClipsSubviews">YES</bool>
-				<bool key="IBUIMultipleTouchEnabled">YES</bool>
-				<object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics">
-					<string key="IBUISimulatedSizeMetricsClass">IBUISimulatedFreeformSizeMetricsSentinel</string>
-					<string key="IBUIDisplayName">Freeform</string>
-				</object>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				<bool key="IBUIAlwaysBounceVertical">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">openNetworkStreamButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="233942944"/>
-					</object>
-					<int key="connectionID">41</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">downloadFromHTTPServerButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="306241553"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">settingsButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="665933893"/>
-					</object>
-					<int key="connectionID">52</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">aboutButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1021636329"/>
-					</object>
-					<int key="connectionID">38</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dropboxButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="502729697"/>
-					</object>
-					<int key="connectionID">72</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">httpUploadServerLocationLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="800651050"/>
-					</object>
-					<int key="connectionID">74</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">httpUploadLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="342130383"/>
-					</object>
-					<int key="connectionID">73</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">httpUploadServerSwitch</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="854423543"/>
-					</object>
-					<int key="connectionID">76</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="322809953"/>
-					</object>
-					<int key="connectionID">81</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">openNetworkStream:</string>
-						<reference key="source" ref="233942944"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">36</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">downloadFromHTTPServer:</string>
-						<reference key="source" ref="306241553"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">40</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">openAboutPanel:</string>
-						<reference key="source" ref="1021636329"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showSettings:</string>
-						<reference key="source" ref="665933893"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">53</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showDropbox:</string>
-						<reference key="source" ref="502729697"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">71</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">toggleHTTPServer:</string>
-						<reference key="source" ref="854423543"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">13</int>
-					</object>
-					<int key="connectionID">75</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showAllFiles:</string>
-						<reference key="source" ref="197466448"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showLocalNetwork:</string>
-						<reference key="source" ref="270820867"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">89</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="322809953"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="197466448"/>
-							<reference ref="270820867"/>
-							<reference ref="233942944"/>
-							<reference ref="306241553"/>
-							<reference ref="665933893"/>
-							<reference ref="1021636329"/>
-							<reference ref="502729697"/>
-							<reference ref="136452396"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="233942944"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">34</int>
-						<reference key="object" ref="306241553"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="665933893"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="1021636329"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">66</int>
-						<reference key="object" ref="502729697"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">67</int>
-						<reference key="object" ref="136452396"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="643865985"/>
-							<reference ref="854423543"/>
-							<reference ref="342130383"/>
-							<reference ref="800651050"/>
-						</array>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="643865985"/>
-						<reference key="parent" ref="136452396"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">70</int>
-						<reference key="object" ref="854423543"/>
-						<reference key="parent" ref="136452396"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">69</int>
-						<reference key="object" ref="342130383"/>
-						<reference key="parent" ref="136452396"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">68</int>
-						<reference key="object" ref="800651050"/>
-						<reference key="parent" ref="136452396"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">84</int>
-						<reference key="object" ref="197466448"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">87</int>
-						<reference key="object" ref="270820867"/>
-						<reference key="parent" ref="322809953"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">VLCMenuViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">89</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">VLCMenuViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="downloadFromHTTPServer:">id</string>
-						<string key="openAboutPanel:">id</string>
-						<string key="openNetworkStream:">id</string>
-						<string key="showAllFiles:">id</string>
-						<string key="showDropbox:">id</string>
-						<string key="showLocalNetwork:">id</string>
-						<string key="showSettings:">id</string>
-						<string key="toggleHTTPServer:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="downloadFromHTTPServer:">
-							<string key="name">downloadFromHTTPServer:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="openAboutPanel:">
-							<string key="name">openAboutPanel:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="openNetworkStream:">
-							<string key="name">openNetworkStream:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showAllFiles:">
-							<string key="name">showAllFiles:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showDropbox:">
-							<string key="name">showDropbox:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showLocalNetwork:">
-							<string key="name">showLocalNetwork:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="showSettings:">
-							<string key="name">showSettings:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleHTTPServer:">
-							<string key="name">toggleHTTPServer:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="aboutButton">UIButton</string>
-						<string key="allFilesButton">UIButton</string>
-						<string key="downloadFromHTTPServerButton">UIButton</string>
-						<string key="dropboxButton">UIButton</string>
-						<string key="httpUploadLabel">UILabel</string>
-						<string key="httpUploadServerLocationLabel">UILabel</string>
-						<string key="httpUploadServerSwitch">UISwitch</string>
-						<string key="localNetworkButton">UIButton</string>
-						<string key="openNetworkStreamButton">UIButton</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="aboutButton">
-							<string key="name">aboutButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="allFilesButton">
-							<string key="name">allFilesButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="downloadFromHTTPServerButton">
-							<string key="name">downloadFromHTTPServerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dropboxButton">
-							<string key="name">dropboxButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="httpUploadLabel">
-							<string key="name">httpUploadLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="httpUploadServerLocationLabel">
-							<string key="name">httpUploadServerLocationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="httpUploadServerSwitch">
-							<string key="name">httpUploadServerSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="localNetworkButton">
-							<string key="name">localNetworkButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openNetworkStreamButton">
-							<string key="name">openNetworkStreamButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/VLCMenuViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="dropboxLabel.png">{78, 21}</string>
-			<string key="menuBtnBck.png">{320, 60}</string>
-		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">2083</string>
-	</data>
-</archive>

+ 0 - 10
VLC for iOS.xcodeproj/project.pbxproj

@@ -38,7 +38,6 @@
 		29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */; };
 		7A50619F176E3D410036E15D /* UINavigationController+Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A50619E176E3D410036E15D /* UINavigationController+Theme.m */; };
 		7A5061A2176E41160036E15D /* UIBarButtonItem+Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5061A1176E41160036E15D /* UIBarButtonItem+Theme.m */; };
-		7A57C1371769F0BA00807630 /* VLCMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A57C1361769F0BA00807630 /* VLCMenuViewController.xib */; };
 		7AC8629D1765DC560011611A /* style.css in Resources */ = {isa = PBXBuildFile; fileRef = 7AC8629B1765DC560011611A /* style.css */; };
 		7AC862A61765E9510011611A /* jquery-1.10.1.min.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC8629E1765E90C0011611A /* jquery-1.10.1.min.js */; };
 		7AC862A71765E9510011611A /* jquery.fileupload.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC8629F1765E90C0011611A /* jquery.fileupload.js */; };
@@ -165,7 +164,6 @@
 		7D6B08F8174D65B500A05173 /* IASKTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6B08EA174D65B500A05173 /* IASKTextField.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		7D6B08FA174D716200A05173 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D6B08F9174D716200A05173 /* MessageUI.framework */; };
 		7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08FB174D773C00A05173 /* Settings.bundle */; };
-		7D6BA1171748EFE100C0E203 /* VLCMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */; };
 		7D6BD17E176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BD17C176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png */; };
 		7D6BD17F176200B600AD311A /* navBarBackgroundPhoneLandscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BD17D176200B600AD311A /* navBarBackgroundPhoneLandscape.png */; };
 		7D6BD1841762026700AD311A /* thumbOverlayPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BD1801762026700AD311A /* thumbOverlayPhone@2x.png */; };
@@ -341,7 +339,6 @@
 		7A50619E176E3D410036E15D /* UINavigationController+Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Theme.m"; sourceTree = "<group>"; };
 		7A5061A0176E41160036E15D /* UIBarButtonItem+Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIBarButtonItem+Theme.h"; sourceTree = "<group>"; };
 		7A5061A1176E41160036E15D /* UIBarButtonItem+Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIBarButtonItem+Theme.m"; sourceTree = "<group>"; };
-		7A57C1361769F0BA00807630 /* VLCMenuViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCMenuViewController.xib; path = Resources/VLCMenuViewController.xib; sourceTree = SOURCE_ROOT; };
 		7AC8629B1765DC560011611A /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
 		7AC8629E1765E90C0011611A /* jquery-1.10.1.min.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jquery-1.10.1.min.js"; sourceTree = "<group>"; };
 		7AC8629F1765E90C0011611A /* jquery.fileupload.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jquery.fileupload.js; sourceTree = "<group>"; };
@@ -557,8 +554,6 @@
 		7D6B08EA174D65B500A05173 /* IASKTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextField.m; sourceTree = "<group>"; };
 		7D6B08F9174D716200A05173 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		7D6B08FB174D773C00A05173 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = Resources/Settings.bundle; sourceTree = SOURCE_ROOT; };
-		7D6BA1141748EFE100C0E203 /* VLCMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCMenuViewController.h; sourceTree = "<group>"; };
-		7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMenuViewController.m; sourceTree = "<group>"; };
 		7D6BD17C176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "navBarBackgroundPhoneLandscape@2x.png"; sourceTree = "<group>"; };
 		7D6BD17D176200B600AD311A /* navBarBackgroundPhoneLandscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navBarBackgroundPhoneLandscape.png; sourceTree = "<group>"; };
 		7D6BD1801762026700AD311A /* thumbOverlayPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumbOverlayPhone@2x.png"; sourceTree = "<group>"; };
@@ -1003,8 +998,6 @@
 		7D2339AB176DE70E008D223C /* Menu */ = {
 			isa = PBXGroup;
 			children = (
-				7D6BA1141748EFE100C0E203 /* VLCMenuViewController.h */,
-				7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */,
 				7D93045117B6A0DF0054EAC6 /* VLCMenuTableViewController.h */,
 				7D93045217B6A0DF0054EAC6 /* VLCMenuTableViewController.m */,
 				7D2339AC176DE72E008D223C /* VLCOpenNetworkStreamViewController.h */,
@@ -1368,7 +1361,6 @@
 				7D2339AE176DE72E008D223C /* VLCOpenNetworkStreamViewController.xib */,
 				7DBC3B431711FC6C00DCF688 /* VLCAboutViewController~iphone.xib */,
 				7D9529521732EFCA006F5B40 /* VLCAboutViewController~ipad.xib */,
-				7A57C1361769F0BA00807630 /* VLCMenuViewController.xib */,
 				A79246BD170F114E0036AAF2 /* VLCMovieViewController~iphone.xib */,
 				7D33D41517182615008AF0E0 /* VLCMovieViewController~ipad.xib */,
 				A79246C0170F114E0036AAF2 /* VLCEmptyLibraryView~iphone.xib */,
@@ -1726,7 +1718,6 @@
 				7DEB3B8C1764A4F40038FC70 /* blank.png in Resources */,
 				7DEB3B8D1764A4F40038FC70 /* blank@2x.png in Resources */,
 				7AC8629D1765DC560011611A /* style.css in Resources */,
-				7A57C1371769F0BA00807630 /* VLCMenuViewController.xib in Resources */,
 				7DF1166C176CC69A009EC05C /* volumeballslider.png in Resources */,
 				7DF1166D176CC69A009EC05C /* volumeballslider@2x.png in Resources */,
 				7D2339B0176DE72E008D223C /* VLCOpenNetworkStreamViewController.xib in Resources */,
@@ -1792,7 +1783,6 @@
 				2915543F17490B9C00B86CAD /* HTTPFileResponse.m in Sources */,
 				2915544017490B9C00B86CAD /* HTTPRedirectResponse.m in Sources */,
 				2915544117490B9C00B86CAD /* WebSocket.m in Sources */,
-				7D6BA1171748EFE100C0E203 /* VLCMenuViewController.m in Sources */,
 				29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */,
 				7D3EB012174A3530002062C2 /* Reachability.m in Sources */,
 				7D3EB017174A46FB002062C2 /* VLCHTTPFileDownloader.m in Sources */,