Rename VLCAddMediaViewController to VLCMenuViewController since it's more appropriate

AspenProject/VLCHTTPFileDownloader.h

@@ -6,11 +6,11 @@
 //  Copyright (c) 2013 VideoLAN. All rights reserved.
 //
 
-@class VLCAddMediaViewController;
+@class VLCMenuViewController;
 
 @interface VLCHTTPFileDownloader : NSObject
 
-@property (nonatomic, retain) VLCAddMediaViewController *mediaViewController;
+@property (nonatomic, retain) VLCMenuViewController *mediaViewController;
 @property (nonatomic, readonly) BOOL downloadInProgress;
 
 - (void)downloadFileFromURL:(NSURL *)url;

AspenProject/VLCHTTPFileDownloader.m

@@ -7,7 +7,7 @@
 //
 
 #import "VLCHTTPFileDownloader.h"
-#import "VLCAddMediaViewController.h"
+#import "VLCMenuViewController.h"
 #import "VLCCircularProgressIndicator.h"
 #import "VLCAppDelegate.h"
 

AspenProject/VLCAddMediaViewController.h

@@ -1,5 +1,5 @@
 //
-//  VLCAddMediaViewController.h
+//  VLCMenuViewController.h
 //  VLC for iOS
 //
 //  Created by Felix Paul Kühne on 19.05.13.
@@ -12,7 +12,7 @@
 @class VLCCircularProgressIndicator;
 @class IASKAppSettingsViewController;
 
-@interface VLCAddMediaViewController : UIViewController
+@interface VLCMenuViewController : UIViewController
 
 @property (strong, nonatomic) IASKAppSettingsViewController *settingsViewController;
 @property (strong, nonatomic) VLCSettingsController *settingsController;

AspenProject/VLCAddMediaViewController.m

@@ -1,12 +1,12 @@
 //
-//  VLCAddMediaViewController.m
+//  VLCMenuViewController.m
 //  VLC for iOS
 //
 //  Created by Felix Paul Kühne on 19.05.13.
 //  Copyright (c) 2013 VideoLAN. All rights reserved.
 //
 
-#import "VLCAddMediaViewController.h"
+#import "VLCMenuViewController.h"
 #import "VLCAppDelegate.h"
 #import "VLCPlaylistViewController.h"
 #import "VLCAboutViewController.h"
@@ -21,7 +21,7 @@
 #import <ifaddrs.h>
 #import <arpa/inet.h>
 
