Implement custom Done buttons throughout the menu

AspenProject/VLCAboutViewController.m

@@ -31,8 +31,10 @@
     self.vlckitVersion.text = [NSString stringWithFormat:NSLocalizedString(@"BASED_ON_FORMAT",@""),[[VLCLibrary sharedLibrary] version]];
 
     _dismissButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", @"")
-                                                      style:UIBarButtonItemStyleDone
+                                                      style:UIBarButtonItemStyleBordered
                                                      target:self action:@selector(dismiss)];
+    [_dismissButton setBackgroundImage:[UIImage imageNamed:@"doneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    [_dismissButton setBackgroundImage:[UIImage imageNamed:@"doneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
     self.navigationItem.rightBarButtonItem = _dismissButton;
 }
 

AspenProject/VLCDropboxTableViewController.m

@@ -50,7 +50,9 @@
     [DBSession setSharedSession:dbSession];
     [DBRequest setNetworkRequestDelegate:_dropboxController];
 
-    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", @"") style:UIBarButtonItemStyleDone target:self action:@selector(dismiss:)];
+    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", @"") style:UIBarButtonItemStyleBordered target:self action:@selector(dismiss:)];
+    [addButton setBackgroundImage:[UIImage imageNamed:@"doneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    [addButton setBackgroundImage:[UIImage imageNamed:@"doneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
     self.navigationItem.rightBarButtonItem = addButton;
 
     _backButton = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStyleBordered target:self action:@selector(folderUp:)];

AspenProject/VLCMenuViewController.h

@@ -18,7 +18,6 @@
 @property (strong, nonatomic) VLCSettingsController *settingsController;
 
 @property (strong, nonatomic) IBOutlet UIToolbar *dismissToolBar;
-@property (strong, nonatomic) IBOutlet UIButton *dismissButton;
 @property (strong, nonatomic) IBOutlet UIButton *aboutButton;
 @property (strong, nonatomic) IBOutlet UIButton *openNetworkStreamButton;
 @property (strong, nonatomic) IBOutlet VLCCircularProgressIndicator *httpDownloadProgressIndicator;

AspenProject/VLCMenuViewController.m

@@ -49,7 +49,15 @@
     [super viewDidLoad];
 
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
-        [self.dismissButton setTitle:NSLocalizedString(@"BUTTON_DONE", @"") forState:UIControlStateNormal];
+        UIBarButtonItem *dismissButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_DONE", @"")
+                                                                          style:UIBarButtonItemStyleBordered
+                                                                         target:self
+                                                                         action:@selector(dismiss:)];
+        [dismissButton setBackgroundImage:[UIImage imageNamed:@"doneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+        [dismissButton setBackgroundImage:[UIImage imageNamed:@"doneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
+
+        self.dismissToolBar.items = @[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], dismissButton];
+
         [self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
     }
     [self.aboutButton setTitle:NSLocalizedString(@"ABOUT_APP", @"") forState:UIControlStateNormal];
@@ -196,6 +204,10 @@
     navController.navigationBar.barStyle = UIBarStyleBlack;
     [navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
     [self presentModalViewController:navController animated:YES];
+
+    [self.settingsViewController.navigationItem.rightBarButtonItem setBackgroundImage:[UIImage imageNamed:@"doneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    [self.settingsViewController.navigationItem.rightBarButtonItem setBackgroundImage:[UIImage imageNamed:@"doneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
+    self.settingsViewController.navigationItem.rightBarButtonItem.style = UIBarButtonItemStylePlain;
 }
 
 - (NSString *)_currentIPAddress

Resources/VLCDropboxTableViewController.xib

@@ -38,6 +38,7 @@
 				<int key="NSvFlags">274</int>
 				<string key="NSFrame">{{0, 20}, {320, 504}}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor" id="651013553">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MAA</bytes>
@@ -86,6 +87,7 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{71, 200}, {179, 60}}</string>
 						<reference key="NSSuperview" ref="338576143"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -99,6 +101,7 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{128, 303}, {65, 44}}</string>
 						<reference key="NSSuperview" ref="338576143"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -131,6 +134,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 568}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="320706770"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="651013553"/>
@@ -252,7 +256,51 @@
 			<nil key="sourceID"/>
 			<int key="maxID">27</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">VLCDropboxTableViewController</string>
+					<string key="superclassName">UITableViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="dismiss:">id</string>
+						<string key="folderUp:">id</string>
+						<string key="loginToDropboxAction:">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="folderUp:">
+							<string key="name">folderUp:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="loginToDropboxAction:">
+							<string key="name">loginToDropboxAction:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="loginToDropboxButton">UIButton</string>
+						<string key="loginToDropboxView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="loginToDropboxButton">
+							<string key="name">loginToDropboxButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="loginToDropboxView">
+							<string key="name">loginToDropboxView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/VLCDropboxTableViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

Resources/VLCMenuViewController~iphone.xib

@@ -72,7 +72,7 @@
 							<int key="type">1</int>
 							<double key="pointSize">14</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="358184865">
+						<object class="NSFont" key="IBUIFont" id="364397663">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">14</double>
 							<int key="NSfFlags">16</int>
@@ -84,6 +84,7 @@
 						<string key="NSFrame">{{229, 8}, {70, 44}}</string>
 						<reference key="NSSuperview" ref="574364168"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -107,7 +108,7 @@
 							<int key="type">2</int>
 							<double key="pointSize">15</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="215751078">
+						<object class="NSFont" key="IBUIFont" id="390696399">
 							<string key="NSName">Helvetica-Bold</string>
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
@@ -129,19 +130,19 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
-			<object class="IBUIView" id="376076566">
+			<object class="IBUIView" id="840701271">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="512981630">
-						<reference key="NSNextResponder" ref="376076566"/>
+					<object class="IBUIScrollView" id="97842635">
+						<reference key="NSNextResponder" ref="840701271"/>
 						<int key="NSvFlags">274</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="233942944">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 60}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="306241553"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -154,18 +155,18 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="710551150">