-@interface VLCAddMediaViewController () {
+@interface VLCMenuViewController () {
     VLCHTTPUploaderController *_uploadController;
     Reachability *_reachability;
     VLCHTTPFileDownloader *_httpDownloader;
@@ -29,7 +29,7 @@
 
 @end
 
-@implementation VLCAddMediaViewController
+@implementation VLCMenuViewController
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {

AspenProject/VLCPlaylistViewController.h

@@ -10,12 +10,12 @@
 #import "AQGridView.h"
 
 @class VLCMovieViewController;
-@class VLCAddMediaViewController;
+@class VLCMenuViewController;
 
 @interface VLCPlaylistViewController : UIViewController <AQGridViewDataSource, AQGridViewDelegate, UITableViewDataSource, UITableViewDelegate, UITabBarDelegate, UIPopoverControllerDelegate>
 
 @property (nonatomic, strong) VLCMovieViewController *movieViewController;
-@property (nonatomic, strong) VLCAddMediaViewController *addMediaViewController;
+@property (nonatomic, strong) VLCMenuViewController *addMediaViewController;
 @property (nonatomic, strong) UIPopoverController *addMediaPopoverController;
 
 @property (nonatomic, strong) IBOutlet UITableView *tableView;

AspenProject/VLCPlaylistViewController.m

@@ -10,7 +10,7 @@
 #import "VLCMovieViewController.h"
 #import "VLCPlaylistTableViewCell.h"
 #import "VLCPlaylistGridView.h"
-#import "VLCAddMediaViewController.h"
+#import "VLCMenuViewController.h"
 
 @interface VLCPlaylistViewController () {
     NSMutableArray *_foundMedia;
@@ -230,7 +230,7 @@
 - (IBAction)leftButtonAction:(id)sender
 {
     if (self.addMediaViewController == nil)
-        self.addMediaViewController = [[VLCAddMediaViewController alloc] initWithNibName:@"VLCAddMediaViewController" bundle:nil];
+        self.addMediaViewController = [[VLCMenuViewController alloc] initWithNibName:@"VLCAddMediaViewController" bundle:nil];
 
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
 		self.addMediaViewController.contentSizeForViewInPopover = self.addMediaViewController.view.frame.size;

Resources/VLCAddMediaViewController~ipad.xib

@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12E52</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
@@ -35,7 +35,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="892317093">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIButton" id="233942944">
@@ -43,7 +43,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{320, 60}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="306241553"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="937037271">
@@ -82,8 +81,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 68}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -105,7 +102,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 275}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1021636329"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -128,7 +124,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 343}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -150,7 +145,6 @@
 						<int key="NSvFlags">-2147483348</int>
 						<string key="NSFrame">{{10, 78}, {40, 40}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -163,7 +157,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 207}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -192,7 +185,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{208, 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>
@@ -205,7 +197,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 8}, {195, 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>
@@ -230,7 +221,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 37}, {280, 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>
@@ -260,7 +250,6 @@
 						</array>
 						<string key="NSFrame">{{0, 136}, {320, 63}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="342130383"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -268,8 +257,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 403}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="233942944"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -283,7 +270,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="239666395">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUITextField" id="988543427">
@@ -291,7 +278,6 @@
 						<int key="NSvFlags">294</int>
 						<string key="NSFrame">{{20, 15}, {201, 30}}</string>
 						<reference key="NSSuperview" ref="239666395"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="712064142"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -321,7 +307,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{229, 8}, {70, 44}}</string>
 						<reference key="NSSuperview" ref="239666395"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -341,8 +326,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 60}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="988543427"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -631,7 +614,7 @@
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">VLCAddMediaViewController</string>
+				<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>
@@ -660,122 +643,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">VLCAddMediaViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="dismiss:">id</string>
-						<string key="downloadFromHTTPServer:">id</string>
-						<string key="openAboutPanel:">id</string>
-						<string key="openNetworkStream:">id</string>
-						<string key="showDropbox:">id</string>
-						<string key="showSettings:">id</string>
-						<string key="toggleHTTPServer:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="dismiss:">
-							<string key="name">dismiss:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<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="showDropbox:">
-							<string key="name">showDropbox:</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="dismissButton">UIButton</string>
-						<string key="downloadFromHTTPServerButton">UIButton</string>
-						<string key="dropboxButton">UIButton</string>
-						<string key="httpDownloadProgressIndicator">VLCCircularProgressIndicator</string>
-						<string key="httpUploadLabel">UILabel</string>
-						<string key="httpUploadServerLocationLabel">UILabel</string>
-						<string key="httpUploadServerSwitch">UISwitch</string>
-						<string key="openNetworkStreamButton">UIButton</string>
-						<string key="openURLButton">UIButton</string>
-						<string key="openURLField">UITextField</string>
-						<string key="openURLView">UIView</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="dismissButton">
-							<string key="name">dismissButton</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="httpDownloadProgressIndicator">
-							<string key="name">httpDownloadProgressIndicator</string>
-							<string key="candidateClassName">VLCCircularProgressIndicator</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="openNetworkStreamButton">
-							<string key="name">openNetworkStreamButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLButton">
-							<string key="name">openURLButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLField">
-							<string key="name">openURLField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLView">
-							<string key="name">openURLView</string>
-							<string key="candidateClassName">UIView</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/VLCAddMediaViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">VLCCircularProgressIndicator</string>
 					<string key="superclassName">UIProgressView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">

Resources/VLCAddMediaViewController~iphone.xib

@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12E52</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
@@ -37,7 +37,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="892317093">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIButton" id="233942944">
@@ -45,7 +45,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 52}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="306241553"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="937037271">
@@ -84,7 +83,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 120}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="973946330"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -107,7 +105,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 395}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -129,7 +126,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="233942944"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -156,7 +152,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 327}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1021636329"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -179,7 +174,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 259}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="205209326"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -209,7 +203,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{208, 5}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="892025683"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -222,7 +215,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 8}, {195, 21}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="434153343"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -247,7 +239,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 37}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="475346595"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -277,7 +268,6 @@
 						</array>
 						<string key="NSFrame">{{0, 188}, {320, 63}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="238446432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -288,7 +278,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{9, 130}, {40, 40}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="485650876"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -299,8 +288,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 455}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="765845946"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -314,7 +301,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="574364168">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUITextField" id="309180653">
@@ -322,7 +309,6 @@
 						<int key="NSvFlags">294</int>
 						<string key="NSFrame">{{20, 15}, {201, 30}}</string>
 						<reference key="NSSuperview" ref="574364168"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="293148001"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -351,7 +337,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{229, 8}, {70, 44}}</string>
 						<reference key="NSSuperview" ref="574364168"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -370,8 +355,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 60}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="309180653"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -688,7 +671,7 @@
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">VLCAddMediaViewController</string>
+				<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>
@@ -720,122 +703,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">VLCAddMediaViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="dismiss:">id</string>
-						<string key="downloadFromHTTPServer:">id</string>
-						<string key="openAboutPanel:">id</string>
-						<string key="openNetworkStream:">id</string>
-						<string key="showDropbox:">id</string>
-						<string key="showSettings:">id</string>
-						<string key="toggleHTTPServer:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="dismiss:">
-							<string key="name">dismiss:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<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="showDropbox:">
-							<string key="name">showDropbox:</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="dismissButton">UIButton</string>
-						<string key="downloadFromHTTPServerButton">UIButton</string>
-						<string key="dropboxButton">UIButton</string>
-						<string key="httpDownloadProgressIndicator">VLCCircularProgressIndicator</string>
-						<string key="httpUploadLabel">UILabel</string>
-						<string key="httpUploadServerLocationLabel">UILabel</string>
-						<string key="httpUploadServerSwitch">UISwitch</string>
-						<string key="openNetworkStreamButton">UIButton</string>
-						<string key="openURLButton">UIButton</string>
-						<string key="openURLField">UITextField</string>
-						<string key="openURLView">UIView</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="dismissButton">
-							<string key="name">dismissButton</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="httpDownloadProgressIndicator">
-							<string key="name">httpDownloadProgressIndicator</string>
-							<string key="candidateClassName">VLCCircularProgressIndicator</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="openNetworkStreamButton">
-							<string key="name">openNetworkStreamButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLButton">
-							<string key="name">openURLButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLField">
-							<string key="name">openURLField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="openURLView">
-							<string key="name">openURLView</string>
-							<string key="candidateClassName">UIView</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/VLCAddMediaViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">VLCCircularProgressIndicator</string>
 					<string key="superclassName">UIProgressView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">

VLC for iOS.xcodeproj/project.pbxproj

@@ -124,9 +124,9 @@
 		7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08FB174D773C00A05173 /* Settings.bundle */; };
 		7D6BA1121748EA8300C0E203 /* playback_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1101748EA8300C0E203 /* playback_background.png */; };
 		7D6BA1131748EA8300C0E203 /* playback_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1111748EA8300C0E203 /* playback_background@2x.png */; };
-		7D6BA1171748EFE100C0E203 /* VLCAddMediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */; };
-		7D6BA1181748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */; };
-		7D6BA11A174911C200C0E203 /* VLCAddMediaViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */; };
+		7D6BA1171748EFE100C0E203 /* VLCMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */; };
+		7D6BA1181748EFE100C0E203 /* VLCMenuViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1161748EFE100C0E203 /* VLCMenuViewController~ipad.xib */; };
+		7D6BA11A174911C200C0E203 /* VLCMenuViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA119174911C200C0E203 /* VLCMenuViewController~iphone.xib */; };
 		7D94FCDF16DE7D1000F2623B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCDE16DE7D1000F2623B /* UIKit.framework */; };
 		7D94FCE116DE7D1000F2623B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE016DE7D1000F2623B /* Foundation.framework */; };
 		7D94FCE316DE7D1000F2623B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE216DE7D1000F2623B /* CoreGraphics.framework */; };