+								<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="755355563">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">menuBtnBck.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="215751078"/>
+								<reference key="IBUIFont" ref="390696399"/>
 							</object>
 							<object class="IBUIButton" id="306241553">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 68}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="973946330"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -178,16 +179,17 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
+								<reference key="IBUINormalBackgroundImage" ref="755355563"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="215751078"/>
+								<reference key="IBUIFont" ref="390696399"/>
 							</object>
 							<object class="IBUIButton" id="1021636329">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 343}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="937037271"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -198,15 +200,15 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
+								<reference key="IBUINormalBackgroundImage" ref="755355563"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="215751078"/>
+								<reference key="IBUIFont" ref="390696399"/>
 							</object>
 							<object class="IBUIButton" id="205209326">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 275}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1021636329"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -219,15 +221,15 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
+								<reference key="IBUINormalBackgroundImage" ref="755355563"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="215751078"/>
+								<reference key="IBUIFont" ref="390696399"/>
 							</object>
 							<object class="IBUIButton" id="475346595">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 207}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="205209326"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -246,15 +248,15 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">dropboxLabel.png</string>
 								</object>
-								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
+								<reference key="IBUINormalBackgroundImage" ref="755355563"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="215751078"/>
+								<reference key="IBUIFont" ref="390696399"/>
 							</object>
 							<object class="IBUIView" id="485650876">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">290</int>
 								<array class="NSMutableArray" key="NSSubviews">
-									<object class="IBUIImageView" id="759717412">
+									<object class="IBUIImageView" id="865481977">
 										<reference key="NSNextResponder" ref="485650876"/>
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 63}</string>
@@ -264,7 +266,7 @@
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<reference key="IBUIImage" ref="710551150"/>
+										<reference key="IBUIImage" ref="755355563"/>
 									</object>
 									<object class="IBUISwitch" id="434153343">
 										<reference key="NSNextResponder" ref="485650876"/>
@@ -298,7 +300,7 @@
 										<int key="IBUIBaselineAdjustment">0</int>
 										<int key="IBUITextAlignment">1</int>
 										<reference key="IBUIFontDescription" ref="886215057"/>
-										<reference key="IBUIFont" ref="215751078"/>
+										<reference key="IBUIFont" ref="390696399"/>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 									<object class="IBUILabel" id="892025683">
@@ -320,26 +322,26 @@
 										<int key="IBUIBaselineAdjustment">0</int>
 										<int key="IBUITextAlignment">1</int>
 										<reference key="IBUIFontDescription" ref="142511261"/>