@@ -373,10 +373,10 @@
 		7D6B08FB174D773C00A05173 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = Resources/Settings.bundle; sourceTree = SOURCE_ROOT; };
 		7D6BA1101748EA8300C0E203 /* playback_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = playback_background.png; sourceTree = "<group>"; };
 		7D6BA1111748EA8300C0E203 /* playback_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playback_background@2x.png"; sourceTree = "<group>"; };
-		7D6BA1141748EFE100C0E203 /* VLCAddMediaViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCAddMediaViewController.h; sourceTree = "<group>"; };
-		7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCAddMediaViewController.m; sourceTree = "<group>"; };
-		7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCAddMediaViewController~ipad.xib"; path = "../Resources/VLCAddMediaViewController~ipad.xib"; sourceTree = "<group>"; };
-		7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCAddMediaViewController~iphone.xib"; path = "Resources/VLCAddMediaViewController~iphone.xib"; 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>"; };
+		7D6BA1161748EFE100C0E203 /* VLCMenuViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMenuViewController~ipad.xib"; path = "../Resources/VLCMenuViewController~ipad.xib"; sourceTree = "<group>"; };
+		7D6BA119174911C200C0E203 /* VLCMenuViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMenuViewController~iphone.xib"; path = "Resources/VLCMenuViewController~iphone.xib"; sourceTree = SOURCE_ROOT; };
 		7D94FCDB16DE7D1000F2623B /* VLC for iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VLC for iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7D94FCDE16DE7D1000F2623B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		7D94FCE016DE7D1000F2623B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -888,8 +888,8 @@
 				29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */,
 				A7DA16CF171083DF00D6FED9 /* VLCExternalDisplayController.h */,
 				A7DA16D0171083DF00D6FED9 /* VLCExternalDisplayController.m */,
-				7D6BA1141748EFE100C0E203 /* VLCAddMediaViewController.h */,
-				7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */,
+				7D6BA1141748EFE100C0E203 /* VLCMenuViewController.h */,
+				7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */,
 				7D3EB015174A46FB002062C2 /* VLCHTTPFileDownloader.h */,
 				7D3EB016174A46FB002062C2 /* VLCHTTPFileDownloader.m */,
 				7D07A4E6174EA47800759D10 /* VLCSettingsController.h */,
@@ -919,8 +919,8 @@
 			children = (
 				7DBC3B431711FC6C00DCF688 /* VLCAboutViewController~iphone.xib */,
 				7D9529521732EFCA006F5B40 /* VLCAboutViewController~ipad.xib */,
-				7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */,
-				7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */,
+				7D6BA1161748EFE100C0E203 /* VLCMenuViewController~ipad.xib */,
+				7D6BA119174911C200C0E203 /* VLCMenuViewController~iphone.xib */,
 				A79246BD170F114E0036AAF2 /* VLCMovieViewController~iphone.xib */,
 				7D33D41517182615008AF0E0 /* VLCMovieViewController~ipad.xib */,
 				A79246C0170F114E0036AAF2 /* VLCPlaylistViewController~iphone.xib */,
@@ -1134,8 +1134,8 @@
 				7D6BA1131748EA8300C0E203 /* playback_background@2x.png in Resources */,
 				2915542317490A9C00B86CAD /* About.txt in Resources */,
 				2915542B17490A9C00B86CAD /* README.txt in Resources */,
-				7D6BA1181748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib in Resources */,
-				7D6BA11A174911C200C0E203 /* VLCAddMediaViewController~iphone.xib in Resources */,
+				7D6BA1181748EFE100C0E203 /* VLCMenuViewController~ipad.xib in Resources */,
+				7D6BA11A174911C200C0E203 /* VLCMenuViewController~iphone.xib in Resources */,
 				29125E5617492219003F03E5 /* index.html in Resources */,
 				29125E5717492219003F03E5 /* upload.html in Resources */,
 				7D3EAFF8174A2651002062C2 /* vlcetix512.png in Resources */,
@@ -1228,7 +1228,7 @@
 				2915543F17490B9C00B86CAD /* HTTPFileResponse.m in Sources */,
 				2915544017490B9C00B86CAD /* HTTPRedirectResponse.m in Sources */,
 				2915544117490B9C00B86CAD /* WebSocket.m in Sources */,
-				7D6BA1171748EFE100C0E203 /* VLCAddMediaViewController.m in Sources */,
+				7D6BA1171748EFE100C0E203 /* VLCMenuViewController.m in Sources */,
 				29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */,
 				7D3EB012174A3530002062C2 /* Reachability.m in Sources */,
 				7D3EB017174A46FB002062C2 /* VLCHTTPFileDownloader.m in Sources */,