-										<reference key="IBUIFont" ref="358184865"/>
+										<reference key="IBUIFont" ref="364397663"/>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 								</array>
 								<string key="NSFrame">{{0, 136}, {320, 63}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="759717412"/>
+								<reference key="NSNextKeyView" ref="865481977"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor" id="34356837">
+								<object class="NSColor" key="IBUIBackgroundColor" id="64837887">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MAA</bytes>
 								</object>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
 							<object class="IBUIView" id="973946330">
-								<reference key="NSNextResponder" ref="512981630"/>
+								<reference key="NSNextResponder" ref="97842635"/>
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{9, 78}, {40, 40}}</string>
-								<reference key="NSSuperview" ref="512981630"/>
+								<reference key="NSSuperview" ref="97842635"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="485650876"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -351,11 +353,11 @@
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 56}, {320, 403}}</string>
-						<reference key="NSSuperview" ref="376076566"/>
+						<reference key="NSSuperview" ref="840701271"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="233942944"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="34356837"/>
+						<reference key="IBUIBackgroundColor" ref="64837887"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIMultipleTouchEnabled">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -365,12 +367,12 @@
 						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
 					</object>
 					<object class="IBUIToolbar" id="765845946">
-						<reference key="NSNextResponder" ref="376076566"/>
+						<reference key="NSNextResponder" ref="840701271"/>
 						<int key="NSvFlags">294</int>
 						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="376076566"/>
+						<reference key="NSSuperview" ref="840701271"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="512981630"/>
+						<reference key="NSNextKeyView" ref="97842635"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -383,12 +385,6 @@
 								<reference key="IBUIToolbar" ref="765845946"/>
 								<int key="IBUISystemItemIdentifier">5</int>
 							</object>
-							<object class="IBUIBarButtonItem" id="22033339">
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIStyle">1</int>
-								<reference key="IBUIToolbar" ref="765845946"/>
-								<int key="IBUISystemItemIdentifier">0</int>
-							</object>
 						</array>
 					</object>
 				</array>
@@ -397,7 +393,7 @@
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="765845946"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="34356837"/>
+				<reference key="IBUIBackgroundColor" ref="64837887"/>
 				<reference key="IBUISimulatedDestinationMetrics" ref="92702892"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
@@ -504,7 +500,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">view</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="376076566"/>
+						<reference key="destination" ref="840701271"/>
 					</object>
 					<int key="connectionID">85</int>
 				</object>
@@ -545,14 +541,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">dismiss:</string>
-						<reference key="source" ref="22033339"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">49</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">showSettings:</string>
 						<reference key="source" ref="205209326"/>
 						<reference key="destination" ref="372490531"/>
@@ -628,16 +616,16 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">83</int>
-						<reference key="object" ref="376076566"/>
+						<reference key="object" ref="840701271"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="512981630"/>
+							<reference ref="97842635"/>
 							<reference ref="765845946"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">84</int>
-						<reference key="object" ref="512981630"/>
+						<reference key="object" ref="97842635"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="233942944"/>
 							<reference ref="306241553"/>
@@ -647,16 +635,15 @@
 							<reference ref="485650876"/>
 							<reference ref="973946330"/>
 						</array>
-						<reference key="parent" ref="376076566"/>
+						<reference key="parent" ref="840701271"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">46</int>
 						<reference key="object" ref="765845946"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="567217541"/>
-							<reference ref="22033339"/>
 						</array>
-						<reference key="parent" ref="376076566"/>
+						<reference key="parent" ref="840701271"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">47</int>
@@ -664,34 +651,29 @@
 						<reference key="parent" ref="765845946"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="22033339"/>
-						<reference key="parent" ref="765845946"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">26</int>
 						<reference key="object" ref="233942944"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">34</int>
 						<reference key="object" ref="306241553"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">35</int>
 						<reference key="object" ref="1021636329"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">50</int>
 						<reference key="object" ref="205209326"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">76</int>
 						<reference key="object" ref="475346595"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">51</int>
@@ -700,9 +682,9 @@
 							<reference ref="434153343"/>
 							<reference ref="238446432"/>
 							<reference ref="892025683"/>
-							<reference ref="759717412"/>
+							<reference ref="865481977"/>
 						</array>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">54</int>
@@ -722,11 +704,11 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">73</int>
 						<reference key="object" ref="973946330"/>
-						<reference key="parent" ref="512981630"/>
+						<reference key="parent" ref="97842635"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">86</int>
-						<reference key="object" ref="759717412"/>
+						<reference key="object" ref="865481977"/>
 						<reference key="parent" ref="485650876"/>
 					</object>
 				</array>
@@ -741,7 +723,6 @@
 				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

VLC for iOS.xcodeproj/project.pbxproj

@@ -55,6 +55,10 @@
 		7D07F71F175673D100CDE21C /* menuBtnBck@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F71B175673D100CDE21C /* menuBtnBck@2x.png */; };
 		7D07F720175673D100CDE21C /* menuBtnBckHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F71C175673D100CDE21C /* menuBtnBckHighlight.png */; };
 		7D07F721175673D100CDE21C /* menuBtnBck.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F71D175673D100CDE21C /* menuBtnBck.png */; };
+		7D07F726175688D300CDE21C /* doneButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F722175688D300CDE21C /* doneButton.png */; };
+		7D07F727175688D300CDE21C /* doneButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F723175688D300CDE21C /* doneButton@2x.png */; };
+		7D07F728175688D300CDE21C /* doneButtonHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F724175688D300CDE21C /* doneButtonHighlight.png */; };
+		7D07F729175688D300CDE21C /* doneButtonHighlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F725175688D300CDE21C /* doneButtonHighlight@2x.png */; };
 		7D10BC761743FA0F00DA7059 /* audio.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6A1743FA0F00DA7059 /* audio.png */; };
 		7D10BC771743FA0F00DA7059 /* audio@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6B1743FA0F00DA7059 /* audio@2x.png */; };
 		7D10BC781743FA0F00DA7059 /* backward.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6C1743FA0F00DA7059 /* backward.png */; };
@@ -284,6 +288,10 @@
 		7D07F71B175673D100CDE21C /* menuBtnBck@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menuBtnBck@2x.png"; sourceTree = "<group>"; };
 		7D07F71C175673D100CDE21C /* menuBtnBckHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menuBtnBckHighlight.png; sourceTree = "<group>"; };
 		7D07F71D175673D100CDE21C /* menuBtnBck.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menuBtnBck.png; sourceTree = "<group>"; };
+		7D07F722175688D300CDE21C /* doneButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = doneButton.png; sourceTree = "<group>"; };
+		7D07F723175688D300CDE21C /* doneButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "doneButton@2x.png"; sourceTree = "<group>"; };
+		7D07F724175688D300CDE21C /* doneButtonHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = doneButtonHighlight.png; sourceTree = "<group>"; };
+		7D07F725175688D300CDE21C /* doneButtonHighlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "doneButtonHighlight@2x.png"; sourceTree = "<group>"; };
 		7D10BC6A1743FA0F00DA7059 /* audio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = audio.png; sourceTree = "<group>"; };
 		7D10BC6B1743FA0F00DA7059 /* audio@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "audio@2x.png"; sourceTree = "<group>"; };
 		7D10BC6C1743FA0F00DA7059 /* backward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backward.png; sourceTree = "<group>"; };
@@ -658,6 +666,10 @@
 		7D10BC661743F9AC00DA7059 /* Library View */ = {
 			isa = PBXGroup;
 			children = (
+				7D07F722175688D300CDE21C /* doneButton.png */,
+				7D07F723175688D300CDE21C /* doneButton@2x.png */,
+				7D07F724175688D300CDE21C /* doneButtonHighlight.png */,
+				7D07F725175688D300CDE21C /* doneButtonHighlight@2x.png */,
 				7D07F71217566C4A00CDE21C /* menuCone.png */,
 				7D07F71317566C4A00CDE21C /* menuCone@2x.png */,
 				7D07F71A175673D100CDE21C /* menuBtnBckHighlight@2x.png */,
@@ -1271,6 +1283,10 @@
 				7D07F71F175673D100CDE21C /* menuBtnBck@2x.png in Resources */,
 				7D07F720175673D100CDE21C /* menuBtnBckHighlight.png in Resources */,
 				7D07F721175673D100CDE21C /* menuBtnBck.png in Resources */,
+				7D07F726175688D300CDE21C /* doneButton.png in Resources */,
+				7D07F727175688D300CDE21C /* doneButton@2x.png in Resources */,
+				7D07F728175688D300CDE21C /* doneButtonHighlight.png in Resources */,
+				7D07F729175688D300CDE21C /* doneButtonHighlight@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};